diff --git a/mempool/mempool.go b/mempool/mempool.go
index 8980130b1..53eaa2877 100644
--- a/mempool/mempool.go
+++ b/mempool/mempool.go
@@ -104,7 +104,7 @@ func (mem *Mempool) CheckTx(tx types.Tx) (err error) {
 func (mem *Mempool) resCb(req *tmsp.Request, res *tmsp.Response) {
 	switch res.Type {
 	case tmsp.MessageType_CheckTx:
-		if tmsp.RetCode(res.Code) == tmsp.RetCodeOK {
+		if res.Code == tmsp.CodeType_OK {
 			mem.counter++
 			memTx := &mempoolTx{
 				counter: mem.counter,
diff --git a/mempool/mempool_test.go b/mempool/mempool_test.go
index dc3c6a03b..f1fb3eaac 100644
--- a/mempool/mempool_test.go
+++ b/mempool/mempool_test.go
@@ -72,7 +72,7 @@ func TestSerialReap(t *testing.T) {
 			txBytes := make([]byte, 8)
 			binary.BigEndian.PutUint64(txBytes, uint64(i))
 			code, result, logStr := appConnCon.AppendTx(txBytes)
-			if code != tmsp.RetCodeOK {
+			if code != tmsp.CodeType_OK {
 				t.Errorf("Error committing tx. Code:%v result:%X log:%v",
 					code, result, logStr)
 			}
diff --git a/state/execution.go b/state/execution.go
index faad5377d..7c56e7216 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -67,7 +67,7 @@ func (s *State) execBlockOnProxyApp(evsw *events.EventSwitch, proxyAppConn proxy
 			// TODO: make use of this info
 			// Blocks may include invalid txs.
 			// reqAppendTx := req.(tmsp.RequestAppendTx)
-			if tmsp.RetCode(res.Code) == tmsp.RetCodeOK {
+			if res.Code == tmsp.CodeType_OK {
 				validTxs += 1
 			} else {
 				log.Debug("Invalid tx", "code", res.Code, "log", res.Log)
@@ -159,7 +159,7 @@ func updateValidatorsWithBlock(lastValSet *types.ValidatorSet, valSet *types.Val
 
 type InvalidTxError struct {
 	Tx   types.Tx
-	Code tmsp.RetCode
+	Code tmsp.CodeType
 }
 
 func (txErr InvalidTxError) Error() string {