diff --git a/build/Makefile b/build/Makefile
index cb071e85..36e95bc4 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -32,12 +32,12 @@ endif
 # Here comes the real deal
 ###
 
-binaries = tendermint basecoin ethermint trackomatron gaia cosmos-sdk
-build-binaries = build-tendermint build-basecoin build-ethermint build-trackomatron build-gaia build-cosmos-sdk
-package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-trackomatron package-rpm-gaia package-rpm-cosmos-sdk
-install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-trackomatron install-rpm-gaia package-rpm-cosmos-sdk
-package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-trackomatron package-deb-gaia package-deb-cosmos-sdk
-install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-trackomatron install-deb-gaia install-deb-cosmos-sdk
+binaries = tendermint basecoin ethermint trackomatron gaia cosmossdk
+build-binaries = build-tendermint build-basecoin build-ethermint build-trackomatron build-gaia build-cosmossdk
+package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-trackomatron package-rpm-gaia package-rpm-cosmossdk
+install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-trackomatron install-rpm-gaia package-rpm-cosmossdk
+package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-trackomatron package-deb-gaia package-deb-cosmossdk
+install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-trackomatron install-deb-gaia install-deb-cosmossdk
 
 all: $(binaries)
 build: $(build-binaries)
@@ -90,12 +90,12 @@ build-gaia: git-branch
 	$(MAKE) -C $(GOPATH)/src/github.com/cosmos/gaia get_vendor_deps install
 	@echo "*** Built gaia"
 
-build-cosmos-sdk: git-branch
-	@echo "*** Building cosmos-sdk"
+build-cosmossdk: git-branch
+	@echo "*** Building cosmossdk"
 	go get -d -u go github.com/cosmos/cosmos-sdk || echo "Workaround for go downloads."
 	cd $(GOPATH)/src/github.com/cosmos/cosmos-sdk && git checkout "$(GIT_BRANCH)" && git pull
 	$(MAKE) -C $(GOPATH)/src/github.com/cosmos/cosmos-sdk get_vendor_deps install
-	@echo "*** Built cosmos-sdk"
+	@echo "*** Built cosmossdk"
 
 ###
 # Prepare package files
@@ -124,7 +124,7 @@ prepare-ethermint = mkdir -p $(build_folder)/etc/ethermint && \
 	cp -r $(GOPATH)/src/github.com/tendermint/ethermint/setup/keystore $(build_folder)/etc/ethermint
 prepare-trackomatron = rm -f $(build_folder)/usr/bin/trackomatron && cp $(GOPATH)/bin/tracko $(GOPATH)/bin/trackocli $(build_folder)/usr/bin
 prepare-gaia =
-prepare-cosmos-sdk = cp $(GOPATH)/bin/basecli $(build_folder)/usr/bin && \
+prepare-cosmossdk = cp $(GOPATH)/bin/basecli $(build_folder)/usr/bin && \
 	cp $(GOPATH)/bin/basecoin $(build_folder)/usr/bin && \
 	cp $(GOPATH)/bin/baseserver $(build_folder)/usr/bin && \
 	cp $(GOPATH)/bin/counter $(build_folder)/usr/bin && \