diff --git a/Makefile b/Makefile
index 2e58bcde5..fe76f0862 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ build_c:
 	CGO_ENABLED=1 go build $(BUILD_FLAGS) -tags "$(BUILD_TAGS) cleveldb" -o $(OUTPUT) ./cmd/tendermint/
 
 build_race:
-	CGO_ENABLED=0 go build -race $(BUILD_FLAGS) -tags $(BUILD_TAGS) -o $(OUTPUT) ./cmd/tendermint
+	CGO_ENABLED=1 go build -race $(BUILD_FLAGS) -tags $(BUILD_TAGS) -o $(OUTPUT) ./cmd/tendermint
 
 install:
 	CGO_ENABLED=0 go install $(BUILD_FLAGS) -tags $(BUILD_TAGS) ./cmd/tendermint
diff --git a/ROADMAP.md b/ROADMAP.md
deleted file mode 100644
index 60c284333..000000000
--- a/ROADMAP.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Roadmap
-
-BREAKING CHANGES:
-- Better support for injecting randomness
-- Upgrade consensus for more real-time use of evidence
-
-FEATURES:
-- Use the chain as its own CA for nodes and validators
-- Tooling to run multiple blockchains/apps, possibly in a single process
-- State syncing (without transaction replay)
-- Add authentication and rate-limitting to the RPC
-
-IMPROVEMENTS:
-- Improve subtleties around mempool caching and logic
-- Consensus optimizations:
-	- cache block parts for faster agreement after round changes
-	- propagate block parts rarest first
-- Better testing of the consensus state machine (ie. use a DSL)
-- Auto compiled serialization/deserialization code instead of go-wire reflection
-
-BUG FIXES:
-- Graceful handling/recovery for apps that have non-determinism or fail to halt
-- Graceful handling/recovery for violations of safety, or liveness
diff --git a/abci/types/protoreplace/protoreplace.go b/abci/types/protoreplace/protoreplace.go
index 3ea0c73da..7058a70fb 100644
--- a/abci/types/protoreplace/protoreplace.go
+++ b/abci/types/protoreplace/protoreplace.go
@@ -40,7 +40,7 @@ func main() {
 		}
 		if writeImportTime && !wroteImport {
 			wroteImport = true
-			fmt.Fprintf(outFile, "import \"github.com/tendermint/go-wire/data\"\n")
+			fmt.Fprintf(outFile, "import \"github.com/tendermint/go-amino/data\"\n")
 
 		}
 		if gotPackageLine {
diff --git a/consensus/state.go b/consensus/state.go
index 5dfeaf907..2cfb277e1 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -1672,7 +1672,7 @@ func (cs *ConsensusState) addVote(vote *types.Vote, peerID p2p.ID) (added bool,
 		}
 
 	default:
-		panic(fmt.Sprintf("Unexpected vote type %X", vote.Type)) // go-wire should prevent this.
+		panic(fmt.Sprintf("Unexpected vote type %X", vote.Type)) // go-amino should prevent this.
 	}
 
 	return
diff --git a/docs/spec/p2p/connection.md b/docs/spec/p2p/connection.md
index 47366a549..fd2e7bc4d 100644
--- a/docs/spec/p2p/connection.md
+++ b/docs/spec/p2p/connection.md
@@ -61,7 +61,7 @@ func (m MConnection) TrySend(chID byte, msg interface{}) bool {}
 
 `Send(chID, msg)` is a blocking call that waits until `msg` is successfully queued
 for the channel with the given id byte `chID`. The message `msg` is serialized
-using the `tendermint/wire` submodule's `WriteBinary()` reflection routine.
+using the `tendermint/go-amino` submodule's `WriteBinary()` reflection routine.
 
 `TrySend(chID, msg)` is a nonblocking call that queues the message msg in the channel
 with the given id byte chID if the queue is not full; otherwise it returns false immediately.
diff --git a/docs/spec/reactors/mempool/messages.md b/docs/spec/reactors/mempool/messages.md
index 117fc5f2f..9c583ac0f 100644
--- a/docs/spec/reactors/mempool/messages.md
+++ b/docs/spec/reactors/mempool/messages.md
@@ -13,13 +13,13 @@ type TxMessage struct {
 }
 ```
 
-TxMessage is go-wire encoded and prepended with `0x1` as a
-"type byte". This is followed by a go-wire encoded byte-slice.
+TxMessage is go-amino encoded and prepended with `0x1` as a
+"type byte". This is followed by a go-amino encoded byte-slice.
 Prefix of 40=0x28 byte tx is: `0x010128...` followed by
 the actual 40-byte tx. Prefix of 350=0x015e byte tx is:
 `0x0102015e...` followed by the actual 350 byte tx.
 
-(Please see the [go-wire repo](https://github.com/tendermint/go-wire#an-interface-example) for more information)
+(Please see the [go-amino repo](https://github.com/tendermint/go-amino#an-interface-example) for more information)
 
 ## RPC Messages
 
diff --git a/rpc/core/routes.go b/rpc/core/routes.go
index df7cef905..dbd9c6059 100644
--- a/rpc/core/routes.go
+++ b/rpc/core/routes.go
@@ -5,7 +5,7 @@ import (
 )
 
 // TODO: better system than "unsafe" prefix
-// NOTE: Amino is registered in rpc/core/types/wire.go.
+// NOTE: Amino is registered in rpc/core/types/codec.go.
 var Routes = map[string]*rpc.RPCFunc{
 	// subscribe/unsubscribe are reserved for websocket events.
 	"subscribe":       rpc.NewWSRPCFunc(Subscribe, "query"),
diff --git a/types/results.go b/types/results.go
index d7d82d894..6b0c37562 100644
--- a/types/results.go
+++ b/types/results.go
@@ -41,7 +41,7 @@ func NewResultFromResponse(response *abci.ResponseDeliverTx) ABCIResult {
 	}
 }
 
-// Bytes serializes the ABCIResponse using wire
+// Bytes serializes the ABCIResponse using amino
 func (a ABCIResults) Bytes() []byte {
 	bz, err := cdc.MarshalBinaryLengthPrefixed(a)
 	if err != nil {