diff --git a/client/client.go b/client/client.go
index 38fff486..a54978fc 100644
--- a/client/client.go
+++ b/client/client.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 type Client interface {
diff --git a/client/grpc_client.go b/client/grpc_client.go
index 7cca5079..42393669 100644
--- a/client/grpc_client.go
+++ b/client/grpc_client.go
@@ -10,7 +10,7 @@ import (
 	grpc "google.golang.org/grpc"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 // A stripped copy of the remoteClient that makes
diff --git a/client/local_client.go b/client/local_client.go
index 1150db4a..4bdcffad 100644
--- a/client/local_client.go
+++ b/client/local_client.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	types "github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 type localClient struct {
diff --git a/client/log.go b/client/log.go
index 944b05ba..146bf127 100644
--- a/client/log.go
+++ b/client/log.go
@@ -1,7 +1,7 @@
 package abcicli
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "abcicli")
diff --git a/client/socket_client.go b/client/socket_client.go
index 5aeeac7a..ebcfb44b 100644
--- a/client/socket_client.go
+++ b/client/socket_client.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 const (
diff --git a/cmd/counter/main.go b/cmd/counter/main.go
index 6858fc43..e7b777a8 100644
--- a/cmd/counter/main.go
+++ b/cmd/counter/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/tendermint/abci/example/counter"
 	"github.com/tendermint/abci/server"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
diff --git a/cmd/dummy/main.go b/cmd/dummy/main.go
index b48a15c7..a1cc68ae 100644
--- a/cmd/dummy/main.go
+++ b/cmd/dummy/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/abci/example/dummy"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
diff --git a/example/block_aware/block_aware_app.go b/example/block_aware/block_aware_app.go
index 454c3560..e1afee96 100644
--- a/example/block_aware/block_aware_app.go
+++ b/example/block_aware/block_aware_app.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
diff --git a/example/counter/counter.go b/example/counter/counter.go
index c40541ed..c4e4e267 100644
--- a/example/counter/counter.go
+++ b/example/counter/counter.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 type CounterApplication struct {
diff --git a/example/dummy/dummy.go b/example/dummy/dummy.go
index f88b1b20..f384cc98 100644
--- a/example/dummy/dummy.go
+++ b/example/dummy/dummy.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-merkle"
 )
 
diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go
index 879cf3c4..aa040948 100644
--- a/example/dummy/dummy_test.go
+++ b/example/dummy/dummy_test.go
@@ -10,7 +10,7 @@ import (
 	abcicli "github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-merkle"
 )
diff --git a/example/dummy/log.go b/example/dummy/log.go
index 8571fa01..5607ca55 100644
--- a/example/dummy/log.go
+++ b/example/dummy/log.go
@@ -1,7 +1,7 @@
 package dummy
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "dummy")
diff --git a/example/dummy/persistent_dummy.go b/example/dummy/persistent_dummy.go
index 48eff420..258cb301 100644
--- a/example/dummy/persistent_dummy.go
+++ b/example/dummy/persistent_dummy.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
-	dbm "github.com/tendermint/go-db"
+	cmn "github.com/tendermint/tmlibs/common"
+	dbm "github.com/tendermint/tmlibs/db"
 	"github.com/tendermint/go-merkle"
 	"github.com/tendermint/go-wire"
 )
diff --git a/example/example_test.go b/example/example_test.go
index 034331d6..e6edef36 100644
--- a/example/example_test.go
+++ b/example/example_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/tendermint/abci/example/dummy"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func TestDummy(t *testing.T) {
diff --git a/glide.lock b/glide.lock
index f9d043fa..cd453aa0 100644
--- a/glide.lock
+++ b/glide.lock
@@ -46,19 +46,19 @@ imports:
   subpackages:
   - edwards25519
   - extra25519
-- name: github.com/tendermint/go-common
+- name: github.com/tendermint/tmlibs/common
   version: f9e3db037330c8a8d61d3966de8473eaf01154fa
 - name: github.com/tendermint/go-crypto
   version: 9b95da8fa4187f6799558d89b271dc8ab6485615
 - name: github.com/tendermint/go-data
   version: e7fcc6d081ec8518912fcdc103188275f83a3ee5
-- name: github.com/tendermint/go-db
+- name: github.com/tendermint/tmlibs/db
   version: 9643f60bc2578693844aacf380a7c32e4c029fee
-- name: github.com/tendermint/go-logger
+- name: github.com/tendermint/tmlibs/logger
   version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
 - name: github.com/tendermint/go-merkle
   version: 714d4d04557fd068a7c2a1748241ce8428015a96
-- name: github.com/tendermint/go-process
+- name: github.com/tendermint/tmlibs/process
   version: b27edfd189b1a01a0b099f7e9f8263589cf04909
 - name: github.com/tendermint/go-wire
   version: 334005c236d19c632fb5f073f9de3b0fab6a522b
diff --git a/glide.yaml b/glide.yaml
index 4d035802..542d2df0 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,19 +3,19 @@ import:
 - package: github.com/golang/protobuf
   subpackages:
   - proto
-- package: github.com/tendermint/go-common
+- package: github.com/tendermint/tmlibs/common
   version: develop
 - package: github.com/tendermint/go-crypto
   version: develop
 - package: github.com/tendermint/go-data
   version: develop
-- package: github.com/tendermint/go-logger
+- package: github.com/tendermint/tmlibs/logger
   version: develop
-- package: github.com/tendermint/go-db
+- package: github.com/tendermint/tmlibs/db
   version: develop
 - package: github.com/tendermint/go-merkle
   version: develop
-- package: github.com/tendermint/go-process
+- package: github.com/tendermint/tmlibs/process
 - package: github.com/tendermint/go-wire
   version: develop
 - package: github.com/urfave/cli
diff --git a/server/grpc_server.go b/server/grpc_server.go
index 944d4e42..003a7661 100644
--- a/server/grpc_server.go
+++ b/server/grpc_server.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 // var maxNumberConnections = 2
diff --git a/server/log.go b/server/log.go
index 4b313d25..887c9ed6 100644
--- a/server/log.go
+++ b/server/log.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "abci-server")
diff --git a/server/server.go b/server/server.go
index eb71b132..d18df820 100644
--- a/server/server.go
+++ b/server/server.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func NewServer(protoAddr, transport string, app types.Application) (cmn.Service, error) {
diff --git a/server/socket_server.go b/server/socket_server.go
index bc1980e2..9933829c 100644
--- a/server/socket_server.go
+++ b/server/socket_server.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 // var maxNumberConnections = 2
diff --git a/tests/benchmarks/parallel/parallel.go b/tests/benchmarks/parallel/parallel.go
index f01fba4c..cc68cead 100644
--- a/tests/benchmarks/parallel/parallel.go
+++ b/tests/benchmarks/parallel/parallel.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
diff --git a/tests/benchmarks/simple/simple.go b/tests/benchmarks/simple/simple.go
index 498aac34..ef5bab86 100644
--- a/tests/benchmarks/simple/simple.go
+++ b/tests/benchmarks/simple/simple.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 func main() {
diff --git a/tests/test_app/app.go b/tests/test_app/app.go
index 87b74ead..7cff5710 100644
--- a/tests/test_app/app.go
+++ b/tests/test_app/app.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/types"
-	"github.com/tendermint/go-process"
+	"github.com/tendermint/tmlibs/process"
 )
 
 func startApp(abciApp string) *process.Process {