diff --git a/app/upgrades/types.go b/app/upgrades/types.go
index d9cbd6e9..8404ee29 100644
--- a/app/upgrades/types.go
+++ b/app/upgrades/types.go
@@ -26,14 +26,14 @@ type Upgrade struct {
 	UpgradeName string
 
 	// CreateUpgradeHandler defines the function that creates an upgrade handler
-	CreateUpgradeHandler CreateUpgradeHandler
+	CreateUpgradeHandler UpgradeHandlerCreator
 
 	// Store upgrades, should be used for any new modules introduced, new modules deleted, or store names renamed.
 	StoreUpgrades store.StoreUpgrades
 }
 
-// CreateUpgradeHandler returns a function to run the upgrade handler according to the x/upgrade handler.
-type CreateUpgradeHandler func(*module.Manager, module.Configurator, *keepers.AppKeepers) upgradetypes.UpgradeHandler
+// UpgradeHandlerCreator returns a function to run the upgrade handler according to the x/upgrade handler.
+type UpgradeHandlerCreator func(*module.Manager, module.Configurator, *keepers.AppKeepers) upgradetypes.UpgradeHandler
 
 // Fork defines a struct containing the requisite fields for a non-software upgrade proposal
 // Hard Fork at a given height to implement.
diff --git a/app/upgrades/v1/upgrades.go b/app/upgrades/v1/upgrades.go
index 26037e3c..f2717b41 100644
--- a/app/upgrades/v1/upgrades.go
+++ b/app/upgrades/v1/upgrades.go
@@ -49,7 +49,7 @@ func CreateUpgrade(upgradeDataStr UpgradeDataString) upgrades.Upgrade {
 }
 
 // CreateUpgradeHandler upgrade handler for launch.
-func CreateUpgradeHandler(upgradeDataStr UpgradeDataString) upgrades.CreateUpgradeHandler {
+func CreateUpgradeHandler(upgradeDataStr UpgradeDataString) upgrades.UpgradeHandlerCreator {
 	return func(mm *module.Manager, cfg module.Configurator, keepers *keepers.AppKeepers) upgradetypes.UpgradeHandler {
 		return func(context context.Context, _plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 			ctx := sdk.UnwrapSDKContext(context)