diff --git a/events/cmd/root.go b/events/cmd/root.go
index 81c1f9c8dc..0f59e3fce3 100644
--- a/events/cmd/root.go
+++ b/events/cmd/root.go
@@ -11,7 +11,6 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/akash-network/node/cmd/common"
 	cmdcommon "github.com/akash-network/node/cmd/common"
 	"github.com/akash-network/node/events"
 	"github.com/akash-network/node/pubsub"
@@ -23,7 +22,7 @@ func EventCmd() *cobra.Command {
 		Use:   "events",
 		Short: "Prints out akash events in real time",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return common.RunForeverWithContext(cmd.Context(), func(ctx context.Context) error {
+			return cmdcommon.RunForeverWithContext(cmd.Context(), func(ctx context.Context) error {
 				return getEvents(ctx, cmd, args)
 			})
 		},
diff --git a/testutil/network_suite.go b/testutil/network_suite.go
index 670af7bfe7..8782bacaca 100644
--- a/testutil/network_suite.go
+++ b/testutil/network_suite.go
@@ -19,7 +19,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	cosmosauthtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
@@ -132,7 +131,7 @@ func (nts *NetworkTestSuite) SetupSuite() {
 
 	for lctx.Err() == nil {
 		// check the TX
-		txStatus, err := authtx.QueryTx(nts.Context(), txr.TxHash)
+		txStatus, err := cosmosauthtx.QueryTx(nts.Context(), txr.TxHash)
 		if err != nil {
 			if strings.Contains(err.Error(), ") not found") {
 				continue
diff --git a/x/audit/client/cli/tx.go b/x/audit/client/cli/tx.go
index f8fa6e58c2..a7bd36e371 100644
--- a/x/audit/client/cli/tx.go
+++ b/x/audit/client/cli/tx.go
@@ -12,7 +12,6 @@ import (
 	types "github.com/akash-network/akash-api/go/node/audit/v1beta3"
 	ptypes "github.com/akash-network/akash-api/go/node/provider/v1beta3"
 	akashtypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
-	atypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 
 	"github.com/akash-network/node/client/broadcaster"
 )
@@ -152,7 +151,7 @@ func readAttributes(cmd *cobra.Command, cctx client.Context, provider string, ar
 
 	if len(args) != 0 {
 		for i := 0; i < len(args); i += 2 {
-			attr = append(attr, atypes.Attribute{
+			attr = append(attr, akashtypes.Attribute{
 				Key:   args[i],
 				Value: args[i+1],
 			})
diff --git a/x/audit/keeper/keeper.go b/x/audit/keeper/keeper.go
index 15cf20908c..e1fa890a72 100644
--- a/x/audit/keeper/keeper.go
+++ b/x/audit/keeper/keeper.go
@@ -10,7 +10,6 @@ import (
 	types "github.com/akash-network/akash-api/go/node/audit/v1beta3"
 
 	akashtypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
-	atypes "github.com/akash-network/akash-api/go/node/types/v1beta3"
 )
 
 // TODO: use interfaces for keepers, queriers
@@ -114,7 +113,7 @@ func (k Keeper) CreateOrUpdateProviderAttributes(ctx sdk.Context, id types.Provi
 		attr = akashtypes.Attributes{}
 
 		for ky, val := range kv {
-			attr = append(attr, atypes.Attribute{
+			attr = append(attr, akashtypes.Attribute{
 				Key:   ky,
 				Value: val,
 			})
@@ -176,7 +175,7 @@ func (k Keeper) DeleteProviderAttributes(ctx sdk.Context, id types.ProviderID, k
 		var attr akashtypes.Attributes
 
 		for ky, val := range kv {
-			attr = append(attr, atypes.Attribute{
+			attr = append(attr, akashtypes.Attribute{
 				Key:   ky,
 				Value: val,
 			})