diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 9d65efbe..8d72dedb 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -14,9 +14,10 @@ program](https://hackerone.com/tendermint).
 - Apps
 
 - Go API
-  - [libs] \#3811 Remove `db` from libs in favor of `https://github.com/tendermint/tm-cmn`
+  - [libs] \#3811 Remove `db` from libs in favor of `https://github.com/tendermint/tm-db`
 
 ### FEATURES:
+
 - [node] Allow replacing existing p2p.Reactor(s) using [`CustomReactors`
   option](https://godoc.org/github.com/tendermint/tendermint/node#CustomReactors).
   Warning: beware of accidental name clashes. Here is the list of existing
@@ -34,5 +35,5 @@ program](https://hackerone.com/tendermint).
 
 ### BUG FIXES:
 
-- [p2p] [\#3644](https://github.com/tendermint/tendermint/pull/3644) Fix error logging for connection stop (@defunctzombie)
+- [p2p][\#3644](https://github.com/tendermint/tendermint/pull/3644) Fix error logging for connection stop (@defunctzombie)
 - [rpc] \#3813 Return err if page is incorrect (less than 0 or greater than total pages)
diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
index feb81b35..6eb4a124 100644
--- a/abci/example/kvstore/kvstore.go
+++ b/abci/example/kvstore/kvstore.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/version"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var (
diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go
index 4f84cd3e..eb2514a6 100644
--- a/abci/example/kvstore/persistent_kvstore.go
+++ b/abci/example/kvstore/persistent_kvstore.go
@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	"github.com/tendermint/tendermint/libs/log"
 	tmtypes "github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
diff --git a/blockchain/v0/reactor_test.go b/blockchain/v0/reactor_test.go
index 08ec66cd..c1c33593 100644
--- a/blockchain/v0/reactor_test.go
+++ b/blockchain/v0/reactor_test.go
@@ -20,7 +20,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var config *cfg.Config
diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go
index b5965a2a..1e334c70 100644
--- a/blockchain/v1/reactor_test.go
+++ b/blockchain/v1/reactor_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var config *cfg.Config
diff --git a/consensus/common_test.go b/consensus/common_test.go
index 21eb9f53..61d29d84 100644
--- a/consensus/common_test.go
+++ b/consensus/common_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go
index f4df1aca..c1d4f69a 100644
--- a/consensus/mempool_test.go
+++ b/consensus/mempool_test.go
@@ -14,7 +14,7 @@ import (
 	mempl "github.com/tendermint/tendermint/mempool"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // for testing
diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go
index 6697efdb..aa205487 100644
--- a/consensus/reactor_test.go
+++ b/consensus/reactor_test.go
@@ -25,7 +25,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //----------------------------------------------
diff --git a/consensus/replay.go b/consensus/replay.go
index 79759358..433c1940 100644
--- a/consensus/replay.go
+++ b/consensus/replay.go
@@ -13,7 +13,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	//auto "github.com/tendermint/tendermint/libs/autofile"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/mock"
diff --git a/consensus/replay_file.go b/consensus/replay_file.go
index 00a18c21..2c0f8a32 100644
--- a/consensus/replay_file.go
+++ b/consensus/replay_file.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 
 	cfg "github.com/tendermint/tendermint/config"
 	cmn "github.com/tendermint/tendermint/libs/common"
diff --git a/consensus/replay_test.go b/consensus/replay_test.go
index c3ded97c..20ecb64d 100644
--- a/consensus/replay_test.go
+++ b/consensus/replay_test.go
@@ -29,7 +29,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 	"github.com/tendermint/tendermint/version"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestMain(m *testing.M) {
diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go
index 3f060826..8b5bbc2f 100644
--- a/consensus/wal_generator.go
+++ b/consensus/wal_generator.go
@@ -21,7 +21,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tm-cmn/db"
+	db "github.com/tendermint/tm-db"
 )
 
 // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a
diff --git a/evidence/pool.go b/evidence/pool.go
index c3603730..66b35ef9 100644
--- a/evidence/pool.go
+++ b/evidence/pool.go
@@ -6,7 +6,7 @@ import (
 
 	clist "github.com/tendermint/tendermint/libs/clist"
 	"github.com/tendermint/tendermint/libs/log"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
diff --git a/evidence/pool_test.go b/evidence/pool_test.go
index 65f97030..0e35ea29 100644
--- a/evidence/pool_test.go
+++ b/evidence/pool_test.go
@@ -10,7 +10,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestMain(m *testing.M) {
diff --git a/evidence/reactor_test.go b/evidence/reactor_test.go
index e9c05b4d..9603e668 100644
--- a/evidence/reactor_test.go
+++ b/evidence/reactor_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // evidenceLogger is a TestingLogger which uses a different
diff --git a/evidence/store.go b/evidence/store.go
index a809f147..29054abe 100644
--- a/evidence/store.go
+++ b/evidence/store.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 /*
diff --git a/evidence/store_test.go b/evidence/store_test.go
index a4d3dc4b..e3603ef5 100644
--- a/evidence/store_test.go
+++ b/evidence/store_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //-------------------------------------------
diff --git a/go.mod b/go.mod
index 617883cb..09eb5b58 100644
--- a/go.mod
+++ b/go.mod
@@ -38,9 +38,8 @@ require (
 	github.com/spf13/viper v1.0.0
 	github.com/stretchr/testify v1.3.0
 	github.com/tendermint/go-amino v0.14.1
-	github.com/tendermint/tm-cmn v0.0.0-20190716080004-dfcde30d5acb
+	github.com/tendermint/tm-db v0.0.0-20190731085305-94017c88bf1d
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	golang.org/x/net v0.0.0-20190628185345-da137c7871d7
-	google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2 // indirect
 	google.golang.org/grpc v1.22.0
 )
diff --git a/go.sum b/go.sum
index 9766e4f7..e7a7e656 100644
--- a/go.sum
+++ b/go.sum
@@ -84,7 +84,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1 h1:K47Rk0v/fkEfwfQet2KWhscE0cJzjgCCDBG2KHZoVno=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 h1:Cto4X6SVMWRPBkJ/3YHn1iDGDGc/Z+sW+AEMKHMVvN4=
@@ -116,8 +115,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7
 github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
 github.com/tendermint/go-amino v0.14.1 h1:o2WudxNfdLNBwMyl2dqOJxiro5rfrEaU0Ugs6offJMk=
 github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso=
-github.com/tendermint/tm-cmn v0.0.0-20190716080004-dfcde30d5acb h1:t/HdvqJc9e1iJDl+hf8wQKfOo40aen+Rkqh4AwEaNsI=
-github.com/tendermint/tm-cmn v0.0.0-20190716080004-dfcde30d5acb/go.mod h1:SLI3Mc+gRrorRsAXJArnHz4xmAdJT8O7Ns0NL4HslXE=
+github.com/tendermint/tm-db v0.0.0-20190731085305-94017c88bf1d h1:yCHL2COLGLNfb4sA9AlzIHpapb8UATvAQyJulS6Eg6Q=
+github.com/tendermint/tm-db v0.0.0-20190731085305-94017c88bf1d/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
diff --git a/lite/dbprovider.go b/lite/dbprovider.go
index 79f34610..bbde7ef8 100644
--- a/lite/dbprovider.go
+++ b/lite/dbprovider.go
@@ -10,7 +10,7 @@ import (
 	log "github.com/tendermint/tendermint/libs/log"
 	lerr "github.com/tendermint/tendermint/lite/errors"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 var _ PersistentProvider = (*DBProvider)(nil)
diff --git a/lite/dynamic_verifier_test.go b/lite/dynamic_verifier_test.go
index ab8f9441..c95fee9e 100644
--- a/lite/dynamic_verifier_test.go
+++ b/lite/dynamic_verifier_test.go
@@ -10,7 +10,7 @@ import (
 
 	log "github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestInquirerValidPath(t *testing.T) {
diff --git a/lite/provider_test.go b/lite/provider_test.go
index 63ae3ad3..98fff8cb 100644
--- a/lite/provider_test.go
+++ b/lite/provider_test.go
@@ -10,7 +10,7 @@ import (
 	log "github.com/tendermint/tendermint/libs/log"
 	lerr "github.com/tendermint/tendermint/lite/errors"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 // missingProvider doesn't store anything, always a miss.
diff --git a/lite/proxy/verifier.go b/lite/proxy/verifier.go
index ac76d42a..2119a7ae 100644
--- a/lite/proxy/verifier.go
+++ b/lite/proxy/verifier.go
@@ -5,7 +5,7 @@ import (
 	log "github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/lite"
 	lclient "github.com/tendermint/tendermint/lite/client"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func NewVerifier(chainID, rootDir string, client lclient.SignStatusClient, logger log.Logger, cacheSize int) (*lite.DynamicVerifier, error) {
diff --git a/node/node.go b/node/node.go
index 9060cf04..2884787d 100644
--- a/node/node.go
+++ b/node/node.go
@@ -45,7 +45,7 @@ import (
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
 	"github.com/tendermint/tendermint/version"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //------------------------------------------------------------------------------
diff --git a/node/node_test.go b/node/node_test.go
index 669209f1..f031c13a 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
 	"github.com/tendermint/tendermint/version"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestNodeStartStop(t *testing.T) {
diff --git a/p2p/trust/store.go b/p2p/trust/store.go
index 2b12f695..b0324a1a 100644
--- a/p2p/trust/store.go
+++ b/p2p/trust/store.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const defaultStorePeriodicSaveInterval = 1 * time.Minute
diff --git a/p2p/trust/store_test.go b/p2p/trust/store_test.go
index 0efb6a7c..d6498d82 100644
--- a/p2p/trust/store_test.go
+++ b/p2p/trust/store_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/tendermint/tendermint/libs/log"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestTrustMetricStoreSaveLoad(t *testing.T) {
diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go
index 9581b89d..19abf62f 100644
--- a/rpc/core/pipe.go
+++ b/rpc/core/pipe.go
@@ -14,7 +14,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
diff --git a/state/execution.go b/state/execution.go
index 45affacf..600d339b 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -10,7 +10,7 @@ import (
 	mempl "github.com/tendermint/tendermint/mempool"
 	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //-----------------------------------------------------------------------------
diff --git a/state/export_test.go b/state/export_test.go
index a1428c1b..823eb425 100644
--- a/state/export_test.go
+++ b/state/export_test.go
@@ -3,7 +3,7 @@ package state
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //
diff --git a/state/helpers_test.go b/state/helpers_test.go
index 7e26f039..d6589c57 100644
--- a/state/helpers_test.go
+++ b/state/helpers_test.go
@@ -11,7 +11,7 @@ import (
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 	tmtime "github.com/tendermint/tendermint/types/time"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 type paramsChangeTestCase struct {
diff --git a/state/state_test.go b/state/state_test.go
index ac3b4db9..062e62bb 100644
--- a/state/state_test.go
+++ b/state/state_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	sm "github.com/tendermint/tendermint/state"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/types"
diff --git a/state/store.go b/state/store.go
index 21494212..4f47ace5 100644
--- a/state/store.go
+++ b/state/store.go
@@ -6,7 +6,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
diff --git a/state/store_test.go b/state/store_test.go
index 69625251..4549e8f8 100644
--- a/state/store_test.go
+++ b/state/store_test.go
@@ -11,7 +11,7 @@ import (
 	cfg "github.com/tendermint/tendermint/config"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestStoreLoadValidators(t *testing.T) {
diff --git a/state/tx_filter_test.go b/state/tx_filter_test.go
index c7b9fb53..21c4daf1 100644
--- a/state/tx_filter_test.go
+++ b/state/tx_filter_test.go
@@ -10,7 +10,7 @@ import (
 	cmn "github.com/tendermint/tendermint/libs/common"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 func TestTxFilter(t *testing.T) {
diff --git a/state/txindex/indexer_service_test.go b/state/txindex/indexer_service_test.go
index 9c9ad547..277304c4 100644
--- a/state/txindex/indexer_service_test.go
+++ b/state/txindex/indexer_service_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/state/txindex/kv"
 	"github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tm-cmn/db"
+	db "github.com/tendermint/tm-db"
 )
 
 func TestIndexerServiceIndexesBlocks(t *testing.T) {
diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go
index 16c7b595..4551aa9c 100644
--- a/state/txindex/kv/kv.go
+++ b/state/txindex/kv/kv.go
@@ -15,7 +15,7 @@ import (
 	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (
diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go
index cec84de7..1175ae2f 100644
--- a/state/txindex/kv/kv_test.go
+++ b/state/txindex/kv/kv_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	db "github.com/tendermint/tm-cmn/db"
+	db "github.com/tendermint/tm-db"
 
 	"github.com/tendermint/tendermint/libs/pubsub/query"
 	"github.com/tendermint/tendermint/state/txindex"
diff --git a/state/validation.go b/state/validation.go
index 27b90806..f2218f15 100644
--- a/state/validation.go
+++ b/state/validation.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/types"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 )
 
 //-----------------------------------------------------
diff --git a/store/store.go b/store/store.go
index 76dcdff8..73c9ad01 100644
--- a/store/store.go
+++ b/store/store.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	cmn "github.com/tendermint/tendermint/libs/common"
-	dbm "github.com/tendermint/tm-cmn/db"
+	dbm "github.com/tendermint/tm-db"
 
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/store/store_test.go b/store/store_test.go
index ebd6e690..2d83aecc 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tm-cmn/db"
-	dbm "github.com/tendermint/tm-cmn/db"
+	db "github.com/tendermint/tm-db"
+	dbm "github.com/tendermint/tm-db"
 
 	cfg "github.com/tendermint/tendermint/config"
 	cmn "github.com/tendermint/tendermint/libs/common"