diff --git a/app/common_test.go b/app/common_test.go
index a8bd8ce94..9812d1567 100644
--- a/app/common_test.go
+++ b/app/common_test.go
@@ -130,7 +130,7 @@ func NewInMemoryTendermintNodeProto(t *testing.T, genesisState []byte) (tendermi
 	return NewInMemoryTendermintNodeProtoWithValidators(t, genesisState, nil)
 }
 
-// NewInMemoryTendermintNodeWithValidators will create a TM node with 'n' "validators".
+// NewInMemoryTendermintNodeProtoWithValidators will create a TM node with 'n' "validators".
 // If "validators" is nil, this creates a pre-leanpokt TM node, else it will enable lean pocket
 func NewInMemoryTendermintNodeProtoWithValidators(t *testing.T, genesisState []byte, validators []crypto.PrivateKey) (tendermintNode *node.Node, keybase keys.Keybase, cleanup func()) {
 	// create the in memory tendermint node and keybase
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index cab30500d..2ac935baf 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -355,7 +355,7 @@ func (app *BaseApp) setCheckState(header abci.Header) { // todo <- modified here
 	}
 }
 
-// setCheckState sets checkState with the cached multistore and
+// setDeliverState sets checkState with the cached multistore and
 // the context wrapping it.
 // It is called by InitChain() and BeginBlock(),
 // and deliverState is set nil on Commit().
@@ -373,7 +373,7 @@ func (app *BaseApp) setConsensusParams(consensusParams *abci.ConsensusParams) {
 	app.consensusParams = consensusParams
 }
 
-// setConsensusParams stores the consensus params to the main store.
+// storeConsensusParams stores the consensus params to the main store.
 func (app *BaseApp) storeConsensusParams(consensusParams *abci.ConsensusParams) {
 	consensusParamsBz, err := proto.Marshal(consensusParams)
 	if err != nil {