diff --git a/client/tx/factory.go b/client/tx/factory.go
index 00f2b135e..c4f08805e 100644
--- a/client/tx/factory.go
+++ b/client/tx/factory.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/cosmos/cosmos-sdk/crypto/keys"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -22,7 +22,7 @@ type AccountRetriever interface {
 // Factory defines a client transaction factory that facilitates generating and
 // signing an application-specific transaction.
 type Factory struct {
-	keybase            keys.Keybase
+	keybase            keyring.Keybase
 	txGenerator        Generator
 	accountRetriever   AccountRetriever
 	accountNumber      uint64
@@ -37,7 +37,7 @@ type Factory struct {
 }
 
 func NewFactoryFromCLI(input io.Reader) Factory {
-	kb, err := keys.NewKeyring(
+	kb, err := keyring.NewKeyring(
 		sdk.KeyringServiceName(),
 		viper.GetString(flags.FlagKeyringBackend),
 		viper.GetString(flags.FlagHome),
@@ -69,7 +69,7 @@ func (f Factory) AccountNumber() uint64              { return f.accountNumber }
 func (f Factory) Sequence() uint64                   { return f.sequence }
 func (f Factory) Gas() uint64                        { return f.gas }
 func (f Factory) GasAdjustment() float64             { return f.gasAdjustment }
-func (f Factory) Keybase() keys.Keybase              { return f.keybase }
+func (f Factory) Keybase() keyring.Keybase           { return f.keybase }
 func (f Factory) ChainID() string                    { return f.chainID }
 func (f Factory) Memo() string                       { return f.memo }
 func (f Factory) Fees() sdk.Coins                    { return f.fees }
@@ -127,7 +127,7 @@ func (f Factory) WithGasPrices(gasPrices string) Factory {
 }
 
 // WithKeybase returns a copy of the Factory with updated Keybase.
-func (f Factory) WithKeybase(keybase keys.Keybase) Factory {
+func (f Factory) WithKeybase(keybase keyring.Keybase) Factory {
 	f.keybase = keybase
 	return f
 }
diff --git a/client/tx/tx.go b/client/tx/tx.go
index 71c57a318..750f40b3f 100644
--- a/client/tx/tx.go
+++ b/client/tx/tx.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/input"
 	clientkeys "github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/crypto/keys"
+	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/auth"
@@ -326,7 +326,7 @@ func PrepareFactory(ctx context.CLIContext, txf Factory) (Factory, error) {
 // by the CanonicalSignBytes call.
 func Sign(txf Factory, name, passphrase string, tx ClientTx) ([]byte, error) {
 	if txf.keybase == nil {
-		keybase, err := keys.NewKeyring(
+		keybase, err := keyring.NewKeyring(
 			sdk.KeyringServiceName(),
 			viper.GetString(flags.FlagKeyringBackend),
 			viper.GetString(flags.FlagHome),