diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9406dd3d4399e75b645f2f4f9c6c501b75458a51..52282d50ef337d35df3b62689da8494e1fb949a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # burrow changelog
 ## v0.16.0
 This is a consolidation release that fixes various bugs and improves elements
-of the architecture across the Burrow Platform to support a quicker release
+of the architecture across the Monax Platform to support a quicker release
 cadence.
 
 #### Features and improvements (among others)
@@ -13,7 +13,7 @@ cadence.
 - [pull-499](https://github.com/monax/burrow/pull/499) introduce word256 and remove dependency on tendermint/go-common
 - [pull-493](https://github.com/monax/burrow/pull/493) re-introduce GenesisTime in GenesisDoc
 
-- Logging system overhauled based on the central logging interface of go-kit log. Configuration lacking in this release but should be in 0.16.1. Allows powerful routing, filtering, and output options for better operations and increasing the observability of an burrow blockchain. More to follow.
+- Logging system overhauled based on the central logging interface of go-kit log. Configuration lacking in this release but should be in 0.16.1. Allows powerful routing, filtering, and output options for better operations and increasing the observability of a burrow blockchain. More to follow.
 - Genesis making is improved and moved into burrow.
 - Config templating is moved into burrow for better synchronisation of server config between the consumer of it (burrow) and the producers of it (cli and other tools).
 - Some documentation updates in code and in specs.
@@ -30,7 +30,7 @@ cadence.
 
 ## v0.12.0
 This release marks the start of burrow as the full permissioned blockchain node
- of the Burrow Platform with the Tendermint permissioned consensus engine.
+ of the Monax Platform with the Tendermint permissioned consensus engine.
  This involved significant refactoring of almost all parts of the code,
  but provides a solid foundation to build the next generation of advanced
  permissioned smart contract blockchains.
diff --git a/Dockerfile b/Dockerfile
index d829e145c039eb5da0c6e8751a00054d42a223e6..9693aae6bba6623dd64dcf6ab7060efb6e3fa0c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/eris/build
+FROM quay.io/monax/build
 MAINTAINER Monax <support@monax.io>
 
 ENV TARGET burrow
diff --git a/Dockerfile.deploy b/Dockerfile.deploy
index 68151c5e3c63c4c4dea3ccc8d7185548dce147c0..ca9939b5ae28d595efd8526888eb5ca38239c66e 100644
--- a/Dockerfile.deploy
+++ b/Dockerfile.deploy
@@ -1,4 +1,4 @@
-FROM quay.io/eris/base:alpine
+FROM quay.io/monax/base:alpine
 MAINTAINER Monax <support@monax.io>
 
 ENV TARGET burrow
diff --git a/Makefile b/Makefile
index 5febfa5d414e563ad29618adeba84f62bddffbeb..d24d60488a862314d9e3a4bd45a3bd8d3332848a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ VERSION := $(shell cat ${REPO}/version/version.go | tail -n 1 | cut -d \  -f 4 |
 VERSION_MIN := $(shell echo ${VERSION} | cut -d . -f 1-2)
 COMMIT_SHA := $(shell echo `git rev-parse --short --verify HEAD`)
 
-DOCKER_NAMESPACE := quay.io/eris
+DOCKER_NAMESPACE := quay.io/monax
 
 
 .PHONY: greet
@@ -82,7 +82,7 @@ snatives:
 
 # build all targets in github.com/monax/burrow
 .PHONY: build
-build:	check build_db build_client build_keys
+build:	check build_db build_client
 
 # build all targets in github.com/monax/burrow with checks for race conditions
 .PHONY: build_race
@@ -148,4 +148,4 @@ test_docker_db: check
 # clean removes the target folder containing build artefacts
 .PHONY: clean
 clean:
-	-rm -r ./target 
\ No newline at end of file
+	-rm -r ./target 
diff --git a/circle.yml b/circle.yml
index 9ca72b68e6645bb6a4de30fb0b18b6bfeed36f7f..da728655f92d2c2b7a2895124fa0189c2869d6ec 100644
--- a/circle.yml
+++ b/circle.yml
@@ -19,7 +19,7 @@ dependencies:
     - "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
     - sudo apt-get install jq curl && go get github.com/Masterminds/glide
 
-test:
+test
   pre:
     - cd $REPO && glide install
     # Test the build target for burrow
@@ -39,21 +39,21 @@ deployment:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       # build docker image and tag the image with the version
       - tests/build_tool.sh
-      - docker push quay.io/eris/db
+      - docker push quay.io/monax/db
   release-0.16:
     branch: release-0.16
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       # build docker image and tag the image with the version
       - tests/build_tool.sh
-      - docker push quay.io/eris/db
+      - docker push quay.io/monax/db
   develop:
     branch: develop
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       # build docker image and tag the image with the version
       - tests/build_tool.sh
-      - docker push quay.io/eris/db
+      - docker push quay.io/monax/db
   master:
     branch: master
     commands:
@@ -62,7 +62,7 @@ deployment:
       # builds on master are considered immutable so we do not push the version
       # tag to allow for hotfixes
       - tests/build_tool.sh latest
-      - docker push quay.io/eris/db
+      - docker push quay.io/monax/db
   tagged-releases:
     tag: /v[0-9]+(\.[0-9]+)*/
     commands:
@@ -71,4 +71,4 @@ deployment:
       # once the commit is tagged the docker image for this version tag is
       # considered immutable.
       - tests/build_tool.sh
-      - docker push quay.io/eris/db
+      - docker push quay.io/monax/db
diff --git a/cmd/serve.go b/cmd/serve.go
index 86ab4d588c807c71dc73e2129ade1cfd50c59913..d7bef47253cd695b5de6e978daa3b06716402343 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -44,8 +44,8 @@ var DefaultConfigFilename = fmt.Sprintf("%s.%s",
 func buildServeCommand(do *definitions.Do) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "serve",
-		Short: "burrow serve starts an burrow node with client API enabled by default.",
-		Long: `burrow serve starts an burrow node with client API enabled by default.
+		Short: "burrow serve starts a burrow node with client API enabled by default.",
+		Long: `burrow serve starts a burrow node with client API enabled by default.
 The burrow node is modularly configured for the consensus engine and application
 manager.  The client API can be disabled.`,
 		Example: fmt.Sprintf(`$ burrow serve -- will start the burrow node based on the configuration file "%s" in the current working directory
diff --git a/docs/specs/api.md b/docs/specs/api.md
index 5434f6b0747645064563b01869c9ff78db725202..11ec3a644cde70fa0f05027ce88d6cf1fdc6cea2 100644
--- a/docs/specs/api.md
+++ b/docs/specs/api.md
@@ -1755,7 +1755,7 @@ Parameters:
 #####Additional info
 
 `code` is a hex-string representation of compiled contract code.
-`data` is a string of data formatted in accordance with the [contract ABI](https://github.com/monax/eris-contracts.js).
+`data` is a string of data formatted in accordance with the [contract ABI](https://github.com/monax/legacy-contracts.js)
 
 ***
 
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index 709a8ad64294d09984cfd94df8e74c3bd8499007..b765ad2846e6711a506cbb3006dd0e7f1f58aab8 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -2,9 +2,9 @@
 # ----------------------------------------------------------
 # PURPOSE
 
-# This is the build script for the eris stack. It will
+# This is the build script for the Monax stack. It will
 # build the tool into docker containers in a reliable and
-# predicatable manner.
+# predictable manner.
 
 # ----------------------------------------------------------
 # REQUIREMENTS
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------
 
 TARGET=burrow
-IMAGE=quay.io/eris/db
+IMAGE=quay.io/monax/db
 
 set -e