chore: addressing small nits for channel capability migrations (#2258) (

#2278)

(cherry picked from commit c2ce323)

Co-authored-by: Cian Hatton <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>

modules/apps/27-interchain-accounts/controller/migrations/v5/migrations.go

@@ -8,20 +8,20 @@ import (
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 
-	"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
+	controllertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types"
 )
 
 // MigrateICS27ChannelCapability performs a search on a prefix store using the provided store key and module name.
 // It retrieves the associated channel capability index and reassigns ownership to the ICS27 controller submodule.
 func MigrateICS27ChannelCapability(
 	ctx sdk.Context,
 	cdc codec.BinaryCodec,
-	storeKey storetypes.StoreKey,
+	capabilityStoreKey storetypes.StoreKey,
 	capabilityKeeper *capabilitykeeper.Keeper,
 	module string, // the name of the scoped keeper for the underlying app module
 ) error {
 	// construct a prefix store using the x/capability index prefix: index->capability owners
-	prefixStore := prefix.NewStore(ctx.KVStore(storeKey), capabilitytypes.KeyPrefixIndexCapability)
+	prefixStore := prefix.NewStore(ctx.KVStore(capabilityStoreKey), capabilitytypes.KeyPrefixIndexCapability)
 	iterator := sdk.KVStorePrefixIterator(prefixStore, nil)
 	defer iterator.Close()
 
@@ -38,7 +38,7 @@ func MigrateICS27ChannelCapability(
 				owners.Remove(owner)
 
 				// reassign the owner module to icacontroller
-				owner.Module = types.SubModuleName
+				owner.Module = controllertypes.SubModuleName
 
 				// add the controller submodule to the set of owners
 				if err := owners.Set(owner); err != nil {