diff --git a/client/tx/aux_builder_test.go b/client/tx/aux_builder_test.go
index 4758247f9e86..aa2bf7751d20 100644
--- a/client/tx/aux_builder_test.go
+++ b/client/tx/aux_builder_test.go
@@ -1,11 +1,10 @@
-package tx_test
+package tx
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -26,7 +25,7 @@ func TestAuxTxBuilder(t *testing.T) {
 	// required for test case: "GetAuxSignerData works for DIRECT_AUX"
 	counterModule.RegisterInterfaces(reg)
 
-	var b tx.AuxTxBuilder
+	var b AuxTxBuilder
 
 	testcases := []struct {
 		name      string
@@ -200,7 +199,7 @@ func TestAuxTxBuilder(t *testing.T) {
 	for _, tc := range testcases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			b = tx.NewAuxTxBuilder()
+			b = NewAuxTxBuilder()
 			err := tc.malleate()
 
 			if tc.expErr {
diff --git a/client/tx/factory_test.go b/client/tx/factory_test.go
index 9dcc61cd5bb5..cec28d05a149 100644
--- a/client/tx/factory_test.go
+++ b/client/tx/factory_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 )
 
-func TestFactoryPrepate(t *testing.T) {
+func TestFactoryPrepare(t *testing.T) {
 	t.Parallel()
 
 	factory := Factory{}
diff --git a/client/tx/legacy_test.go b/client/tx/legacy_test.go
index 15aac031523e..cd7a64776fa4 100644
--- a/client/tx/legacy_test.go
+++ b/client/tx/legacy_test.go
@@ -1,4 +1,4 @@
-package tx_test
+package tx
 
 import (
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
diff --git a/client/tx/tx_test.go b/client/tx/tx_test.go
index 340fbc804349..384c2177d650 100644
--- a/client/tx/tx_test.go
+++ b/client/tx/tx_test.go
@@ -1,4 +1,4 @@
-package tx_test
+package tx
 
 import (
 	"context"
@@ -9,12 +9,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 
-	ante "cosmossdk.io/x/auth/ante"
+	"cosmossdk.io/x/auth/ante"
 	"cosmossdk.io/x/auth/signing"
 	authtx "cosmossdk.io/x/auth/tx"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
@@ -81,7 +80,7 @@ func TestCalculateGas(t *testing.T) {
 		defaultSignMode, err := signing.APISignModeToInternal(txCfg.SignModeHandler().DefaultMode())
 		require.NoError(t, err)
 
-		txf := tx.Factory{}.
+		txf := Factory{}.
 			WithChainID("test-chain").
 			WithTxConfig(txCfg).WithSignMode(defaultSignMode)
 
@@ -90,7 +89,7 @@ func TestCalculateGas(t *testing.T) {
 				gasUsed: tc.args.mockGasUsed,
 				wantErr: tc.args.mockWantErr,
 			}
-			simRes, gotAdjusted, err := tx.CalculateGas(mockClientCtx, txf.WithGasAdjustment(stc.args.adjustment))
+			simRes, gotAdjusted, err := CalculateGas(mockClientCtx, txf.WithGasAdjustment(stc.args.adjustment))
 			if stc.expPass {
 				require.NoError(t, err)
 				require.Equal(t, simRes.GasInfo.GasUsed, stc.wantEstimate)
@@ -104,8 +103,8 @@ func TestCalculateGas(t *testing.T) {
 	}
 }
 
-func mockTxFactory(txCfg client.TxConfig) tx.Factory {
-	return tx.Factory{}.
+func mockTxFactory(txCfg client.TxConfig) Factory {
+	return Factory{}.
 		WithTxConfig(txCfg).
 		WithAccountNumber(50).
 		WithSequence(23).
@@ -196,7 +195,7 @@ func TestMnemonicInMemo(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			txf := tx.Factory{}.
+			txf := Factory{}.
 				WithTxConfig(txConfig).
 				WithAccountNumber(50).
 				WithSequence(23).
@@ -267,7 +266,7 @@ func TestSign(t *testing.T) {
 
 	testCases := []struct {
 		name         string
-		txf          tx.Factory
+		txf          Factory
 		txb          client.TxBuilder
 		from         string
 		overwrite    bool
@@ -354,7 +353,7 @@ func TestSign(t *testing.T) {
 	var prevSigs []signingtypes.SignatureV2
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			err = tx.Sign(context.TODO(), tc.txf, tc.from, tc.txb, tc.overwrite)
+			err = Sign(context.TODO(), tc.txf, tc.from, tc.txb, tc.overwrite)
 			if len(tc.expectedPKs) == 0 {
 				requireT.Error(err)
 			} else {
@@ -409,7 +408,7 @@ func TestPreprocessHook(t *testing.T) {
 	txb, err := txfDirect.BuildUnsignedTx(msg1, msg2)
 	requireT.NoError(err)
 
-	err = tx.Sign(context.TODO(), txfDirect, from, txb, false)
+	err = Sign(context.TODO(), txfDirect, from, txb, false)
 	requireT.NoError(err)
 
 	// Run preprocessing