diff --git a/client/ws_client.go b/client/ws_client.go
index 16dc474c3..b83d62974 100644
--- a/client/ws_client.go
+++ b/client/ws_client.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	types "github.com/tendermint/go-rpc/types"
 	wire "github.com/tendermint/go-wire"
 )
diff --git a/server/handlers.go b/server/handlers.go
index 9be64b775..456b4aaf5 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -14,10 +14,10 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
-	cmn "github.com/tendermint/go-common"
-	events "github.com/tendermint/go-events"
 	types "github.com/tendermint/go-rpc/types"
 	wire "github.com/tendermint/go-wire"
+	cmn "github.com/tendermint/tmlibs/common"
+	events "github.com/tendermint/tmlibs/events"
 )
 
 // Adds a route for each function in the funcMap, as well as general jsonrpc and websocket handlers for all functions.
diff --git a/test/main.go b/test/main.go
index 28de2be88..59c6e9b8f 100644
--- a/test/main.go
+++ b/test/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	rpcserver "github.com/tendermint/go-rpc/server"
 )
 
diff --git a/types/types.go b/types/types.go
index 38c7f09db..9c5f2625b 100644
--- a/types/types.go
+++ b/types/types.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	events "github.com/tendermint/go-events"
 	wire "github.com/tendermint/go-wire"
+	events "github.com/tendermint/tmlibs/events"
 )
 
 type RPCRequest struct {