diff --git a/app/ante.go b/app/ante.go
index d0769f89a5a..2bba12a8d68 100644
--- a/app/ante.go
+++ b/app/ante.go
@@ -11,11 +11,11 @@ import (
 	ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 
-	osmoante "github.com/osmosis-labs/osmosis/v15/ante"
-	v9 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v9"
+	osmoante "github.com/osmosis-labs/osmosis/v16/ante"
+	v9 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v9"
 
-	txfeeskeeper "github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	txfeeskeeper "github.com/osmosis-labs/osmosis/v16/x/txfees/keeper"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 // Link to default ante handler used by cosmos sdk:
diff --git a/app/app.go b/app/app.go
index ad6b94aa400..b84b6428bde 100644
--- a/app/app.go
+++ b/app/app.go
@@ -45,23 +45,23 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	v10 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v10"
-	v11 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v11"
-	v12 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v12"
-	v13 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v13"
-	v14 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v14"
-	v15 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v15"
-	v16 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v16"
-	v3 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v3"
-	v4 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v4"
-	v5 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v5"
-	v6 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v6"
-	v7 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v7"
-	v8 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v8"
-	v9 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v9"
-	_ "github.com/osmosis-labs/osmosis/v15/client/docs/statik"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	v10 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v10"
+	v11 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v11"
+	v12 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v12"
+	v13 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v13"
+	v14 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v14"
+	v15 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v15"
+	v16 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v16"
+	v3 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v3"
+	v4 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v4"
+	v5 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v5"
+	v6 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v6"
+	v7 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v7"
+	v8 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v8"
+	v9 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v9"
+	_ "github.com/osmosis-labs/osmosis/v16/client/docs/statik"
 )
 
 const appName = "OsmosisApp"
diff --git a/app/apptesting/concentrated_liquidity.go b/app/apptesting/concentrated_liquidity.go
index 4055d0b0575..6b0e54907f1 100644
--- a/app/apptesting/concentrated_liquidity.go
+++ b/app/apptesting/concentrated_liquidity.go
@@ -5,10 +5,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
 )
 
 var (
diff --git a/app/apptesting/cosmwasmpool.go b/app/apptesting/cosmwasmpool.go
index 01cace2c7c0..61f5809d361 100644
--- a/app/apptesting/cosmwasmpool.go
+++ b/app/apptesting/cosmwasmpool.go
@@ -9,11 +9,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg/transmuter"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg/transmuter"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
 
-	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 )
 
 const (
diff --git a/app/apptesting/gamm.go b/app/apptesting/gamm.go
index 7f209c43df6..d4d0fdc048e 100644
--- a/app/apptesting/gamm.go
+++ b/app/apptesting/gamm.go
@@ -4,11 +4,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/app/apptesting/pool_manager.go b/app/apptesting/pool_manager.go
index a9edd3c6d6e..7c9f3ff1463 100644
--- a/app/apptesting/pool_manager.go
+++ b/app/apptesting/pool_manager.go
@@ -5,9 +5,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	poolmanager "github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	poolmanager "github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) {
diff --git a/app/apptesting/superfluid.go b/app/apptesting/superfluid.go
index 8fabc4b1fab..2159adebf69 100644
--- a/app/apptesting/superfluid.go
+++ b/app/apptesting/superfluid.go
@@ -4,8 +4,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestHelper) SuperfluidDelegateToDefaultVal(sender sdk.AccAddress, poolId uint64, lockId uint64) error {
diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
index 2a0b00c663a..5b02cd7d13b 100644
--- a/app/apptesting/test_suite.go
+++ b/app/apptesting/test_suite.go
@@ -30,15 +30,15 @@ import (
 	tmtypes "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
+	"github.com/osmosis-labs/osmosis/v16/app"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
-	lockupkeeper "github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	lockupkeeper "github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type KeeperTestHelper struct {
diff --git a/app/encoding.go b/app/encoding.go
index 4110811277c..a8a0287d740 100644
--- a/app/encoding.go
+++ b/app/encoding.go
@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/params"
+	"github.com/osmosis-labs/osmosis/v16/app/params"
 
 	"github.com/cosmos/cosmos-sdk/std"
 )
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index f1195517a0e..0d083166ce8 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -36,16 +36,16 @@ import (
 	icq "github.com/cosmos/ibc-apps/modules/async-icq/v4"
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool"
-	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	downtimedetector "github.com/osmosis-labs/osmosis/v15/x/downtime-detector"
-	downtimetypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm"
-	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool"
+	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	downtimedetector "github.com/osmosis-labs/osmosis/v16/x/downtime-detector"
+	downtimetypes "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm"
+	ibcratelimit "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev"
 	ibchooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
 	ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
 	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
@@ -69,35 +69,35 @@ import (
 	// IBC Transfer: Defines the "transfer" IBC port
 	transfer "github.com/cosmos/ibc-go/v4/modules/apps/transfer"
 
-	_ "github.com/osmosis-labs/osmosis/v15/client/docs/statik"
-	owasm "github.com/osmosis-labs/osmosis/v15/wasmbinding"
-	concentratedliquidity "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentiveskeeper "github.com/osmosis-labs/osmosis/v15/x/incentives/keeper"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockupkeeper "github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	mintkeeper "github.com/osmosis-labs/osmosis/v15/x/mint/keeper"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentives "github.com/osmosis-labs/osmosis/v15/x/pool-incentives"
-	poolincentiveskeeper "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/keeper"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	protorevkeeper "github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid"
-	superfluidkeeper "github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees"
-	txfeeskeeper "github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
-	valsetpref "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	valsetpreftypes "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	_ "github.com/osmosis-labs/osmosis/v16/client/docs/statik"
+	owasm "github.com/osmosis-labs/osmosis/v16/wasmbinding"
+	concentratedliquidity "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentiveskeeper "github.com/osmosis-labs/osmosis/v16/x/incentives/keeper"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockupkeeper "github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	mintkeeper "github.com/osmosis-labs/osmosis/v16/x/mint/keeper"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentives "github.com/osmosis-labs/osmosis/v16/x/pool-incentives"
+	poolincentiveskeeper "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/keeper"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	protorevkeeper "github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid"
+	superfluidkeeper "github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees"
+	txfeeskeeper "github.com/osmosis-labs/osmosis/v16/x/txfees/keeper"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
+	valsetpref "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	valsetpreftypes "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 	epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
diff --git a/app/keepers/keys.go b/app/keepers/keys.go
index 0515e191a00..bc79f66d3e9 100644
--- a/app/keepers/keys.go
+++ b/app/keepers/keys.go
@@ -5,7 +5,7 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // GenerateKeys generates new keys (KV Store, Transient store, and memory store).
diff --git a/app/keepers/modules.go b/app/keepers/modules.go
index 8f5b59562b6..3ec464c50bf 100644
--- a/app/keepers/modules.go
+++ b/app/keepers/modules.go
@@ -29,27 +29,27 @@ import (
 	icq "github.com/cosmos/ibc-apps/modules/async-icq/v4"
 	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
 
-	_ "github.com/osmosis-labs/osmosis/v15/client/docs/statik"
-	clclient "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client"
-	concentratedliquidity "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/clmodule"
-	cosmwasmpoolmodule "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/module"
-	downtimemodule "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/module"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm"
-	gammclient "github.com/osmosis-labs/osmosis/v15/x/gamm/client"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/ibcratelimitmodule"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup"
-	"github.com/osmosis-labs/osmosis/v15/x/mint"
-	poolincentives "github.com/osmosis-labs/osmosis/v15/x/pool-incentives"
-	poolincentivesclient "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/client"
-	poolmanager "github.com/osmosis-labs/osmosis/v15/x/poolmanager/module"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev"
-	superfluid "github.com/osmosis-labs/osmosis/v15/x/superfluid"
-	superfluidclient "github.com/osmosis-labs/osmosis/v15/x/superfluid/client"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/twapmodule"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees"
-	valsetprefmodule "github.com/osmosis-labs/osmosis/v15/x/valset-pref/valpref-module"
+	_ "github.com/osmosis-labs/osmosis/v16/client/docs/statik"
+	clclient "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client"
+	concentratedliquidity "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/clmodule"
+	cosmwasmpoolmodule "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/module"
+	downtimemodule "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/module"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm"
+	gammclient "github.com/osmosis-labs/osmosis/v16/x/gamm/client"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/ibcratelimitmodule"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup"
+	"github.com/osmosis-labs/osmosis/v16/x/mint"
+	poolincentives "github.com/osmosis-labs/osmosis/v16/x/pool-incentives"
+	poolincentivesclient "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/client"
+	poolmanager "github.com/osmosis-labs/osmosis/v16/x/poolmanager/module"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev"
+	superfluid "github.com/osmosis-labs/osmosis/v16/x/superfluid"
+	superfluidclient "github.com/osmosis-labs/osmosis/v16/x/superfluid/client"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/twapmodule"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees"
+	valsetprefmodule "github.com/osmosis-labs/osmosis/v16/x/valset-pref/valpref-module"
 	"github.com/osmosis-labs/osmosis/x/epochs"
 	ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
 )
diff --git a/app/modules.go b/app/modules.go
index 7da70f8ae69..79f4e3ff4e0 100644
--- a/app/modules.go
+++ b/app/modules.go
@@ -22,8 +22,8 @@ import (
 
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
-	downtimemodule "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/module"
-	downtimetypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	downtimemodule "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/module"
+	downtimetypes "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 
 	ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks"
 
@@ -58,38 +58,38 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/partialord"
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	_ "github.com/osmosis-labs/osmosis/v15/client/docs/statik"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	concentratedliquidity "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/clmodule"
-	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/ibcratelimitmodule"
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/mint"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentives "github.com/osmosis-labs/osmosis/v15/x/pool-incentives"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanager "github.com/osmosis-labs/osmosis/v15/x/poolmanager/module"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
-	superfluid "github.com/osmosis-labs/osmosis/v15/x/superfluid"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/twapmodule"
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
-	valsetpreftypes "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
-	valsetprefmodule "github.com/osmosis-labs/osmosis/v15/x/valset-pref/valpref-module"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	_ "github.com/osmosis-labs/osmosis/v16/client/docs/statik"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	concentratedliquidity "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/clmodule"
+	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/ibcratelimitmodule"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentives "github.com/osmosis-labs/osmosis/v16/x/pool-incentives"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanager "github.com/osmosis-labs/osmosis/v16/x/poolmanager/module"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
+	superfluid "github.com/osmosis-labs/osmosis/v16/x/superfluid"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/twapmodule"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
+	valsetpreftypes "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
+	valsetprefmodule "github.com/osmosis-labs/osmosis/v16/x/valset-pref/valpref-module"
 	"github.com/osmosis-labs/osmosis/x/epochs"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
diff --git a/app/posthandler.go b/app/posthandler.go
index 00e1ab4fec3..8e8a0090a64 100644
--- a/app/posthandler.go
+++ b/app/posthandler.go
@@ -3,7 +3,7 @@ package app
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	protorevkeeper "github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
+	protorevkeeper "github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
 )
 
 func NewPostHandler(protoRevKeeper *protorevkeeper.Keeper) sdk.AnteHandler {
diff --git a/app/upgrades/types.go b/app/upgrades/types.go
index b0eb2befd6d..8dd0f7eae41 100644
--- a/app/upgrades/types.go
+++ b/app/upgrades/types.go
@@ -7,7 +7,7 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
 )
 
 // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil
diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go
index 374529e0ec7..71f14c47704 100644
--- a/app/upgrades/v10/constants.go
+++ b/app/upgrades/v10/constants.go
@@ -1,7 +1,7 @@
 package v10
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 // Last executed block on the v9 code was 4713064.
diff --git a/app/upgrades/v10/fork.go b/app/upgrades/v10/fork.go
index 976ea2ad25a..eae1cdb8f60 100644
--- a/app/upgrades/v10/fork.go
+++ b/app/upgrades/v10/fork.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
 )
 
 func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) {
diff --git a/app/upgrades/v10/upgrades_test.go b/app/upgrades/v10/upgrades_test.go
index daf79258233..880198c38a2 100644
--- a/app/upgrades/v10/upgrades_test.go
+++ b/app/upgrades/v10/upgrades_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v10 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v10"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v10 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v10"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go
index 607943b6a62..819ff56b51b 100644
--- a/app/upgrades/v11/constants.go
+++ b/app/upgrades/v11/constants.go
@@ -3,7 +3,7 @@ package v11
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v11 upgrade.
diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go
index 8cfac20819f..1cc85ad536f 100644
--- a/app/upgrades/v11/upgrades.go
+++ b/app/upgrades/v11/upgrades.go
@@ -5,8 +5,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 func CreateUpgradeHandler(
diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go
index a9fd6522eca..e9c776fe5aa 100644
--- a/app/upgrades/v12/constants.go
+++ b/app/upgrades/v12/constants.go
@@ -1,8 +1,8 @@
 package v12
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
diff --git a/app/upgrades/v12/upgrade_test.go b/app/upgrades/v12/upgrade_test.go
index 392d64e7277..9c874442ff7 100644
--- a/app/upgrades/v12/upgrade_test.go
+++ b/app/upgrades/v12/upgrade_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go
index 90aa897d861..9fcedc94ea5 100644
--- a/app/upgrades/v12/upgrades.go
+++ b/app/upgrades/v12/upgrades.go
@@ -11,12 +11,12 @@ import (
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // We set the app version to pre-upgrade because it will be incremented by one
diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go
index 7841fff223a..5cb73d5d119 100644
--- a/app/upgrades/v13/constants.go
+++ b/app/upgrades/v13/constants.go
@@ -3,7 +3,7 @@ package v13
 import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v13 upgrade.
diff --git a/app/upgrades/v13/upgrade_test.go b/app/upgrades/v13/upgrade_test.go
index 77aeb9f02e5..2eded844ac6 100644
--- a/app/upgrades/v13/upgrade_test.go
+++ b/app/upgrades/v13/upgrade_test.go
@@ -6,14 +6,14 @@ import (
 
 	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/stretchr/testify/suite"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go
index 35923e5df0c..06b7cd94660 100644
--- a/app/upgrades/v13/upgrades.go
+++ b/app/upgrades/v13/upgrades.go
@@ -13,10 +13,10 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 //go:embed rate_limiter.wasm
diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go
index d9352dfdede..d25abbe0554 100644
--- a/app/upgrades/v14/constants.go
+++ b/app/upgrades/v14/constants.go
@@ -5,8 +5,8 @@ import (
 
 	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	downtimetypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	downtimetypes "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v14 upgrade.
diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go
index d111b68a9ed..05cd55ad810 100644
--- a/app/upgrades/v14/upgrades.go
+++ b/app/upgrades/v14/upgrades.go
@@ -5,8 +5,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 func CreateUpgradeHandler(
diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go
index a59f959fe18..fa4cbb15760 100644
--- a/app/upgrades/v15/constants.go
+++ b/app/upgrades/v15/constants.go
@@ -5,10 +5,10 @@ import (
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
-	valsetpreftypes "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
+	valsetpreftypes "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v15 upgrade.
diff --git a/app/upgrades/v15/export_test.go b/app/upgrades/v15/export_test.go
index 1d145c42c5d..bdcde6bb677 100644
--- a/app/upgrades/v15/export_test.go
+++ b/app/upgrades/v15/export_test.go
@@ -6,12 +6,12 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v4/keeper"
 
-	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
+	ibcratelimit "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
 )
 
 func MigrateNextPoolId(ctx sdk.Context, gammKeeper *gammkeeper.Keeper, poolmanager *poolmanager.Keeper) {
diff --git a/app/upgrades/v15/upgrade_test.go b/app/upgrades/v15/upgrade_test.go
index 57b785761a4..5e7699d753e 100644
--- a/app/upgrades/v15/upgrade_test.go
+++ b/app/upgrades/v15/upgrade_test.go
@@ -13,15 +13,15 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v15 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v15"
-	gamm "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	balancer "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v15 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v15"
+	gamm "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	balancer "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go
index fb62156e212..c5ba966adbb 100644
--- a/app/upgrades/v15/upgrades.go
+++ b/app/upgrades/v15/upgrades.go
@@ -3,7 +3,7 @@ package v15
 import (
 	packetforwardtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -15,19 +15,19 @@ import (
 	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v4/keeper"
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v4/types"
 
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding"
-	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding"
+	ibcratelimit "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
 )
 
 func CreateUpgradeHandler(
diff --git a/app/upgrades/v16/concentrated_pool.go b/app/upgrades/v16/concentrated_pool.go
index 0017255973c..9fe70667f82 100644
--- a/app/upgrades/v16/concentrated_pool.go
+++ b/app/upgrades/v16/concentrated_pool.go
@@ -4,12 +4,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // createConcentratedPoolFromCFMM creates a new concentrated liquidity pool with the desiredDenom0 token as the
diff --git a/app/upgrades/v16/concentrated_pool_test.go b/app/upgrades/v16/concentrated_pool_test.go
index 29752d1f03d..3639dff8276 100644
--- a/app/upgrades/v16/concentrated_pool_test.go
+++ b/app/upgrades/v16/concentrated_pool_test.go
@@ -7,10 +7,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v16 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v16"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v16 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v16"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 type ConcentratedUpgradeTestSuite struct {
diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go
index 78e31a95a30..6b1a32b7eb8 100644
--- a/app/upgrades/v16/constants.go
+++ b/app/upgrades/v16/constants.go
@@ -1,12 +1,12 @@
 package v16
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v16 upgrade.
diff --git a/app/upgrades/v16/export_test.go b/app/upgrades/v16/export_test.go
index 00a103992a1..984c7892cbe 100644
--- a/app/upgrades/v16/export_test.go
+++ b/app/upgrades/v16/export_test.go
@@ -4,11 +4,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
 )
 
 var (
diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go
index 0a247698996..1cb9854f6a6 100644
--- a/app/upgrades/v16/upgrades.go
+++ b/app/upgrades/v16/upgrades.go
@@ -7,16 +7,16 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 	cosmwasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 const (
diff --git a/app/upgrades/v16/upgrades_test.go b/app/upgrades/v16/upgrades_test.go
index c95f22a5d3b..6765254a444 100644
--- a/app/upgrades/v16/upgrades_test.go
+++ b/app/upgrades/v16/upgrades_test.go
@@ -13,11 +13,11 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v16 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v16"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v16 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v16"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go
index 7e4b0cba32d..50b2124eaae 100644
--- a/app/upgrades/v3/constants.go
+++ b/app/upgrades/v3/constants.go
@@ -1,6 +1,6 @@
 package v3
 
-import "github.com/osmosis-labs/osmosis/v15/app/upgrades"
+import "github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 const (
 	// UpgradeName defines the on-chain upgrade name for the Osmosis v3 upgrade.
diff --git a/app/upgrades/v3/forks.go b/app/upgrades/v3/forks.go
index 880b8361468..d56dbd94b94 100644
--- a/app/upgrades/v3/forks.go
+++ b/app/upgrades/v3/forks.go
@@ -5,7 +5,7 @@ import (
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
 )
 
 // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v3
diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go
index dd820a76c81..7ace52cb7cf 100644
--- a/app/upgrades/v4/constants.go
+++ b/app/upgrades/v4/constants.go
@@ -1,7 +1,7 @@
 package v4
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go
index a8ad0fe0c4f..6b501bfddba 100644
--- a/app/upgrades/v4/upgrade_test.go
+++ b/app/upgrades/v4/upgrade_test.go
@@ -11,8 +11,8 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	v4 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v4"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	v4 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v4"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go
index 9f5695bd5f1..8769da217a8 100644
--- a/app/upgrades/v4/upgrades.go
+++ b/app/upgrades/v4/upgrades.go
@@ -5,8 +5,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 // CreateUpgradeHandler returns an x/upgrade handler for the Osmosis v4 on-chain
diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go
index 939051dca00..f44ad6c379a 100644
--- a/app/upgrades/v5/constants.go
+++ b/app/upgrades/v5/constants.go
@@ -1,7 +1,7 @@
 package v5
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go
index 715e4e65786..3c86caca7bc 100644
--- a/app/upgrades/v5/upgrades.go
+++ b/app/upgrades/v5/upgrades.go
@@ -10,9 +10,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 func CreateUpgradeHandler(
diff --git a/app/upgrades/v5/whitelist_feetokens.go b/app/upgrades/v5/whitelist_feetokens.go
index 9b6e9872539..cbf39de61c3 100644
--- a/app/upgrades/v5/whitelist_feetokens.go
+++ b/app/upgrades/v5/whitelist_feetokens.go
@@ -7,8 +7,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 // Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21
diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go
index 5a95784c8a3..5b0f449dbe2 100644
--- a/app/upgrades/v6/constants.go
+++ b/app/upgrades/v6/constants.go
@@ -1,6 +1,6 @@
 package v6
 
-import "github.com/osmosis-labs/osmosis/v15/app/upgrades"
+import "github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 const (
 	// UpgradeName defines the on-chain upgrade name for the Osmosis v6 upgrade.
diff --git a/app/upgrades/v6/forks.go b/app/upgrades/v6/forks.go
index f1f7c7c376a..cb2bd0f47f9 100644
--- a/app/upgrades/v6/forks.go
+++ b/app/upgrades/v6/forks.go
@@ -3,7 +3,7 @@ package v6
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
 )
 
 // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v6
diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go
index 7298cbe255d..ffdc8fc9aef 100644
--- a/app/upgrades/v7/constants.go
+++ b/app/upgrades/v7/constants.go
@@ -3,8 +3,8 @@ package v7
 import (
 	"github.com/CosmWasm/wasmd/x/wasm"
 
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go
index 7c1b1ca5143..e70773acc4c 100644
--- a/app/upgrades/v7/upgrades.go
+++ b/app/upgrades/v7/upgrades.go
@@ -7,10 +7,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	lockupkeeper "github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	lockupkeeper "github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func CreateUpgradeHandler(
diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go
index 699040037c8..a451d8696d6 100644
--- a/app/upgrades/v8/constants.go
+++ b/app/upgrades/v8/constants.go
@@ -1,8 +1,8 @@
 package v8
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
-	v8constants "github.com/osmosis-labs/osmosis/v15/app/upgrades/v8/constants"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
+	v8constants "github.com/osmosis-labs/osmosis/v16/app/upgrades/v8/constants"
 )
 
 const (
diff --git a/app/upgrades/v8/forks.go b/app/upgrades/v8/forks.go
index 6c4053caf6e..4606fb2cfa2 100644
--- a/app/upgrades/v8/forks.go
+++ b/app/upgrades/v8/forks.go
@@ -3,7 +3,7 @@ package v8
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
 )
 
 // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v8
diff --git a/app/upgrades/v8/incentive_props.go b/app/upgrades/v8/incentive_props.go
index f97f8532e3b..fdbb765bd64 100644
--- a/app/upgrades/v8/incentive_props.go
+++ b/app/upgrades/v8/incentive_props.go
@@ -4,8 +4,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	poolincentiveskeeper "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/keeper"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	poolincentiveskeeper "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/keeper"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 // This file implements logic for accelerated incentive proposals.
diff --git a/app/upgrades/v8/msg_filter_ante.go b/app/upgrades/v8/msg_filter_ante.go
index 087099faf8f..e31477b5e2d 100644
--- a/app/upgrades/v8/msg_filter_ante.go
+++ b/app/upgrades/v8/msg_filter_ante.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 // MsgFilterDecorator defines an AnteHandler decorator for the v8 upgrade that
diff --git a/app/upgrades/v8/msg_filter_ante_test.go b/app/upgrades/v8/msg_filter_ante_test.go
index 7b7e383b607..67a3bca63d6 100644
--- a/app/upgrades/v8/msg_filter_ante_test.go
+++ b/app/upgrades/v8/msg_filter_ante_test.go
@@ -7,9 +7,9 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	v8 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v8"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	v8 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v8"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func noOpAnteDecorator() sdk.AnteHandler {
diff --git a/app/upgrades/v8/unpool_whitelist.go b/app/upgrades/v8/unpool_whitelist.go
index 3424dc22d8d..abd70790b8c 100644
--- a/app/upgrades/v8/unpool_whitelist.go
+++ b/app/upgrades/v8/unpool_whitelist.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	superfluidkeeper "github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	superfluidkeeper "github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
 )
 
 const ustDenom = "ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC"
diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go
index 3083cee3a44..9a95d288380 100644
--- a/app/upgrades/v9/constants.go
+++ b/app/upgrades/v9/constants.go
@@ -1,13 +1,13 @@
 package v9
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 
 	store "github.com/cosmos/cosmos-sdk/store/types"
 
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
 
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // UpgradeName defines the on-chain upgrade name for the Osmosis v9 upgrade.
diff --git a/app/upgrades/v9/msg_filter_ante_test.go b/app/upgrades/v9/msg_filter_ante_test.go
index ed32a666eaa..0f93561c4ff 100644
--- a/app/upgrades/v9/msg_filter_ante_test.go
+++ b/app/upgrades/v9/msg_filter_ante_test.go
@@ -9,9 +9,9 @@ import (
 
 	ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	v8 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v8"
-	v9 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v9"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	v8 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v8"
+	v9 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v9"
 )
 
 func noOpAnteDecorator() sdk.AnteHandler {
diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go
index 3b7f27bfd85..c0aa5ef34e6 100644
--- a/app/upgrades/v9/prop214.go
+++ b/app/upgrades/v9/prop214.go
@@ -3,8 +3,8 @@ package v9
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammkeeper "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
+	gammkeeper "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
 )
 
 // Executes prop214, https://www.mintscan.io/osmosis/proposals/214
diff --git a/app/upgrades/v9/prop214_test.go b/app/upgrades/v9/prop214_test.go
index ee9275484d2..b46a37d49f2 100644
--- a/app/upgrades/v9/prop214_test.go
+++ b/app/upgrades/v9/prop214_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v9 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v9"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v9 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v9"
 )
 
 type UpgradeTestSuite struct {
diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go
index 555786e1978..3b47be99aab 100644
--- a/app/upgrades/v9/upgrades.go
+++ b/app/upgrades/v9/upgrades.go
@@ -10,15 +10,15 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts"
 	icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types"
 	icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/keepers"
-	"github.com/osmosis-labs/osmosis/v15/app/upgrades"
+	"github.com/osmosis-labs/osmosis/v16/app/keepers"
+	"github.com/osmosis-labs/osmosis/v16/app/upgrades"
 )
 
 const preUpgradeAppVersion = 8
diff --git a/cmd/osmosisd/cmd/balances_from_state_export.go b/cmd/osmosisd/cmd/balances_from_state_export.go
index 99aad6a6608..af3e5a2c92b 100644
--- a/cmd/osmosisd/cmd/balances_from_state_export.go
+++ b/cmd/osmosisd/cmd/balances_from_state_export.go
@@ -13,9 +13,9 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
diff --git a/cmd/osmosisd/cmd/change_environment.go b/cmd/osmosisd/cmd/change_environment.go
index 38bc882cfe8..08b63e39075 100644
--- a/cmd/osmosisd/cmd/change_environment.go
+++ b/cmd/osmosisd/cmd/change_environment.go
@@ -8,7 +8,7 @@ import (
 	"github.com/joho/godotenv"
 	"github.com/spf13/cobra"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
+	"github.com/osmosis-labs/osmosis/v16/app"
 )
 
 const (
diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go
index ac25d23d0ad..dc2109a15c4 100644
--- a/cmd/osmosisd/cmd/genesis.go
+++ b/cmd/osmosisd/cmd/genesis.go
@@ -25,11 +25,11 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
 
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/cmd/osmosisd/cmd/init.go b/cmd/osmosisd/cmd/init.go
index b7a6b2c1902..71f30719a52 100644
--- a/cmd/osmosisd/cmd/init.go
+++ b/cmd/osmosisd/cmd/init.go
@@ -27,7 +27,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
+	"github.com/osmosis-labs/osmosis/v16/app"
 )
 
 const (
diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
index a75eef05b8a..641f027e116 100644
--- a/cmd/osmosisd/cmd/root.go
+++ b/cmd/osmosisd/cmd/root.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/osmosis-labs/osmosis/v15/app/params"
+	"github.com/osmosis-labs/osmosis/v16/app/params"
 
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
@@ -43,7 +43,7 @@ import (
 	"github.com/joho/godotenv"
 
 	"github.com/cosmos/cosmos-sdk/client/config"
-	osmosis "github.com/osmosis-labs/osmosis/v15/app"
+	osmosis "github.com/osmosis-labs/osmosis/v16/app"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the
diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go
index d1e23b6b534..8a8bad0808c 100644
--- a/cmd/osmosisd/main.go
+++ b/cmd/osmosisd/main.go
@@ -5,9 +5,9 @@ import (
 
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	osmosis "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/cmd/osmosisd/cmd"
+	osmosis "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/cmd/osmosisd/cmd"
 )
 
 func main() {
diff --git a/cmd/querygen/main.go b/cmd/querygen/main.go
index 0db10a4c646..32878a46cc8 100644
--- a/cmd/querygen/main.go
+++ b/cmd/querygen/main.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/cmd/querygen/templates"
+	"github.com/osmosis-labs/osmosis/v16/cmd/querygen/templates"
 )
 
 var grpcTemplate template.Template
diff --git a/cmd/querygen/templates/queryyml.go b/cmd/querygen/templates/queryyml.go
index 1eaa0ef6588..3729c7e17f9 100644
--- a/cmd/querygen/templates/queryyml.go
+++ b/cmd/querygen/templates/queryyml.go
@@ -10,7 +10,7 @@ import (
 type QueryYml struct {
 	// Keeper struct descriptor
 	Keeper Keeper `yaml:"keeper"`
-	// Path to client folder e.g. "github.com/osmosis-labs/osmosis/v15/x/twap/client"
+	// Path to client folder e.g. "github.com/osmosis-labs/osmosis/v16/x/twap/client"
 	ClientPath string `yaml:"client_path"`
 	// list of all queries, key is the query name, e.g. `GetArithmeticTwap`
 	Queries map[string]YmlQueryDescriptor `yaml:"queries"`
@@ -19,7 +19,7 @@ type QueryYml struct {
 }
 
 type Keeper struct {
-	// e.g. github.com/osmosis-labs/osmosis/v15/x/twap
+	// e.g. github.com/osmosis-labs/osmosis/v16/x/twap
 	Path string `yaml:"path"`
 	// e.g. Keeper
 	Struct string `yaml:"struct"`
diff --git a/cmd/querygen/templates/queryyml_test.go b/cmd/querygen/templates/queryyml_test.go
index 5d629b62b8f..d2d4fb761a7 100644
--- a/cmd/querygen/templates/queryyml_test.go
+++ b/cmd/querygen/templates/queryyml_test.go
@@ -11,7 +11,7 @@ func TestParseFilePathFromImportPath(t *testing.T) {
 		importPath       string
 		expectedFilePath string
 	}{
-		"standard": {importPath: "github.com/osmosis-labs/osmosis/v15/x/twap", expectedFilePath: "x/twap"},
+		"standard": {importPath: "github.com/osmosis-labs/osmosis/v16/x/twap", expectedFilePath: "x/twap"},
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
diff --git a/go.mod b/go.mod
index dc8aab98527..97ac79a2e11 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/osmosis-labs/osmosis/v15
+module github.com/osmosis-labs/osmosis/v16
 
 go 1.20
 
diff --git a/proto/osmosis/concentrated-liquidity/genesis.proto b/proto/osmosis/concentrated-liquidity/genesis.proto
index 8073f76167c..20107ec5499 100644
--- a/proto/osmosis/concentrated-liquidity/genesis.proto
+++ b/proto/osmosis/concentrated-liquidity/genesis.proto
@@ -11,7 +11,7 @@ import "osmosis/concentrated-liquidity/position.proto";
 import "osmosis/concentrated-liquidity/tickInfo.proto";
 import "osmosis/concentrated-liquidity/incentive_record.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis";
 
 // FullTick contains tick index and pool id along with other tick model
 // information.
diff --git a/proto/osmosis/concentrated-liquidity/gov.proto b/proto/osmosis/concentrated-liquidity/gov.proto
index 1f0f6291bc8..a86ebd1e1f5 100644
--- a/proto/osmosis/concentrated-liquidity/gov.proto
+++ b/proto/osmosis/concentrated-liquidity/gov.proto
@@ -3,7 +3,7 @@ package osmosis.concentratedliquidity.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types";
 
 // CreateConcentratedLiquidityPoolsProposal is a gov Content type for creating
 // concentrated liquidity pools. If a CreateConcentratedLiquidityPoolsProposal
diff --git a/proto/osmosis/concentrated-liquidity/incentive_record.proto b/proto/osmosis/concentrated-liquidity/incentive_record.proto
index 2a0e127b710..4ada1fab444 100644
--- a/proto/osmosis/concentrated-liquidity/incentive_record.proto
+++ b/proto/osmosis/concentrated-liquidity/incentive_record.proto
@@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types";
 
 // IncentiveRecord is the high-level struct we use to deal with an independent
 // incentive being distributed on a pool. Note that PoolId, Denom, and MinUptime
diff --git a/proto/osmosis/concentrated-liquidity/params.proto b/proto/osmosis/concentrated-liquidity/params.proto
index 4c1144f9139..ed02128c91d 100644
--- a/proto/osmosis/concentrated-liquidity/params.proto
+++ b/proto/osmosis/concentrated-liquidity/params.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types";
 
 message Params {
   // authorized_tick_spacing is an array of uint64s that represents the tick
diff --git a/proto/osmosis/concentrated-liquidity/pool-model/tx.proto b/proto/osmosis/concentrated-liquidity/pool-model/tx.proto
index 1d41d142c7b..096cdec2243 100644
--- a/proto/osmosis/concentrated-liquidity/pool-model/tx.proto
+++ b/proto/osmosis/concentrated-liquidity/pool-model/tx.proto
@@ -4,7 +4,7 @@ package osmosis.concentratedliquidity.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model";
 
 service MsgCreator {
   rpc CreateConcentratedPool(MsgCreateConcentratedPool)
diff --git a/proto/osmosis/concentrated-liquidity/pool.proto b/proto/osmosis/concentrated-liquidity/pool.proto
index a3720170af2..1f5138ba932 100644
--- a/proto/osmosis/concentrated-liquidity/pool.proto
+++ b/proto/osmosis/concentrated-liquidity/pool.proto
@@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model";
 
 message Pool {
   option (gogoproto.goproto_getters) = false;
diff --git a/proto/osmosis/concentrated-liquidity/position.proto b/proto/osmosis/concentrated-liquidity/position.proto
index 00943637122..2b0fb4d5664 100644
--- a/proto/osmosis/concentrated-liquidity/position.proto
+++ b/proto/osmosis/concentrated-liquidity/position.proto
@@ -11,7 +11,7 @@ import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model";
 
 // Position contains position's id, address, pool id, lower tick, upper tick
 // join time, and liquidity.
diff --git a/proto/osmosis/concentrated-liquidity/query.proto b/proto/osmosis/concentrated-liquidity/query.proto
index 6713f2e4211..c07e12cb771 100644
--- a/proto/osmosis/concentrated-liquidity/query.proto
+++ b/proto/osmosis/concentrated-liquidity/query.proto
@@ -16,7 +16,7 @@ import "google/protobuf/duration.proto";
 import "osmosis/concentrated-liquidity/position.proto";
 import "osmosis/concentrated-liquidity/incentive_record.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto";
 
 service Query {
   // Pools returns all concentrated liquidity pools
diff --git a/proto/osmosis/concentrated-liquidity/query.yml b/proto/osmosis/concentrated-liquidity/query.yml
index 73f9200db60..497958cd8d3 100644
--- a/proto/osmosis/concentrated-liquidity/query.yml
+++ b/proto/osmosis/concentrated-liquidity/query.yml
@@ -1,7 +1,7 @@
 keeper:
-  path: "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
+  path: "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client"
 queries:
   Pools:
     proto_wrapper:
diff --git a/proto/osmosis/concentrated-liquidity/tickInfo.proto b/proto/osmosis/concentrated-liquidity/tickInfo.proto
index 0ff02f5c617..8d86ce28a14 100644
--- a/proto/osmosis/concentrated-liquidity/tickInfo.proto
+++ b/proto/osmosis/concentrated-liquidity/tickInfo.proto
@@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model";
 
 message TickInfo {
   string liquidity_gross = 1 [
diff --git a/proto/osmosis/concentrated-liquidity/tx.proto b/proto/osmosis/concentrated-liquidity/tx.proto
index 8a815ca9bd7..fb24e6bcefd 100644
--- a/proto/osmosis/concentrated-liquidity/tx.proto
+++ b/proto/osmosis/concentrated-liquidity/tx.proto
@@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types";
 
 service Msg {
   rpc CreatePosition(MsgCreatePosition) returns (MsgCreatePositionResponse);
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
index 990e48639bf..054ab558881 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types";
 
 // Params holds parameters for the cosmwasmpool module
 message Params {}
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
index 51cca2544f7..6e4e584d27f 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg";
 
 // ===================== InstantiateMsg
 message InstantiateMsg {
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
index 85dc52c4222..8b06bf51b49 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg";
 
 // ===================== CalcOutAmtGivenIn
 message CalcOutAmtGivenIn {
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
index aad128072bb..06c047975ea 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg";
 
 // ===================== SwapExactAmountIn
 message SwapExactAmountIn {
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
index f5759a2f10a..c9e432ae98e 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto
@@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model";
 
 message CosmWasmPool {
   option (gogoproto.goproto_getters) = false;
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
index 62bd830b197..08ada282028 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg";
 
 // ===================== GetSwapFeeQueryMsg
 message GetSwapFeeQueryMsg {
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
index 85410f76373..9ac12ae8892 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg/transmuter";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg/transmuter";
 
 // ===================== JoinPoolExecuteMsg
 message EmptyRequest {}
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
index 81410c40291..afe25c2556e 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto
@@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model";
 
 service MsgCreator {
   rpc CreateCosmWasmPool(MsgCreateCosmWasmPool)
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.proto b/proto/osmosis/cosmwasmpool/v1beta1/query.proto
index f262fc91700..85f896302ab 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/query.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/query.proto
@@ -12,7 +12,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/queryproto";
 
 service Query {
   rpc Params(ParamsRequest) returns (ParamsResponse) {
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.yml b/proto/osmosis/cosmwasmpool/v1beta1/query.yml
index cf35492de0a..0435543462b 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/query.yml
+++ b/proto/osmosis/cosmwasmpool/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper: 
-  path: "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool"
+  path: "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client"
 queries:
   Params:
     proto_wrapper:
diff --git a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
index 5020ae02dd5..62926ba3a36 100644
--- a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
+++ b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto
@@ -4,6 +4,6 @@ package osmosis.cosmwasmpool.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types";
 
 service Msg {}
diff --git a/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto b/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto
index d036ab3ccc7..9574e1c5696 100644
--- a/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto
+++ b/proto/osmosis/downtime-detector/v1beta1/downtime_duration.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types";
 
 enum Downtime {
   DURATION_30S = 0;
diff --git a/proto/osmosis/downtime-detector/v1beta1/genesis.proto b/proto/osmosis/downtime-detector/v1beta1/genesis.proto
index 340544961e2..cd196c4e695 100644
--- a/proto/osmosis/downtime-detector/v1beta1/genesis.proto
+++ b/proto/osmosis/downtime-detector/v1beta1/genesis.proto
@@ -8,7 +8,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "osmosis/downtime-detector/v1beta1/downtime_duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types";
 
 message GenesisDowntimeEntry {
   Downtime duration = 1 [ (gogoproto.moretags) = "yaml:\"duration\"" ];
diff --git a/proto/osmosis/downtime-detector/v1beta1/query.proto b/proto/osmosis/downtime-detector/v1beta1/query.proto
index 8316c6a353f..e15f0c318e0 100644
--- a/proto/osmosis/downtime-detector/v1beta1/query.proto
+++ b/proto/osmosis/downtime-detector/v1beta1/query.proto
@@ -13,7 +13,7 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto";
 
 service Query {
   rpc RecoveredSinceDowntimeOfLength(RecoveredSinceDowntimeOfLengthRequest)
diff --git a/proto/osmosis/downtime-detector/v1beta1/query.yml b/proto/osmosis/downtime-detector/v1beta1/query.yml
index de5e4fdf5bd..a26a5c22adf 100644
--- a/proto/osmosis/downtime-detector/v1beta1/query.yml
+++ b/proto/osmosis/downtime-detector/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper: 
-  path: "github.com/osmosis-labs/osmosis/v15/x/downtime-detector"
+  path: "github.com/osmosis-labs/osmosis/v16/x/downtime-detector"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client"
 queries:
   RecoveredSinceDowntimeOfLength:
     proto_wrapper:
diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
index 31a14be7779..f8d187588e3 100644
--- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
+++ b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto
@@ -15,7 +15,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer";
 
 // Parameters for changing the weights in a balancer pool smoothly from
 // a start weight and end weight over a period of time.
diff --git a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto b/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto
index 6063dc72fe0..1cf094e5974 100644
--- a/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto
+++ b/proto/osmosis/gamm/pool-models/balancer/tx/tx.proto
@@ -7,7 +7,7 @@ import "osmosis/gamm/pool-models/balancer/balancerPool.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer";
 
 service Msg {
   rpc CreateBalancerPool(MsgCreateBalancerPool)
diff --git a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
index 466524df936..701abb67b98 100644
--- a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
+++ b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto
@@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap";
 
 // PoolParams defined the parameters that will be managed by the pool
 // governance in the future. This params are not managed by the chain
diff --git a/proto/osmosis/gamm/pool-models/stableswap/tx.proto b/proto/osmosis/gamm/pool-models/stableswap/tx.proto
index c270fe79ac2..162660edd66 100644
--- a/proto/osmosis/gamm/pool-models/stableswap/tx.proto
+++ b/proto/osmosis/gamm/pool-models/stableswap/tx.proto
@@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
 import "amino/amino.proto";
 import "osmosis/gamm/pool-models/stableswap/stableswap_pool.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap";
 
 service Msg {
   rpc CreateStableswapPool(MsgCreateStableswapPool)
diff --git a/proto/osmosis/gamm/v1beta1/genesis.proto b/proto/osmosis/gamm/v1beta1/genesis.proto
index d1d5aa15bab..bb49d6af568 100644
--- a/proto/osmosis/gamm/v1beta1/genesis.proto
+++ b/proto/osmosis/gamm/v1beta1/genesis.proto
@@ -15,7 +15,7 @@ message Params {
   ];
 }
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types";
 
 // GenesisState defines the gamm module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/gamm/v1beta1/gov.proto b/proto/osmosis/gamm/v1beta1/gov.proto
index f7baaa4d355..72476530ec1 100644
--- a/proto/osmosis/gamm/v1beta1/gov.proto
+++ b/proto/osmosis/gamm/v1beta1/gov.proto
@@ -6,7 +6,7 @@ import "osmosis/gamm/v1beta1/genesis.proto";
 import "cosmos_proto/cosmos.proto";
 import "amino/amino.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types";
 
 // ReplaceMigrationRecordsProposal is a gov Content type for updating the
 // migration records. If a ReplaceMigrationRecordsProposal passes, the
diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto
index c196efd0038..ad9e6124a51 100644
--- a/proto/osmosis/gamm/v1beta1/query.proto
+++ b/proto/osmosis/gamm/v1beta1/query.proto
@@ -11,7 +11,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types";
 
 service Query {
   rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) {
diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto
index ebf534af7aa..8ccb0b30d29 100644
--- a/proto/osmosis/gamm/v1beta1/tx.proto
+++ b/proto/osmosis/gamm/v1beta1/tx.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/swap_route.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/types";
 
 service Msg {
   rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse);
diff --git a/proto/osmosis/gamm/v2/query.proto b/proto/osmosis/gamm/v2/query.proto
index 12c97ca0c2d..81549332b55 100644
--- a/proto/osmosis/gamm/v2/query.proto
+++ b/proto/osmosis/gamm/v2/query.proto
@@ -10,7 +10,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/gamm/v2types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/gamm/v2types";
 
 service Query {
   // Deprecated: please use alternate in x/poolmanager
diff --git a/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto b/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto
index e0789be02f4..2fb6b8b414a 100644
--- a/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto
+++ b/proto/osmosis/ibc-rate-limit/v1beta1/genesis.proto
@@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "google/protobuf/any.proto";
 import "osmosis/ibc-rate-limit/v1beta1/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types";
 
 // GenesisState defines the ibc-rate-limit module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/ibc-rate-limit/v1beta1/params.proto b/proto/osmosis/ibc-rate-limit/v1beta1/params.proto
index 880ab0d3349..11c507e7b55 100644
--- a/proto/osmosis/ibc-rate-limit/v1beta1/params.proto
+++ b/proto/osmosis/ibc-rate-limit/v1beta1/params.proto
@@ -3,7 +3,7 @@ package osmosis.ibcratelimit.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types";
 
 // Params defines the parameters for the ibc-rate-limit module.
 message Params {
diff --git a/proto/osmosis/ibc-rate-limit/v1beta1/query.proto b/proto/osmosis/ibc-rate-limit/v1beta1/query.proto
index 6b290f133ab..49651f9beac 100644
--- a/proto/osmosis/ibc-rate-limit/v1beta1/query.proto
+++ b/proto/osmosis/ibc-rate-limit/v1beta1/query.proto
@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/ibc-rate-limit/v1beta1/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/ibc-rate-limit/v1beta1/query.yml b/proto/osmosis/ibc-rate-limit/v1beta1/query.yml
index e8d4e57a050..c8251b578f1 100644
--- a/proto/osmosis/ibc-rate-limit/v1beta1/query.yml
+++ b/proto/osmosis/ibc-rate-limit/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper: 
-  path: "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
+  path: "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client"
 queries:
   Params:
     proto_wrapper:
diff --git a/proto/osmosis/incentives/gauge.proto b/proto/osmosis/incentives/gauge.proto
index d0a20c896b7..99daeaf3373 100644
--- a/proto/osmosis/incentives/gauge.proto
+++ b/proto/osmosis/incentives/gauge.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types";
 
 // Gauge is an object that stores and distributes yields to recipients who
 // satisfy certain conditions. Currently gauges support conditions around the
diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto
index 4c9dd6daf81..fa3b7b6974d 100644
--- a/proto/osmosis/incentives/genesis.proto
+++ b/proto/osmosis/incentives/genesis.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "osmosis/incentives/params.proto";
 import "osmosis/incentives/gauge.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types";
 
 // GenesisState defines the incentives module's various parameters when first
 // initialized
diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto
index 9dcc0d22c07..f487632b916 100644
--- a/proto/osmosis/incentives/params.proto
+++ b/proto/osmosis/incentives/params.proto
@@ -3,7 +3,7 @@ package osmosis.incentives;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types";
 
 // Params holds parameters for the incentives module
 message Params {
diff --git a/proto/osmosis/incentives/query.proto b/proto/osmosis/incentives/query.proto
index b6a038505c6..c8866de88f3 100644
--- a/proto/osmosis/incentives/query.proto
+++ b/proto/osmosis/incentives/query.proto
@@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/incentives/gauge.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types";
 
 // Query defines the gRPC querier service
 service Query {
diff --git a/proto/osmosis/incentives/tx.proto b/proto/osmosis/incentives/tx.proto
index a1eaa1f9b1a..f4652ac7633 100644
--- a/proto/osmosis/incentives/tx.proto
+++ b/proto/osmosis/incentives/tx.proto
@@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/incentives/gauge.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/incentives/types";
 
 service Msg {
   rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse);
diff --git a/proto/osmosis/lockup/genesis.proto b/proto/osmosis/lockup/genesis.proto
index 6638a81e7fe..dcceda84734 100644
--- a/proto/osmosis/lockup/genesis.proto
+++ b/proto/osmosis/lockup/genesis.proto
@@ -4,7 +4,7 @@ package osmosis.lockup;
 import "gogoproto/gogo.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types";
 
 // GenesisState defines the lockup module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/lockup/lock.proto b/proto/osmosis/lockup/lock.proto
index 1d79dfb2746..879dcfdd68d 100644
--- a/proto/osmosis/lockup/lock.proto
+++ b/proto/osmosis/lockup/lock.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types";
 
 // PeriodLock is a single lock unit by period defined by the x/lockup module.
 // It's a record of a locked coin at a specific time. It stores owner, duration,
diff --git a/proto/osmosis/lockup/params.proto b/proto/osmosis/lockup/params.proto
index 5b309e262c3..1f2c6f283ff 100644
--- a/proto/osmosis/lockup/params.proto
+++ b/proto/osmosis/lockup/params.proto
@@ -3,7 +3,7 @@ package osmosis.lockup;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types";
 
 message Params {
   repeated string force_unlock_allowed_addresses = 1
diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto
index bb92f91c727..afb29ffd677 100644
--- a/proto/osmosis/lockup/query.proto
+++ b/proto/osmosis/lockup/query.proto
@@ -9,7 +9,7 @@ import "google/protobuf/duration.proto";
 import "osmosis/lockup/lock.proto";
 import "osmosis/lockup/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto
index 7c7924be34f..79c23d4be8f 100644
--- a/proto/osmosis/lockup/tx.proto
+++ b/proto/osmosis/lockup/tx.proto
@@ -7,7 +7,7 @@ import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/lockup/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/osmosis/mint/v1beta1/genesis.proto b/proto/osmosis/mint/v1beta1/genesis.proto
index 16dbc195606..483f74bed68 100644
--- a/proto/osmosis/mint/v1beta1/genesis.proto
+++ b/proto/osmosis/mint/v1beta1/genesis.proto
@@ -4,7 +4,7 @@ package osmosis.mint.v1beta1;
 import "gogoproto/gogo.proto";
 import "osmosis/mint/v1beta1/mint.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/mint/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types";
 
 // GenesisState defines the mint module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/mint/v1beta1/mint.proto b/proto/osmosis/mint/v1beta1/mint.proto
index 3be26fbbd22..9c167ad65b6 100644
--- a/proto/osmosis/mint/v1beta1/mint.proto
+++ b/proto/osmosis/mint/v1beta1/mint.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package osmosis.mint.v1beta1;
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/mint/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types";
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/proto/osmosis/mint/v1beta1/query.proto b/proto/osmosis/mint/v1beta1/query.proto
index 75e668cc336..7ca61eaed85 100644
--- a/proto/osmosis/mint/v1beta1/query.proto
+++ b/proto/osmosis/mint/v1beta1/query.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "osmosis/mint/v1beta1/mint.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/mint/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/mint/types";
 
 // Query provides defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/pool-incentives/v1beta1/genesis.proto b/proto/osmosis/pool-incentives/v1beta1/genesis.proto
index 42cc6a98446..94628c7f9ec 100644
--- a/proto/osmosis/pool-incentives/v1beta1/genesis.proto
+++ b/proto/osmosis/pool-incentives/v1beta1/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "osmosis/pool-incentives/v1beta1/incentives.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types";
 
 // GenesisState defines the pool incentives module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto
index 489537e6804..4379def1cc6 100644
--- a/proto/osmosis/pool-incentives/v1beta1/gov.proto
+++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "gogoproto/gogo.proto";
 import "osmosis/pool-incentives/v1beta1/incentives.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types";
 
 // ReplacePoolIncentivesProposal is a gov Content type for updating the pool
 // incentives. If a ReplacePoolIncentivesProposal passes, the proposal’s records
diff --git a/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/proto/osmosis/pool-incentives/v1beta1/incentives.proto
index 9a2fa897ab1..df0fbb8a195 100644
--- a/proto/osmosis/pool-incentives/v1beta1/incentives.proto
+++ b/proto/osmosis/pool-incentives/v1beta1/incentives.proto
@@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1;
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types";
 
 message Params {
   option (gogoproto.goproto_stringer) = false;
diff --git a/proto/osmosis/pool-incentives/v1beta1/query.proto b/proto/osmosis/pool-incentives/v1beta1/query.proto
index ce6537749df..56c2da491e6 100644
--- a/proto/osmosis/pool-incentives/v1beta1/query.proto
+++ b/proto/osmosis/pool-incentives/v1beta1/query.proto
@@ -7,7 +7,7 @@ import "google/protobuf/duration.proto";
 import "osmosis/incentives/gauge.proto";
 import "osmosis/pool-incentives/v1beta1/incentives.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types";
 
 service Query {
   // GaugeIds takes the pool id and returns the matching gauge ids and durations
diff --git a/proto/osmosis/poolmanager/v1beta1/genesis.proto b/proto/osmosis/poolmanager/v1beta1/genesis.proto
index 709f84c469d..23bc3f292a1 100644
--- a/proto/osmosis/poolmanager/v1beta1/genesis.proto
+++ b/proto/osmosis/poolmanager/v1beta1/genesis.proto
@@ -8,7 +8,7 @@ import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/module_route.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types";
 
 // Params holds parameters for the poolmanager module
 message Params {
diff --git a/proto/osmosis/poolmanager/v1beta1/module_route.proto b/proto/osmosis/poolmanager/v1beta1/module_route.proto
index e5d6098e9c9..8f10ef7854e 100644
--- a/proto/osmosis/poolmanager/v1beta1/module_route.proto
+++ b/proto/osmosis/poolmanager/v1beta1/module_route.proto
@@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types";
 
 // PoolType is an enumeration of all supported pool types.
 enum PoolType {
diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
index a01ca4bec21..a56b7ced51d 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.proto
+++ b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -13,7 +13,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto";
 
 service Query {
   rpc Params(ParamsRequest) returns (ParamsResponse) {
diff --git a/proto/osmosis/poolmanager/v1beta1/query.yml b/proto/osmosis/poolmanager/v1beta1/query.yml
index f77acd1618d..6c9c8703ba3 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.yml
+++ b/proto/osmosis/poolmanager/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper:
-  path: "github.com/osmosis-labs/osmosis/v15/x/poolmanager"
+  path: "github.com/osmosis-labs/osmosis/v16/x/poolmanager"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client"
 queries:
   Params:
     proto_wrapper:
diff --git a/proto/osmosis/poolmanager/v1beta1/swap_route.proto b/proto/osmosis/poolmanager/v1beta1/swap_route.proto
index 15691ee1053..8f0c54228d2 100644
--- a/proto/osmosis/poolmanager/v1beta1/swap_route.proto
+++ b/proto/osmosis/poolmanager/v1beta1/swap_route.proto
@@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types";
 
 message SwapAmountInRoute {
   uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
diff --git a/proto/osmosis/poolmanager/v1beta1/tx.proto b/proto/osmosis/poolmanager/v1beta1/tx.proto
index 4e6d6dcdc4f..5fc166472c8 100644
--- a/proto/osmosis/poolmanager/v1beta1/tx.proto
+++ b/proto/osmosis/poolmanager/v1beta1/tx.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/poolmanager/v1beta1/swap_route.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types";
 
 service Msg {
   rpc SwapExactAmountIn(MsgSwapExactAmountIn)
diff --git a/proto/osmosis/protorev/v1beta1/genesis.proto b/proto/osmosis/protorev/v1beta1/genesis.proto
index 9e9873dfa13..98bd0d4c683 100644
--- a/proto/osmosis/protorev/v1beta1/genesis.proto
+++ b/proto/osmosis/protorev/v1beta1/genesis.proto
@@ -8,7 +8,7 @@ import "cosmos_proto/cosmos.proto";
 
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 // GenesisState defines the protorev module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/protorev/v1beta1/gov.proto b/proto/osmosis/protorev/v1beta1/gov.proto
index 295a4b4f277..d46b5fa6d99 100644
--- a/proto/osmosis/protorev/v1beta1/gov.proto
+++ b/proto/osmosis/protorev/v1beta1/gov.proto
@@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 import "osmosis/protorev/v1beta1/protorev.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 // SetProtoRevEnabledProposal is a gov Content type to update whether the
 // protorev module is enabled
diff --git a/proto/osmosis/protorev/v1beta1/params.proto b/proto/osmosis/protorev/v1beta1/params.proto
index b84830e9a53..23dd2d384ff 100644
--- a/proto/osmosis/protorev/v1beta1/params.proto
+++ b/proto/osmosis/protorev/v1beta1/params.proto
@@ -4,7 +4,7 @@ package osmosis.protorev.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 // Params defines the parameters for the module.
 message Params {
diff --git a/proto/osmosis/protorev/v1beta1/protorev.proto b/proto/osmosis/protorev/v1beta1/protorev.proto
index de64064f6bc..9969e03b71f 100644
--- a/proto/osmosis/protorev/v1beta1/protorev.proto
+++ b/proto/osmosis/protorev/v1beta1/protorev.proto
@@ -6,7 +6,7 @@ import "gogoproto/gogo.proto";
 
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 // TokenPairArbRoutes tracks all of the hot routes for a given pair of tokens
 message TokenPairArbRoutes {
diff --git a/proto/osmosis/protorev/v1beta1/query.proto b/proto/osmosis/protorev/v1beta1/query.proto
index a31fc51657a..af94e73a2af 100644
--- a/proto/osmosis/protorev/v1beta1/query.proto
+++ b/proto/osmosis/protorev/v1beta1/query.proto
@@ -9,7 +9,7 @@ import "osmosis/protorev/v1beta1/protorev.proto";
 
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/protorev/v1beta1/tx.proto b/proto/osmosis/protorev/v1beta1/tx.proto
index 3c3c51510e0..91a7dfdd7c7 100644
--- a/proto/osmosis/protorev/v1beta1/tx.proto
+++ b/proto/osmosis/protorev/v1beta1/tx.proto
@@ -7,7 +7,7 @@ import "google/api/annotations.proto";
 import "osmosis/protorev/v1beta1/protorev.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/protorev/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/protorev/types";
 
 service Msg {
   // SetHotRoutes sets the hot routes that will be explored when creating
diff --git a/proto/osmosis/superfluid/genesis.proto b/proto/osmosis/superfluid/genesis.proto
index c274449acbf..effb1b4c6fe 100644
--- a/proto/osmosis/superfluid/genesis.proto
+++ b/proto/osmosis/superfluid/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "osmosis/superfluid/superfluid.proto";
 import "osmosis/superfluid/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // GenesisState defines the module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto
index 8af14672b41..a52e8b3928f 100644
--- a/proto/osmosis/superfluid/params.proto
+++ b/proto/osmosis/superfluid/params.proto
@@ -4,7 +4,7 @@ package osmosis.superfluid;
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // Params holds parameters for the superfluid module
 message Params {
diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto
index e9cef121f9c..bbece7ea026 100644
--- a/proto/osmosis/superfluid/query.proto
+++ b/proto/osmosis/superfluid/query.proto
@@ -12,7 +12,7 @@ import "osmosis/lockup/lock.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "cosmos/staking/v1beta1/staking.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/superfluid/superfluid.proto b/proto/osmosis/superfluid/superfluid.proto
index fdac41c1272..01f61cff40a 100644
--- a/proto/osmosis/superfluid/superfluid.proto
+++ b/proto/osmosis/superfluid/superfluid.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // SuperfluidAssetType indicates whether the superfluid asset is
 // a native token, lp share of a pool, or concentrated share of a pool
diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto
index f2a3e1ecd7e..e085ed1a05d 100644
--- a/proto/osmosis/superfluid/tx.proto
+++ b/proto/osmosis/superfluid/tx.proto
@@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
 import "osmosis/superfluid/superfluid.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // Msg defines the Msg service.
 service Msg {
diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto
index f8e80e8768f..6bbde7e224b 100644
--- a/proto/osmosis/superfluid/v1beta1/gov.proto
+++ b/proto/osmosis/superfluid/v1beta1/gov.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "cosmos_proto/cosmos.proto";
 import "osmosis/superfluid/superfluid.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/superfluid/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/superfluid/types";
 
 // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid
 // assets
diff --git a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto
index 2f6cceec1c4..4fdd68b7bc1 100644
--- a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto
@@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types";
 
 // DenomAuthorityMetadata specifies metadata for addresses that have specific
 // capabilities over a token factory denom. Right now there is only one Admin
diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto
index 92af2c466a7..827ebb31829 100644
--- a/proto/osmosis/tokenfactory/v1beta1/genesis.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "osmosis/tokenfactory/v1beta1/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types";
 
 // GenesisState defines the tokenfactory module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto
index 6ff5d0b3a3f..734e218921c 100644
--- a/proto/osmosis/tokenfactory/v1beta1/params.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/params.proto
@@ -6,7 +6,7 @@ import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types";
 
 // Params defines the parameters for the tokenfactory module.
 message Params {
diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto
index f1c7196588e..a7ccd584985 100644
--- a/proto/osmosis/tokenfactory/v1beta1/query.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/query.proto
@@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto";
 import "osmosis/tokenfactory/v1beta1/params.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types";
 
 // Query defines the gRPC querier service.
 service Query {
diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto
index e2dc9371e55..99199660b92 100644
--- a/proto/osmosis/tokenfactory/v1beta1/tx.proto
+++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto
@@ -6,7 +6,7 @@ import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "cosmos/bank/v1beta1/bank.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types";
 
 // Msg defines the tokefactory module's gRPC message service.
 service Msg {
diff --git a/proto/osmosis/twap/v1beta1/genesis.proto b/proto/osmosis/twap/v1beta1/genesis.proto
index 2c055b7b155..c00b830d2c1 100644
--- a/proto/osmosis/twap/v1beta1/genesis.proto
+++ b/proto/osmosis/twap/v1beta1/genesis.proto
@@ -7,7 +7,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/twap/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/types";
 
 // Params holds parameters for the twap module
 message Params {
diff --git a/proto/osmosis/twap/v1beta1/query.proto b/proto/osmosis/twap/v1beta1/query.proto
index d08b6f7f51b..735da52642d 100644
--- a/proto/osmosis/twap/v1beta1/query.proto
+++ b/proto/osmosis/twap/v1beta1/query.proto
@@ -12,7 +12,7 @@ import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto";
 
 service Query {
   rpc Params(ParamsRequest) returns (ParamsResponse) {
diff --git a/proto/osmosis/twap/v1beta1/query.yml b/proto/osmosis/twap/v1beta1/query.yml
index abbb01d881f..aad12c17506 100644
--- a/proto/osmosis/twap/v1beta1/query.yml
+++ b/proto/osmosis/twap/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper: 
-  path: "github.com/osmosis-labs/osmosis/v15/x/twap"
+  path: "github.com/osmosis-labs/osmosis/v16/x/twap"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/twap/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/twap/client"
 queries:
   ArithmeticTwap:
     proto_wrapper:
diff --git a/proto/osmosis/twap/v1beta1/twap_record.proto b/proto/osmosis/twap/v1beta1/twap_record.proto
index 83f490be00b..7a01af34694 100644
--- a/proto/osmosis/twap/v1beta1/twap_record.proto
+++ b/proto/osmosis/twap/v1beta1/twap_record.proto
@@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/twap/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/twap/types";
 
 // A TWAP record should be indexed in state by pool_id, (asset pair), timestamp
 // The asset pair assets should be lexicographically sorted.
diff --git a/proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/v1beta1/feetoken.proto
index eb84d354408..da15061e9d4 100644
--- a/proto/osmosis/txfees/v1beta1/feetoken.proto
+++ b/proto/osmosis/txfees/v1beta1/feetoken.proto
@@ -3,7 +3,7 @@ package osmosis.txfees.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/txfees/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types";
 
 // FeeToken is a struct that specifies a coin denom, and pool ID pair.
 // This marks the token as eligible for use as a tx fee asset in Osmosis.
diff --git a/proto/osmosis/txfees/v1beta1/genesis.proto b/proto/osmosis/txfees/v1beta1/genesis.proto
index 405708872e2..b52d76d7fe5 100644
--- a/proto/osmosis/txfees/v1beta1/genesis.proto
+++ b/proto/osmosis/txfees/v1beta1/genesis.proto
@@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1;
 import "gogoproto/gogo.proto";
 import "osmosis/txfees/v1beta1/feetoken.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/txfees/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types";
 
 // GenesisState defines the txfees module's genesis state.
 message GenesisState {
diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto
index f2b9891de23..bc4048648cd 100644
--- a/proto/osmosis/txfees/v1beta1/gov.proto
+++ b/proto/osmosis/txfees/v1beta1/gov.proto
@@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "amino/amino.proto";
 import "osmosis/txfees/v1beta1/feetoken.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/txfees/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types";
 
 // UpdateFeeTokenProposal is a gov Content type for adding new whitelisted fee
 // token(s). It must specify a denom along with gamm pool ID to use as a spot
diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto
index 940fa1910b9..516c6d4403c 100644
--- a/proto/osmosis/txfees/v1beta1/query.proto
+++ b/proto/osmosis/txfees/v1beta1/query.proto
@@ -7,7 +7,7 @@ import "google/protobuf/duration.proto";
 
 import "osmosis/txfees/v1beta1/feetoken.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/txfees/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/txfees/types";
 
 service Query {
   // FeeTokens returns a list of all the whitelisted fee tokens and their
diff --git a/proto/osmosis/valset-pref/v1beta1/query.proto b/proto/osmosis/valset-pref/v1beta1/query.proto
index b770d4a4f10..f20f3ca891b 100644
--- a/proto/osmosis/valset-pref/v1beta1/query.proto
+++ b/proto/osmosis/valset-pref/v1beta1/query.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "osmosis/valset-pref/v1beta1/state.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto";
 option (gogoproto.goproto_getters_all) = false;
 
 // Query defines the gRPC querier service.
diff --git a/proto/osmosis/valset-pref/v1beta1/query.yml b/proto/osmosis/valset-pref/v1beta1/query.yml
index ebf73ef840a..d880e0ec26b 100644
--- a/proto/osmosis/valset-pref/v1beta1/query.yml
+++ b/proto/osmosis/valset-pref/v1beta1/query.yml
@@ -1,7 +1,7 @@
 keeper:
-  path: "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
+  path: "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
   struct: "Keeper"
-client_path: "github.com/osmosis-labs/osmosis/v15/x/valset-pref/client"
+client_path: "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client"
 queries:
   UserValidatorPreferences:
     proto_wrapper:
diff --git a/proto/osmosis/valset-pref/v1beta1/state.proto b/proto/osmosis/valset-pref/v1beta1/state.proto
index bc2fa40fc56..7d6c620573a 100644
--- a/proto/osmosis/valset-pref/v1beta1/state.proto
+++ b/proto/osmosis/valset-pref/v1beta1/state.proto
@@ -4,7 +4,7 @@ package osmosis.valsetpref.v1beta1;
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types";
 option (gogoproto.goproto_getters_all) = false;
 
 // ValidatorPreference defines the message structure for
diff --git a/proto/osmosis/valset-pref/v1beta1/tx.proto b/proto/osmosis/valset-pref/v1beta1/tx.proto
index b05e909f0e2..5a4b8a10fb6 100644
--- a/proto/osmosis/valset-pref/v1beta1/tx.proto
+++ b/proto/osmosis/valset-pref/v1beta1/tx.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/valset-pref/v1beta1/state.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types";
+option go_package = "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types";
 
 // Msg defines the valset-pref modules's gRPC message service.
 service Msg {
diff --git a/scripts/cl/in_given_out.py b/scripts/cl/in_given_out.py
index fc730dce0f1..014292570a1 100644
--- a/scripts/cl/in_given_out.py
+++ b/scripts/cl/in_given_out.py
@@ -77,7 +77,7 @@ def estimate_single_position_within_one_tick_ofz_in_given_out():
     """Estimates and prints the results of a calc concentrated liquidity test case with a single position within one tick
     when swapping token one for token zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_1 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_1 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -99,7 +99,7 @@ def estimate_two_positions_within_one_tick_zfo_in_given_out():
     """Estimates and prints the results of a calc concentrated liquidity test case with two positions within one tick
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_2 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_2 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
@@ -121,7 +121,7 @@ def estimate_two_consecutive_positions_zfo_in_given_out(spread_factor: str, expe
     """Estimates and prints the results of a calc concentrated liquidity test case with two consecutive positions
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_3 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_3 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
@@ -144,7 +144,7 @@ def estimate_overlapping_price_range_ofz_test_in_given_out():
     """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges
     when swapping token one for token zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_4 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_4 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -168,7 +168,7 @@ def estimate_overlapping_price_range_zfo_test_in_given_out(tokein_in_initial: st
     """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges
     when swapping token zero for one (zfo) and not consuming full liquidity of the second position.
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_5 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_5 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
@@ -192,7 +192,7 @@ def estimate_consecutive_positions_gap_ofz_test_in_given_out():
     """Estimates and prints the results of a calc concentrated liquidity test case with consecutive positions with a gap
     when swapping token one for zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_6 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_6 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -215,7 +215,7 @@ def estimate_slippage_protection_zfo_test_in_given_out():
     """Estimates and prints the results of a calc concentrated liquidity test case with slippage protection
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_7 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_7 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
diff --git a/scripts/cl/out_given_in.py b/scripts/cl/out_given_in.py
index 364a294ba05..66603f0ef17 100644
--- a/scripts/cl/out_given_in.py
+++ b/scripts/cl/out_given_in.py
@@ -77,7 +77,7 @@ def estimate_single_position_within_one_tick_ofz():
     """Estimates and prints the results of a calc concentrated liquidity test case with a single position within one tick
     when swapping token one for token zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_1 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_1 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -101,7 +101,7 @@ def estimate_two_positions_within_one_tick_zfo():
     """Estimates and prints the results of a calc concentrated liquidity test case with two positions within one tick
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_2 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_2 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
@@ -123,7 +123,7 @@ def estimate_two_consecutive_positions_zfo(spread_factor: str, expected_token_ou
     """Estimates and prints the results of a calc concentrated liquidity test case with two consecutive positions
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_3 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_3 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     spread_factor = sdk_dec.new(spread_factor)
@@ -149,7 +149,7 @@ def estimate_overlapping_price_range_ofz_test(spread_factor: str, expected_token
     """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges
     when swapping token one for token zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_4 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_4 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -176,7 +176,7 @@ def estimate_overlapping_price_range_zfo_test(token_in_initial: str, spread_fact
     """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges
     when swapping token zero for one (zfo) and not consuming full liquidity of the second position.
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_5 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_5 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
@@ -200,7 +200,7 @@ def estimate_consecutive_positions_gap_ofz_test():
     """Estimates and prints the results of a calc concentrated liquidity test case with consecutive positions with a gap
     when swapping token one for zero (ofz).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_6 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_6 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = False
@@ -223,7 +223,7 @@ def estimate_slippage_protection_zfo_test():
     """Estimates and prints the results of a calc concentrated liquidity test case with slippage protection
     when swapping token zero for one (zfo).
 
-     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_7 github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity
+     go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_7 github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity
     """
 
     is_zero_for_one = True
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
index 559f6da8628..626e9535543 100755
--- a/scripts/protocgen.sh
+++ b/scripts/protocgen.sh
@@ -24,7 +24,7 @@ cd ..
 # move proto files to the right places
 #
 # Note: Proto files are suffixed with the current binary version.
-cp -r github.com/osmosis-labs/osmosis/v15/* ./
+cp -r github.com/osmosis-labs/osmosis/v16/* ./
 cp -r github.com/osmosis-labs/osmosis/osmoutils ./
 rm -rf github.com
 
diff --git a/scripts/replace_import_paths.sh b/scripts/replace_import_paths.sh
index e2324d19284..2ce046f2d67 100755
--- a/scripts/replace_import_paths.sh
+++ b/scripts/replace_import_paths.sh
@@ -15,7 +15,7 @@ modules=$(go list -tags e2e ./... | sed "s/g.*v${version_to_replace}\///")
 
 while IFS= read -r line; do
   modules_to_upgrade_manually+=("$line")
-done < <(find . -name go.mod -exec grep -l "github.com/osmosis-labs/osmosis/v15" {} \; | grep -v  "^./go.mod$" | sed 's|/go.mod||' | sed 's|^./||')
+done < <(find . -name go.mod -exec grep -l "github.com/osmosis-labs/osmosis/v16" {} \; | grep -v  "^./go.mod$" | sed 's|/go.mod||' | sed 's|^./||')
 
 replace_paths() {
     file="${1}"
diff --git a/simulation/executor/internal/executortypes/actions.go b/simulation/executor/internal/executortypes/actions.go
index d25c9ca1ee9..c11c098fd92 100644
--- a/simulation/executor/internal/executortypes/actions.go
+++ b/simulation/executor/internal/executortypes/actions.go
@@ -9,7 +9,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 type selectActionFn func(r *rand.Rand) simtypes.ActionsWithMetadata
diff --git a/simulation/executor/internal/executortypes/frequency.go b/simulation/executor/internal/executortypes/frequency.go
index 48eaa494493..aaa3352d9c9 100644
--- a/simulation/executor/internal/executortypes/frequency.go
+++ b/simulation/executor/internal/executortypes/frequency.go
@@ -1,6 +1,6 @@
 package executortypes
 
-import "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+import "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 
 func totalFrequency(actions []simtypes.ActionsWithMetadata) int {
 	totalFrequency := 0
diff --git a/simulation/executor/internal/executortypes/simmanager.go b/simulation/executor/internal/executortypes/simmanager.go
index 1bebd23578b..e655e736e88 100644
--- a/simulation/executor/internal/executortypes/simmanager.go
+++ b/simulation/executor/internal/executortypes/simmanager.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/exp/maps"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 // Manager defines a simulation manager that provides the high level utility
diff --git a/simulation/executor/internal/pubsub/manager.go b/simulation/executor/internal/pubsub/manager.go
index 2fa50f47922..0daf41333a4 100644
--- a/simulation/executor/internal/pubsub/manager.go
+++ b/simulation/executor/internal/pubsub/manager.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"go.uber.org/multierr"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 var _ simtypes.PubSubManager = &Manager{}
diff --git a/simulation/executor/legacyconfig.go b/simulation/executor/legacyconfig.go
index 4883e4ace3a..4389461dd4d 100644
--- a/simulation/executor/legacyconfig.go
+++ b/simulation/executor/legacyconfig.go
@@ -12,8 +12,8 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/executor/internal/stats"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes/simlogger"
+	"github.com/osmosis-labs/osmosis/v16/simulation/executor/internal/stats"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes/simlogger"
 )
 
 // List of available flags for the simulator
diff --git a/simulation/executor/mock_tendermint.go b/simulation/executor/mock_tendermint.go
index febd1778b5a..a19774d709f 100644
--- a/simulation/executor/mock_tendermint.go
+++ b/simulation/executor/mock_tendermint.go
@@ -14,7 +14,7 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 	"golang.org/x/exp/maps"
 
-	markov "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/transitionmatrix"
+	markov "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/transitionmatrix"
 )
 
 type mockValidator struct {
diff --git a/simulation/executor/params.go b/simulation/executor/params.go
index 09db2805ae5..1fab7a7f7c9 100644
--- a/simulation/executor/params.go
+++ b/simulation/executor/params.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	markov "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/transitionmatrix"
+	markov "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/transitionmatrix"
 )
 
 const (
diff --git a/simulation/executor/simulate.go b/simulation/executor/simulate.go
index ffc060ad5f4..81b3812ea1f 100644
--- a/simulation/executor/simulate.go
+++ b/simulation/executor/simulate.go
@@ -21,9 +21,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/executor/internal/executortypes"
-	"github.com/osmosis-labs/osmosis/v15/simulation/executor/internal/stats"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/executor/internal/executortypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/executor/internal/stats"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 const AverageBlockTime = 6 * time.Second
diff --git a/simulation/executor/simulate_dev.go b/simulation/executor/simulate_dev.go
index 0f629e1e78c..1cb7c9a3ec9 100644
--- a/simulation/executor/simulate_dev.go
+++ b/simulation/executor/simulate_dev.go
@@ -13,8 +13,8 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/executor/internal/stats"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/executor/internal/stats"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 type simState struct {
diff --git a/simulation/executor/types.go b/simulation/executor/types.go
index 4c835e86a5e..6c92b411dda 100644
--- a/simulation/executor/types.go
+++ b/simulation/executor/types.go
@@ -8,7 +8,7 @@ import (
 	legacysim "github.com/cosmos/cosmos-sdk/types/simulation"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 // AppStateFn returns the app state json bytes and the genesis accounts
diff --git a/simulation/executor/util.go b/simulation/executor/util.go
index d0d886aa425..3e254392b84 100644
--- a/simulation/executor/util.go
+++ b/simulation/executor/util.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 func getTestingMode(tb testing.TB) (testingMode bool, t *testing.T, b *testing.B) {
diff --git a/simulation/simtypes/account.go b/simulation/simtypes/account.go
index 2da9d382daa..a2918712e56 100644
--- a/simulation/simtypes/account.go
+++ b/simulation/simtypes/account.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
 )
 
 func (sim *SimCtx) RandomSimAccount() simulation.Account {
diff --git a/simulation/simtypes/app.go b/simulation/simtypes/app.go
index 0bce183a24a..67680aa18f3 100644
--- a/simulation/simtypes/app.go
+++ b/simulation/simtypes/app.go
@@ -9,7 +9,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type AppCreator = func(homepath string, legacyInvariantPeriod uint, baseappOptions ...func(*baseapp.BaseApp)) App
diff --git a/simulation/simtypes/randutil.go b/simulation/simtypes/randutil.go
index af4ddd33776..bf8b99031e7 100644
--- a/simulation/simtypes/randutil.go
+++ b/simulation/simtypes/randutil.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"golang.org/x/exp/constraints"
 
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
 )
 
 func RandLTBound[T constraints.Integer](sim *SimCtx, upperbound T) T {
diff --git a/simulation/simtypes/txbuilder.go b/simulation/simtypes/txbuilder.go
index f6d4d3c116c..4dbc3132331 100644
--- a/simulation/simtypes/txbuilder.go
+++ b/simulation/simtypes/txbuilder.go
@@ -11,8 +11,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 
-	"github.com/osmosis-labs/osmosis/v15/app/params"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/params"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	authsign "github.com/cosmos/cosmos-sdk/x/auth/signing"
diff --git a/tests/cl-genesis-positions/go.mod b/tests/cl-genesis-positions/go.mod
index 6922e3ac968..120eb3e6058 100644
--- a/tests/cl-genesis-positions/go.mod
+++ b/tests/cl-genesis-positions/go.mod
@@ -97,6 +97,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674 // indirect
 	github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304 // indirect
 	github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230331072320-5d6f6cfa2627 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
diff --git a/tests/cl-genesis-positions/go.sum b/tests/cl-genesis-positions/go.sum
index 2412b06bcbc..dc94b3f988d 100644
--- a/tests/cl-genesis-positions/go.sum
+++ b/tests/cl-genesis-positions/go.sum
@@ -701,6 +701,8 @@ github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230529060317-d6d2dda0fb22 h1:
 github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230529060317-d6d2dda0fb22/go.mod h1:GIvgXqD8NOtrpu5bJ052tZxWLFj4ekpi1BMwEHIvXVU=
 github.com/osmosis-labs/osmosis/v15 v15.0.0-20230601221251-b764323ce770 h1:to+kNe/UeQwFpYHMqOkdY7TGIjt5mp+QxIniNRDzDUc=
 github.com/osmosis-labs/osmosis/v15 v15.0.0-20230601221251-b764323ce770/go.mod h1:ww2QtVh+XW91yTpbyfM4mJBmIRk4AU0PigLL94zr0+8=
+github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674 h1:sCXD8SajkGC3AmHrwiklgTWHZUXcSHm8YFJKbvw6Lk4=
+github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674/go.mod h1:Vg+05vXFc682OEF52HTqhEKF+deQ0GSt9rkisCFJ8Ug=
 github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304 h1:RIrWLzIiZN5Xd2JOfSOtGZaf6V3qEQYg6EaDTAkMnCo=
 github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304/go.mod h1:yPWoJTj5RKrXKUChAicp+G/4Ni/uVEpp27mi/FF/L9c=
 github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230331072320-5d6f6cfa2627 h1:A0SwZgp4bmJFbivYJc8mmVhMjrr3EdUZluBYFke11+w=
diff --git a/tests/cl-go-client/go.mod b/tests/cl-go-client/go.mod
index 7425751a1fe..391b11ac285 100644
--- a/tests/cl-go-client/go.mod
+++ b/tests/cl-go-client/go.mod
@@ -88,6 +88,7 @@ require (
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230516205127-c213fddde069 // indirect
 	github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230529060317-d6d2dda0fb22 // indirect
+	github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
diff --git a/tests/cl-go-client/go.sum b/tests/cl-go-client/go.sum
index 186633f7fa7..c16ebb73c2d 100644
--- a/tests/cl-go-client/go.sum
+++ b/tests/cl-go-client/go.sum
@@ -693,6 +693,8 @@ github.com/osmosis-labs/osmosis/osmomath v0.0.3-dev.0.20230516205127-c213fddde06
 github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230516205127-c213fddde069 h1:9C/n+Nx5rre/AHPMlPsQrk1isgydrCNB68aqer86ygE=
 github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230516205127-c213fddde069/go.mod h1:hk/o9/kmTSZmZqwXcSrPuwj/gpRMCqbE/d3vj6teL2A=
 github.com/osmosis-labs/osmosis/osmoutils v0.0.0-20230529060317-d6d2dda0fb22/go.mod h1:GIvgXqD8NOtrpu5bJ052tZxWLFj4ekpi1BMwEHIvXVU=
+github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674 h1:sCXD8SajkGC3AmHrwiklgTWHZUXcSHm8YFJKbvw6Lk4=
+github.com/osmosis-labs/osmosis/v16 v16.0.0-20230602200356-bdf5b96b3674/go.mod h1:Vg+05vXFc682OEF52HTqhEKF+deQ0GSt9rkisCFJ8Ug=
 github.com/osmosis-labs/osmosis/x/epochs v0.0.0-20230328024000-175ec88e4304 h1:RIrWLzIiZN5Xd2JOfSOtGZaf6V3qEQYg6EaDTAkMnCo=
 github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20230331072320-5d6f6cfa2627 h1:A0SwZgp4bmJFbivYJc8mmVhMjrr3EdUZluBYFke11+w=
 github.com/osmosis-labs/wasmd v0.31.0-osmo-v16 h1:X747cZYdnqc/+RV48iPVeGprpVb/fUWSaKGsZUWrdbg=
diff --git a/tests/e2e/configurer/base.go b/tests/e2e/configurer/base.go
index d6e7021f819..176d7c81eeb 100644
--- a/tests/e2e/configurer/base.go
+++ b/tests/e2e/configurer/base.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 )
 
 // baseConfigurer is the base implementation for the
diff --git a/tests/e2e/configurer/chain/chain.go b/tests/e2e/configurer/chain/chain.go
index 4e75d270fd8..58148fca7d0 100644
--- a/tests/e2e/configurer/chain/chain.go
+++ b/tests/e2e/configurer/chain/chain.go
@@ -12,19 +12,19 @@ import (
 
 	paramsutils "github.com/cosmos/cosmos-sdk/x/params/client/utils"
 
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/config"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/config"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 type Config struct {
diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go
index 2a711b47c55..9ad8fb0c02b 100644
--- a/tests/e2e/configurer/chain/commands.go
+++ b/tests/e2e/configurer/chain/commands.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/tendermint/tendermint/libs/bytes"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/config"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/config"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -25,7 +25,7 @@ import (
 	"github.com/tendermint/tendermint/p2p"
 	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 
-	app "github.com/osmosis-labs/osmosis/v15/app"
+	app "github.com/osmosis-labs/osmosis/v16/app"
 )
 
 // The value is returned as a string, so we have to unmarshal twice
diff --git a/tests/e2e/configurer/chain/node.go b/tests/e2e/configurer/chain/node.go
index d71629ea544..2567bc5e63f 100644
--- a/tests/e2e/configurer/chain/node.go
+++ b/tests/e2e/configurer/chain/node.go
@@ -12,8 +12,8 @@ import (
 	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
 	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 type NodeConfig struct {
diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go
index d3d8044df20..2cd594b9437 100644
--- a/tests/e2e/configurer/chain/queries.go
+++ b/tests/e2e/configurer/chain/queries.go
@@ -19,16 +19,16 @@ import (
 	"github.com/stretchr/testify/require"
 	tmabcitypes "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
-	twapqueryproto "github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
+	twapqueryproto "github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/tests/e2e/configurer/current.go b/tests/e2e/configurer/current.go
index d344c84041a..292fe7fd63e 100644
--- a/tests/e2e/configurer/current.go
+++ b/tests/e2e/configurer/current.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 type CurrentBranchConfigurer struct {
diff --git a/tests/e2e/configurer/factory.go b/tests/e2e/configurer/factory.go
index c745430b836..b03a720bacb 100644
--- a/tests/e2e/configurer/factory.go
+++ b/tests/e2e/configurer/factory.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 type Configurer interface {
diff --git a/tests/e2e/configurer/upgrade.go b/tests/e2e/configurer/upgrade.go
index c137bcc6cdd..0e912ca9dd1 100644
--- a/tests/e2e/configurer/upgrade.go
+++ b/tests/e2e/configurer/upgrade.go
@@ -9,11 +9,11 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/config"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/containers"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/config"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/containers"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 type UpgradeSettings struct {
diff --git a/tests/e2e/containers/containers.go b/tests/e2e/containers/containers.go
index ac5611384ff..6d8386f59ff 100644
--- a/tests/e2e/containers/containers.go
+++ b/tests/e2e/containers/containers.go
@@ -16,8 +16,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 const (
diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go
index 2f4632519cf..88b94544628 100644
--- a/tests/e2e/e2e_setup_test.go
+++ b/tests/e2e/e2e_setup_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	configurer "github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer"
+	configurer "github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer"
 )
 
 const (
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 625840dc55c..56dd52ce8bc 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -12,26 +12,26 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 	"github.com/iancoleman/orderedmap"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 
 	packetforwardingtypes "github.com/strangelove-ventures/packet-forward-middleware/v4/router/types"
 
 	ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
 
-	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	ibcratelimittypes "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	coretypes "github.com/tendermint/tendermint/rpc/core/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	v16 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v16"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/config"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
-	clmath "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	v16 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v16"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/config"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
+	clmath "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // Reusable Checks
diff --git a/tests/e2e/helpers_e2e_test.go b/tests/e2e/helpers_e2e_test.go
index 52fdabb2c09..2d652242f48 100644
--- a/tests/e2e/helpers_e2e_test.go
+++ b/tests/e2e/helpers_e2e_test.go
@@ -3,10 +3,10 @@ package e2e
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/configurer/chain"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/configurer/chain"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 var defaultFeePerTx = sdk.NewInt(1000)
diff --git a/tests/e2e/initialization/chain/main.go b/tests/e2e/initialization/chain/main.go
index a5c0feecaa5..7d7cc476683 100644
--- a/tests/e2e/initialization/chain/main.go
+++ b/tests/e2e/initialization/chain/main.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 func main() {
diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go
index 26aa29dbb41..2b519f9cb95 100644
--- a/tests/e2e/initialization/config.go
+++ b/tests/e2e/initialization/config.go
@@ -18,20 +18,20 @@ import (
 	"github.com/gogo/protobuf/proto"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolitypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/types"
-	twaptypes "github.com/osmosis-labs/osmosis/v15/x/twap/types"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolitypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/types"
+	twaptypes "github.com/osmosis-labs/osmosis/v16/x/twap/types"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 
 	types1 "github.com/cosmos/cosmos-sdk/codec/types"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 )
 
 // NodeConfig is a confiuration for the node supplied from the test runner
diff --git a/tests/e2e/initialization/init.go b/tests/e2e/initialization/init.go
index d8d3c17efb8..db9282f3ab2 100644
--- a/tests/e2e/initialization/init.go
+++ b/tests/e2e/initialization/init.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 )
 
 func InitChain(id, dataDir string, nodeConfigs []*NodeConfig, votingPeriod, expeditedVotingPeriod time.Duration, forkHeight int) (*Chain, error) {
diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go
index d59b85947b1..598417b39a7 100644
--- a/tests/e2e/initialization/init_test.go
+++ b/tests/e2e/initialization/init_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 const forkHeight = 10
diff --git a/tests/e2e/initialization/node.go b/tests/e2e/initialization/node.go
index 770851c6475..c38e1ed70e1 100644
--- a/tests/e2e/initialization/node.go
+++ b/tests/e2e/initialization/node.go
@@ -29,8 +29,8 @@ import (
 	"github.com/tendermint/tendermint/privval"
 	tmtypes "github.com/tendermint/tendermint/types"
 
-	osmosisApp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	osmosisApp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 )
 
 type internalNode struct {
diff --git a/tests/e2e/initialization/node/main.go b/tests/e2e/initialization/node/main.go
index a64d2a96525..9b13b86ab47 100644
--- a/tests/e2e/initialization/node/main.go
+++ b/tests/e2e/initialization/node/main.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/initialization"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/initialization"
 )
 
 func main() {
diff --git a/tests/e2e/initialization/util.go b/tests/e2e/initialization/util.go
index 5e15d15adba..6a29a77ce14 100644
--- a/tests/e2e/initialization/util.go
+++ b/tests/e2e/initialization/util.go
@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/unknownproto"
 	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/e2e/util"
+	"github.com/osmosis-labs/osmosis/v16/tests/e2e/util"
 )
 
 func decodeTx(txBytes []byte) (*sdktx.Tx, error) {
diff --git a/tests/e2e/util/codec.go b/tests/e2e/util/codec.go
index 86a95d3cf20..5dcadd7b624 100644
--- a/tests/e2e/util/codec.go
+++ b/tests/e2e/util/codec.go
@@ -8,8 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	osmosisApp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/app/params"
+	osmosisApp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/app/params"
 )
 
 var (
diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go
index 15933a9d8b8..d32c5f8dd20 100644
--- a/tests/ibc-hooks/ibc_middleware_test.go
+++ b/tests/ibc-hooks/ibc_middleware_test.go
@@ -16,12 +16,12 @@ import (
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	txfeetypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	txfeetypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 
 	"github.com/stretchr/testify/suite"
 
@@ -32,9 +32,9 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
 	ibctesting "github.com/cosmos/ibc-go/v4/testing"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/osmosisibctesting"
+	"github.com/osmosis-labs/osmosis/v16/tests/osmosisibctesting"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/ibc-hooks/testutils"
+	"github.com/osmosis-labs/osmosis/v16/tests/ibc-hooks/testutils"
 )
 
 type HooksTestSuite struct {
diff --git a/tests/ibc-hooks/xcs_cw20_test.go b/tests/ibc-hooks/xcs_cw20_test.go
index 0627ea6c788..811dcc2acf8 100644
--- a/tests/ibc-hooks/xcs_cw20_test.go
+++ b/tests/ibc-hooks/xcs_cw20_test.go
@@ -9,7 +9,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 	ibctesting "github.com/cosmos/ibc-go/v4/testing"
-	"github.com/osmosis-labs/osmosis/v15/tests/osmosisibctesting"
+	"github.com/osmosis-labs/osmosis/v16/tests/osmosisibctesting"
 )
 
 // Instantiate the cw20 and cw20-ics20 contract
diff --git a/tests/mocks/cfmm_pool.go b/tests/mocks/cfmm_pool.go
index a696d789c0a..eb0546aa048 100644
--- a/tests/mocks/cfmm_pool.go
+++ b/tests/mocks/cfmm_pool.go
@@ -10,7 +10,7 @@ import (
 
 	types "github.com/cosmos/cosmos-sdk/types"
 	gomock "github.com/golang/mock/gomock"
-	types0 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types0 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // MockCFMMPoolI is a mock of CFMMPoolI interface.
diff --git a/tests/mocks/cl_pool.go b/tests/mocks/cl_pool.go
index 4a9e48da4dc..165eebeeea1 100644
--- a/tests/mocks/cl_pool.go
+++ b/tests/mocks/cl_pool.go
@@ -9,7 +9,7 @@ import (
 
 	types "github.com/cosmos/cosmos-sdk/types"
 	gomock "github.com/golang/mock/gomock"
-	types0 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types0 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // MockConcentratedPoolExtension is a mock of ConcentratedPoolExtension interface.
diff --git a/tests/mocks/pool.go b/tests/mocks/pool.go
index 41879a11f17..3cfabd85916 100644
--- a/tests/mocks/pool.go
+++ b/tests/mocks/pool.go
@@ -9,7 +9,7 @@ import (
 
 	types "github.com/cosmos/cosmos-sdk/types"
 	gomock "github.com/golang/mock/gomock"
-	types0 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types0 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // MockPoolI is a mock of PoolI interface.
diff --git a/tests/mocks/pool_module.go b/tests/mocks/pool_module.go
index e6656fd381b..905fb9828c7 100644
--- a/tests/mocks/pool_module.go
+++ b/tests/mocks/pool_module.go
@@ -11,7 +11,7 @@ import (
 	types0 "github.com/cosmos/cosmos-sdk/x/auth/types"
 	types1 "github.com/cosmos/cosmos-sdk/x/bank/types"
 	gomock "github.com/golang/mock/gomock"
-	types2 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types2 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // MockAccountI is a mock of AccountI interface.
diff --git a/tests/osmosisibctesting/chain.go b/tests/osmosisibctesting/chain.go
index b21022b5519..e72b881bf76 100644
--- a/tests/osmosisibctesting/chain.go
+++ b/tests/osmosisibctesting/chain.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/ibc-go/v4/testing/simapp/helpers"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
+	"github.com/osmosis-labs/osmosis/v16/app"
 )
 
 type TestChain struct {
diff --git a/tests/osmosisibctesting/wasm.go b/tests/osmosisibctesting/wasm.go
index 7d4c9c9da04..629c7a38286 100644
--- a/tests/osmosisibctesting/wasm.go
+++ b/tests/osmosisibctesting/wasm.go
@@ -14,7 +14,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/tests/simulator/osmosis_helper.go b/tests/simulator/osmosis_helper.go
index c37df23f1e2..2e4b3b42273 100644
--- a/tests/simulator/osmosis_helper.go
+++ b/tests/simulator/osmosis_helper.go
@@ -7,10 +7,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 	db "github.com/tendermint/tm-db"
 
-	simexec "github.com/osmosis-labs/osmosis/v15/simulation/executor"
+	simexec "github.com/osmosis-labs/osmosis/v16/simulation/executor"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 )
 
 func OsmosisAppCreator(logger log.Logger, db db.DB) simtypes.AppCreator {
diff --git a/tests/simulator/sim_test.go b/tests/simulator/sim_test.go
index 6ee3c2d458c..008560badf0 100644
--- a/tests/simulator/sim_test.go
+++ b/tests/simulator/sim_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	osmosim "github.com/osmosis-labs/osmosis/v15/simulation/executor"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes/simlogger"
-	txfeetypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	osmosim "github.com/osmosis-labs/osmosis/v16/simulation/executor"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes/simlogger"
+	txfeetypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 // Profile with:
diff --git a/tests/simulator/state.go b/tests/simulator/state.go
index f307025451d..cd74818f1f5 100644
--- a/tests/simulator/state.go
+++ b/tests/simulator/state.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	osmosim "github.com/osmosis-labs/osmosis/v15/simulation/executor"
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	osmosim "github.com/osmosis-labs/osmosis/v16/simulation/executor"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go
index 680b36c611d..e8fc239be03 100644
--- a/wasmbinding/message_plugin.go
+++ b/wasmbinding/message_plugin.go
@@ -9,10 +9,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
 
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // CustomMessageDecorator returns decorator for custom CosmWasm bindings messages
diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go
index eedd63959dd..36a71ae4d21 100644
--- a/wasmbinding/queries.go
+++ b/wasmbinding/queries.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
 )
 
 type QueryPlugin struct {
diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go
index 8af1ddca7c7..15832d2cec5 100644
--- a/wasmbinding/query_plugin.go
+++ b/wasmbinding/query_plugin.go
@@ -11,7 +11,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
 )
 
 // StargateQuerier dispatches whitelisted stargate queries
diff --git a/wasmbinding/query_plugin_test.go b/wasmbinding/query_plugin_test.go
index 5f56e86e355..63009449ae4 100644
--- a/wasmbinding/query_plugin_test.go
+++ b/wasmbinding/query_plugin_test.go
@@ -19,15 +19,15 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammv2types "github.com/osmosis-labs/osmosis/v15/x/gamm/v2types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammv2types "github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding"
 )
 
 type StargateTestSuite struct {
diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go
index 3e8b42add21..62b6e59abbf 100644
--- a/wasmbinding/stargate_whitelist.go
+++ b/wasmbinding/stargate_whitelist.go
@@ -14,19 +14,19 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
 
-	concentratedliquidityquery "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	downtimequerytypes "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	gammv2types "github.com/osmosis-labs/osmosis/v15/x/gamm/v2types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	superfluidtypes "github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
-	twapquerytypes "github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	concentratedliquidityquery "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	downtimequerytypes "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	gammv2types "github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	superfluidtypes "github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
+	twapquerytypes "github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/wasmbinding/test/custom_msg_test.go b/wasmbinding/test/custom_msg_test.go
index fca37986a2d..5508854c2ba 100644
--- a/wasmbinding/test/custom_msg_test.go
+++ b/wasmbinding/test/custom_msg_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 
 	"github.com/stretchr/testify/require"
 
@@ -13,8 +13,8 @@ import (
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
 )
 
 func TestCreateDenomMsg(t *testing.T) {
diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go
index 999661539ba..394430a9bc4 100644
--- a/wasmbinding/test/custom_query_test.go
+++ b/wasmbinding/test/custom_query_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
 )
 
 func SetupCustomApp(t *testing.T, addr sdk.AccAddress) (*app.OsmosisApp, sdk.Context) {
diff --git a/wasmbinding/test/helpers_test.go b/wasmbinding/test/helpers_test.go
index 957cfed651a..c4168edfde9 100644
--- a/wasmbinding/test/helpers_test.go
+++ b/wasmbinding/test/helpers_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
+	"github.com/osmosis-labs/osmosis/v16/app"
 )
 
 func CreateTestInput() (*app.OsmosisApp, sdk.Context) {
diff --git a/wasmbinding/test/messages_test.go b/wasmbinding/test/messages_test.go
index 19c06b91764..16274283162 100644
--- a/wasmbinding/test/messages_test.go
+++ b/wasmbinding/test/messages_test.go
@@ -6,9 +6,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding"
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding/bindings"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding/bindings"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/wasmbinding/test/queries_test.go b/wasmbinding/test/queries_test.go
index 0167ecc1315..a837a70172d 100644
--- a/wasmbinding/test/queries_test.go
+++ b/wasmbinding/test/queries_test.go
@@ -9,8 +9,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/wasmbinding"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/wasmbinding"
 )
 
 func TestFullDenom(t *testing.T) {
diff --git a/wasmbinding/test/store_run_test.go b/wasmbinding/test/store_run_test.go
index 191154e3d9d..d48f45348a4 100644
--- a/wasmbinding/test/store_run_test.go
+++ b/wasmbinding/test/store_run_test.go
@@ -14,8 +14,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 )
 
 func TestNoStorageWithoutProposal(t *testing.T) {
diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go
index 6320896e3ba..0723608e104 100644
--- a/wasmbinding/wasm.go
+++ b/wasmbinding/wasm.go
@@ -9,7 +9,7 @@ import (
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
-	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
+	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
 )
 
 func RegisterCustomPlugins(
diff --git a/x/concentrated-liquidity/bench_test.go b/x/concentrated-liquidity/bench_test.go
index edca4023787..c79d37125fe 100644
--- a/x/concentrated-liquidity/bench_test.go
+++ b/x/concentrated-liquidity/bench_test.go
@@ -10,13 +10,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clmath "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clmath "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 type BenchTestSuite struct {
diff --git a/x/concentrated-liquidity/client/cli/query.go b/x/concentrated-liquidity/client/cli/query.go
index 6127ddc41e1..8418888e519 100644
--- a/x/concentrated-liquidity/client/cli/query.go
+++ b/x/concentrated-liquidity/client/cli/query.go
@@ -5,8 +5,8 @@ import (
 	flag "github.com/spf13/pflag"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/concentrated-liquidity/client/cli/tx.go b/x/concentrated-liquidity/client/cli/tx.go
index 694bf83473a..663b5fd6c54 100644
--- a/x/concentrated-liquidity/client/cli/tx.go
+++ b/x/concentrated-liquidity/client/cli/tx.go
@@ -16,8 +16,8 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func NewTxCmd() *cobra.Command {
diff --git a/x/concentrated-liquidity/client/grpc/grpc_query.go b/x/concentrated-liquidity/client/grpc/grpc_query.go
index 16e42d07091..1adf1abd601 100644
--- a/x/concentrated-liquidity/client/grpc/grpc_query.go
+++ b/x/concentrated-liquidity/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/concentrated-liquidity/client/proposal_handler.go b/x/concentrated-liquidity/client/proposal_handler.go
index e297cb45347..d3b30fe8cce 100644
--- a/x/concentrated-liquidity/client/proposal_handler.go
+++ b/x/concentrated-liquidity/client/proposal_handler.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/rest"
 
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
diff --git a/x/concentrated-liquidity/client/query_proto_wrap.go b/x/concentrated-liquidity/client/query_proto_wrap.go
index 48c2e2c18b8..7c657f56938 100644
--- a/x/concentrated-liquidity/client/query_proto_wrap.go
+++ b/x/concentrated-liquidity/client/query_proto_wrap.go
@@ -6,9 +6,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clquery "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clquery "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
 )
 
 // Querier defines a wrapper around the x/concentrated-liquidity keeper providing gRPC method
diff --git a/x/concentrated-liquidity/client/queryproto/query.pb.go b/x/concentrated-liquidity/client/queryproto/query.pb.go
index 8a88ffb59b0..23db671fb26 100644
--- a/x/concentrated-liquidity/client/queryproto/query.pb.go
+++ b/x/concentrated-liquidity/client/queryproto/query.pb.go
@@ -15,8 +15,8 @@ import (
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
-	model "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	model "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -1270,14 +1270,14 @@ func init() {
 }
 
 var fileDescriptor_5c83e18b11fd607d = []byte{
-	// 1831 bytes of a gzipped FileDescriptorProto
+	// 1832 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4f, 0x6c, 0x1b, 0x4b,
 	0x19, 0xcf, 0x38, 0x4d, 0x5a, 0x4f, 0x92, 0x26, 0x9d, 0xa4, 0x89, 0x9f, 0xdb, 0xda, 0x61, 0xd0,
-	0x7b, 0x2f, 0x7a, 0x7d, 0xb1, 0xd5, 0x34, 0xa1, 0x34, 0xe9, 0x7b, 0x8f, 0x38, 0x79, 0x89, 0x0c,
-	0x55, 0x5e, 0x58, 0x1a, 0x40, 0x1c, 0x58, 0xd6, 0xbb, 0x13, 0x67, 0x95, 0xf5, 0x8e, 0xb3, 0x7f,
-	0x92, 0x5a, 0xd0, 0x0b, 0x3d, 0x22, 0x41, 0x25, 0xee, 0x5c, 0x41, 0x88, 0x23, 0x1c, 0x38, 0xc2,
-	0x01, 0x55, 0x1c, 0xaa, 0x4a, 0x08, 0x09, 0x71, 0x70, 0xa1, 0x45, 0x08, 0xa9, 0x88, 0x43, 0xb8,
-	0x70, 0x44, 0x3b, 0x3b, 0xb3, 0xbb, 0xb6, 0xd7, 0xf1, 0xda, 0xc9, 0x3b, 0xc5, 0xb3, 0xdf, 0xdf,
+	0x7b, 0x2f, 0x7a, 0x7d, 0xb1, 0xd5, 0x34, 0x79, 0xa5, 0x49, 0xdf, 0x7b, 0xc4, 0xc9, 0x4b, 0x64,
+	0xa8, 0xf2, 0xc2, 0xd2, 0x00, 0xe2, 0xc0, 0xb2, 0xde, 0x9d, 0x38, 0xab, 0xac, 0x77, 0x9c, 0xfd,
+	0x93, 0xd4, 0x82, 0x5e, 0xe8, 0x11, 0x09, 0x2a, 0x71, 0xe7, 0x0a, 0x42, 0x1c, 0xe1, 0xc0, 0x11,
+	0x0e, 0xa8, 0xe2, 0x50, 0x55, 0x42, 0x48, 0x88, 0x83, 0x0b, 0x2d, 0x42, 0x48, 0x45, 0x1c, 0xc2,
+	0x85, 0x23, 0xda, 0xd9, 0x99, 0xdd, 0xb5, 0xbd, 0x8e, 0xd7, 0x4e, 0x38, 0xc5, 0xb3, 0xdf, 0xdf,
 	0xdf, 0xf7, 0x7d, 0xf3, 0xcd, 0x37, 0x13, 0xf8, 0x01, 0xb5, 0x6b, 0xd4, 0xd6, 0xed, 0xa2, 0x4a,
 	0x4d, 0x95, 0x98, 0x8e, 0xa5, 0x38, 0x44, 0x5b, 0x34, 0xf4, 0x23, 0x57, 0xd7, 0x74, 0xa7, 0x51,
 	0x3c, 0x72, 0x89, 0xd5, 0x28, 0xd4, 0x2d, 0xea, 0x50, 0xf4, 0x2e, 0xe7, 0x2d, 0x44, 0x79, 0x03,
@@ -1290,32 +1290,32 @@ var fileDescriptor_5c83e18b11fd607d = []byte{
 	0x6c, 0x08, 0x92, 0x6f, 0x44, 0xf6, 0x91, 0xfb, 0x0b, 0x4e, 0xca, 0xb7, 0x4b, 0x39, 0x7a, 0x8d,
 	0xd8, 0x8e, 0x52, 0xab, 0x0b, 0x00, 0xed, 0x0c, 0x9a, 0x6b, 0x45, 0x9d, 0xea, 0x15, 0x8f, 0x3a,
 	0xb5, 0xf5, 0x08, 0xfb, 0x4a, 0x0f, 0x76, 0x9d, 0x7d, 0xd5, 0x8f, 0x89, 0x6c, 0x11, 0x95, 0x5a,
-	0x9a, 0x2f, 0x86, 0x7f, 0x0b, 0xe0, 0xcc, 0x9e, 0x4d, 0xac, 0x5d, 0xae, 0xcd, 0x96, 0xc8, 0x91,
+	0x9a, 0x2f, 0x86, 0x7f, 0x03, 0xe0, 0xcc, 0x9e, 0x4d, 0xac, 0x5d, 0xae, 0xcd, 0x96, 0xc8, 0x91,
 	0x4b, 0x6c, 0x07, 0x7d, 0x08, 0x2f, 0x2b, 0x9a, 0x66, 0x11, 0xdb, 0xce, 0x80, 0x79, 0xb0, 0x90,
 	0x2e, 0xa1, 0xd3, 0x66, 0xfe, 0x6a, 0x43, 0xa9, 0x19, 0xab, 0x98, 0x13, 0xb0, 0x24, 0x58, 0xd0,
 	0x6d, 0x78, 0xb9, 0x4e, 0xa9, 0x21, 0xeb, 0x5a, 0x26, 0x35, 0x0f, 0x16, 0x2e, 0x45, 0xb9, 0x39,
 	0x01, 0x4b, 0xa3, 0xde, 0xaf, 0xb2, 0x86, 0xb6, 0x20, 0x0c, 0x53, 0x90, 0x19, 0x9e, 0x07, 0x0b,
 	0x63, 0x4b, 0xef, 0x15, 0x78, 0xf4, 0xbc, 0x7c, 0x15, 0xfc, 0x0a, 0xe4, 0xf9, 0x2a, 0xec, 0x2a,
-	0x55, 0xc2, 0xdd, 0x92, 0x22, 0x92, 0xf8, 0xf7, 0x00, 0x5e, 0x6f, 0xf3, 0xdd, 0xae, 0x53, 0xd3,
-	0x26, 0xe8, 0x7b, 0x30, 0x2d, 0xc2, 0xe3, 0xb9, 0x3f, 0xbc, 0x30, 0xb6, 0xf4, 0xa0, 0x90, 0xa8,
+	0x55, 0xc2, 0xdd, 0x92, 0x22, 0x92, 0xf8, 0x77, 0x00, 0x5e, 0x6f, 0xf3, 0xdd, 0xae, 0x53, 0xd3,
+	0x26, 0xe8, 0xbb, 0x30, 0x2d, 0xc2, 0xe3, 0xb9, 0x3f, 0xbc, 0x30, 0xb6, 0xf4, 0xa0, 0x90, 0xa8,
 	0x92, 0x0b, 0x5b, 0xae, 0x61, 0x08, 0x85, 0x25, 0x8b, 0x28, 0x87, 0x1a, 0x3d, 0x31, 0x4b, 0x97,
 	0x9e, 0x37, 0xf3, 0x43, 0x52, 0xa8, 0x14, 0x6d, 0xb7, 0x60, 0x48, 0x31, 0x0c, 0xef, 0xf7, 0xc4,
 	0xe0, 0xbb, 0xd7, 0x02, 0x62, 0x07, 0x4e, 0x07, 0xe6, 0x1a, 0x65, 0x4d, 0x84, 0xff, 0x1e, 0x1c,
 	0x13, 0xc6, 0xbc, 0xa0, 0x02, 0x16, 0xd4, 0xd9, 0xd3, 0x66, 0x1e, 0x89, 0xa0, 0x06, 0x44, 0x2c,
-	0x41, 0xb1, 0x2a, 0x6b, 0xf8, 0x18, 0xce, 0xb4, 0xea, 0xe3, 0x21, 0xf9, 0x2e, 0xbc, 0x22, 0xb8,
-	0x98, 0xb6, 0x8b, 0x89, 0x48, 0xa0, 0x13, 0x7f, 0x13, 0x8e, 0xef, 0x52, 0x6a, 0x04, 0xf5, 0xb3,
-	0x15, 0x13, 0xa0, 0x41, 0x92, 0xfc, 0x13, 0x00, 0x27, 0xb8, 0x62, 0x8e, 0x64, 0x05, 0x8e, 0x78,
+	0x41, 0xb1, 0x2a, 0x6b, 0xf8, 0x18, 0xce, 0xb4, 0xea, 0xe3, 0x21, 0xf9, 0x0e, 0xbc, 0x22, 0xb8,
+	0x98, 0xb6, 0x8b, 0x89, 0x48, 0xa0, 0x13, 0x7f, 0x03, 0x8e, 0xef, 0x52, 0x6a, 0x04, 0xf5, 0xb3,
+	0x15, 0x13, 0xa0, 0x41, 0x92, 0xfc, 0x63, 0x00, 0x27, 0xb8, 0x62, 0x8e, 0x64, 0x05, 0x8e, 0x78,
 	0x85, 0x24, 0x12, 0x3b, 0x53, 0xf0, 0x37, 0x52, 0x41, 0x6c, 0xa4, 0xc2, 0xba, 0xd9, 0x28, 0xa5,
-	0xff, 0xf8, 0xeb, 0xc5, 0x11, 0x4f, 0xae, 0x2c, 0xf9, 0xdc, 0x17, 0x97, 0xb1, 0x49, 0x38, 0xb1,
+	0xff, 0xf0, 0xab, 0xc5, 0x11, 0x4f, 0xae, 0x2c, 0xf9, 0xdc, 0x17, 0x97, 0xb1, 0x49, 0x38, 0xb1,
 	0xcb, 0x1a, 0x17, 0x77, 0x17, 0xef, 0xc1, 0xab, 0xe2, 0x03, 0x77, 0x71, 0x03, 0x8e, 0xfa, 0xbd,
-	0x8d, 0x87, 0xfa, 0xdd, 0x1e, 0xa1, 0xf6, 0xc5, 0x79, 0x4c, 0xb9, 0x28, 0xfe, 0x0d, 0x80, 0x53,
+	0x8d, 0x87, 0xfa, 0xdd, 0x1e, 0xa1, 0xf6, 0xc5, 0x79, 0x4c, 0xb9, 0x28, 0xfe, 0x35, 0x80, 0x53,
 	0x8f, 0x74, 0xf5, 0xf0, 0xa1, 0x60, 0xdb, 0x21, 0x0e, 0x3a, 0x84, 0x13, 0x81, 0x98, 0x6c, 0x12,
-	0x87, 0x6f, 0xce, 0x2d, 0x4f, 0xf2, 0xaf, 0xcd, 0xfc, 0x7b, 0x55, 0xdd, 0x39, 0x70, 0x2b, 0x05,
+	0x87, 0x6f, 0xce, 0x2d, 0x4f, 0xf2, 0x2f, 0xcd, 0xfc, 0x7b, 0x55, 0xdd, 0x39, 0x70, 0x2b, 0x05,
 	0x95, 0xd6, 0x78, 0x3b, 0xe2, 0x7f, 0x16, 0x6d, 0xed, 0xb0, 0xe8, 0x34, 0xea, 0xc4, 0x2e, 0x6c,
 	0x12, 0xf5, 0xb4, 0x99, 0x9f, 0xf1, 0xeb, 0xa8, 0x45, 0x19, 0x96, 0xc6, 0x8d, 0xa8, 0xb1, 0x65,
 	0x08, 0xbd, 0xae, 0x2b, 0xeb, 0xa6, 0x46, 0x1e, 0xb3, 0x90, 0x0d, 0x97, 0xae, 0x9f, 0x36, 0xf3,
-	0xd7, 0x7c, 0xd9, 0x90, 0x86, 0xa5, 0xb4, 0xdf, 0x9e, 0xbd, 0xdf, 0xff, 0x03, 0x70, 0x2e, 0xf0,
-	0x79, 0x93, 0xd4, 0x9d, 0x83, 0x6f, 0xe9, 0xce, 0x81, 0xa4, 0x98, 0x55, 0x82, 0x8e, 0xe0, 0x54,
+	0xd7, 0x7c, 0xd9, 0x90, 0x86, 0xa5, 0xb4, 0xdf, 0x9e, 0xbd, 0xdf, 0xff, 0x05, 0x70, 0x2e, 0xf0,
+	0x79, 0x93, 0xd4, 0x9d, 0x83, 0x6f, 0xea, 0xce, 0x81, 0xa4, 0x98, 0x55, 0x82, 0x8e, 0xe0, 0x54,
 	0x68, 0x51, 0xa9, 0x51, 0xd7, 0xbc, 0x68, 0x04, 0x93, 0xc1, 0x7a, 0x9d, 0xa9, 0xf7, 0x40, 0x18,
 	0xf4, 0x84, 0x58, 0xb2, 0xe7, 0x61, 0x27, 0x88, 0x90, 0x86, 0xa5, 0x34, 0x5b, 0x78, 0x31, 0xf7,
 	0xa4, 0xdc, 0x7a, 0x5d, 0x48, 0x0d, 0xb7, 0x4b, 0x85, 0x34, 0x2c, 0xa5, 0xd9, 0xc2, 0x93, 0xc2,
@@ -1326,16 +1326,16 @@ var fileDescriptor_5c83e18b11fd607d = []byte{
 	0x70, 0xdc, 0xb5, 0x89, 0xac, 0xba, 0x1c, 0xed, 0xa5, 0x79, 0xb0, 0x70, 0xa5, 0x34, 0x77, 0xda,
 	0xcc, 0x4f, 0x73, 0xb4, 0x11, 0x2a, 0x96, 0xa0, 0x6b, 0x93, 0x0d, 0x37, 0x08, 0x53, 0x85, 0xba,
 	0xa6, 0xe6, 0x0b, 0x8e, 0xb4, 0x1b, 0x0c, 0x69, 0x58, 0x4a, 0xb3, 0x45, 0xd4, 0xa0, 0x49, 0x65,
-	0xf6, 0x2d, 0x33, 0x1a, 0x67, 0x50, 0x50, 0x7d, 0x83, 0x3b, 0xb4, 0xc4, 0x16, 0x3f, 0x4f, 0xc1,
+	0xf6, 0x2d, 0x33, 0x1a, 0x67, 0x50, 0x50, 0x7d, 0x83, 0x3b, 0xb4, 0xc4, 0x16, 0x3f, 0x4b, 0xc1,
 	0x7c, 0xd7, 0x08, 0xf3, 0xdd, 0x77, 0x10, 0x2d, 0x32, 0xcd, 0x2b, 0x40, 0xd1, 0x2b, 0xee, 0x25,
 	0x6c, 0x79, 0xed, 0xdb, 0x8e, 0xef, 0xcc, 0xb0, 0xb6, 0x58, 0x59, 0xdb, 0xe8, 0x0b, 0x70, 0x5c,
 	0x75, 0x2d, 0x8b, 0x98, 0x4e, 0xa4, 0xba, 0xa4, 0x31, 0xfe, 0x8d, 0x61, 0x3d, 0x81, 0xd7, 0x04,
-	0x4b, 0x20, 0xcd, 0x32, 0x93, 0x2e, 0x7d, 0xb5, 0xef, 0x92, 0xcf, 0xf8, 0xe1, 0xe9, 0x50, 0x88,
-	0xa5, 0x29, 0xfe, 0x2d, 0xf0, 0x1a, 0x7f, 0x0d, 0xde, 0x0c, 0x16, 0xbb, 0x7e, 0x7d, 0xb2, 0x3d,
+	0x4b, 0x20, 0xcd, 0x32, 0x93, 0x2e, 0x7d, 0xa5, 0xef, 0x92, 0xcf, 0xf8, 0xe1, 0xe9, 0x50, 0x88,
+	0xa5, 0x29, 0xfe, 0x2d, 0xf0, 0x1a, 0x7f, 0x15, 0xde, 0x0c, 0x16, 0xbb, 0x7e, 0x7d, 0xb2, 0x3d,
 	0x38, 0x48, 0x21, 0xe2, 0xa7, 0x00, 0xde, 0xea, 0xa2, 0x8d, 0x07, 0xbd, 0x02, 0xd3, 0x21, 0x3e,
-	0x3f, 0xda, 0x1f, 0x27, 0x8c, 0x76, 0x97, 0x66, 0x21, 0x0e, 0xdd, 0x10, 0xe5, 0xb7, 0xe1, 0xad,
-	0x0d, 0x43, 0xd1, 0x6b, 0x4a, 0xc5, 0x20, 0xdf, 0xa8, 0x5b, 0x44, 0xd1, 0x24, 0x72, 0xa2, 0x58,
-	0x9a, 0x7d, 0xee, 0x53, 0xf3, 0x67, 0x00, 0xe6, 0xba, 0xa9, 0xe6, 0x00, 0x7f, 0x00, 0x33, 0xaa,
+	0x3f, 0xda, 0x9f, 0x24, 0x8c, 0x76, 0x97, 0x66, 0x21, 0x0e, 0xdd, 0x10, 0xe5, 0xb7, 0xe0, 0xad,
+	0x0d, 0x43, 0xd1, 0x6b, 0x4a, 0xc5, 0x20, 0x5f, 0xaf, 0x5b, 0x44, 0xd1, 0x24, 0x72, 0xa2, 0x58,
+	0x9a, 0x7d, 0xee, 0x53, 0xf3, 0xa7, 0x00, 0xe6, 0xba, 0xa9, 0xe6, 0x00, 0xbf, 0x0f, 0x33, 0xaa,
 	0xe0, 0x90, 0x6d, 0xc6, 0x22, 0x5b, 0x3e, 0x0f, 0xc7, 0xfb, 0x4e, 0xcb, 0x69, 0x22, 0xd0, 0x6d,
 	0x50, 0xdd, 0x2c, 0xbd, 0xef, 0x41, 0x39, 0x6d, 0xe6, 0xf3, 0x3c, 0x81, 0x5d, 0x14, 0x61, 0x69,
 	0x56, 0x8d, 0xf5, 0x02, 0xef, 0xc1, 0x6c, 0xe0, 0x5f, 0x59, 0x8c, 0x72, 0xe7, 0xc7, 0xfd, 0x34,
@@ -1343,49 +1343,49 @@ var fileDescriptor_5c83e18b11fd607d = []byte{
 	0x45, 0x0e, 0xf8, 0x46, 0x3b, 0xe0, 0x50, 0x09, 0x96, 0xa6, 0xd5, 0x4e, 0xd3, 0x9e, 0xc9, 0x7d,
 	0x6a, 0xed, 0x13, 0xdd, 0x21, 0x5a, 0xd4, 0x64, 0xaa, 0x4f, 0x93, 0x71, 0x4a, 0xb0, 0x34, 0x1d,
 	0x7c, 0x0e, 0x4d, 0xe2, 0x87, 0xf0, 0x96, 0x37, 0x2a, 0xac, 0xab, 0xaa, 0x5b, 0x73, 0x0d, 0xc5,
-	0xa1, 0x56, 0x5b, 0x5d, 0xf5, 0xb5, 0x57, 0x7e, 0x97, 0x82, 0xb9, 0x6e, 0xea, 0x78, 0x58, 0x9f,
+	0xa1, 0x56, 0x5b, 0x5d, 0xf5, 0xb5, 0x57, 0x7e, 0x9b, 0x82, 0xb9, 0x6e, 0xea, 0x78, 0x58, 0x9f,
 	0x01, 0x78, 0xa3, 0x25, 0xf3, 0x72, 0xd5, 0xa2, 0x27, 0xce, 0x81, 0x5c, 0x35, 0x68, 0x45, 0x31,
-	0x78, 0x78, 0x6f, 0xc6, 0x62, 0xdd, 0x24, 0x2a, 0x83, 0x7b, 0xd7, 0x83, 0xfb, 0xcb, 0x57, 0xf9,
+	0x78, 0x78, 0x6f, 0xc6, 0x62, 0xdd, 0x24, 0x2a, 0x83, 0x7b, 0xd7, 0x83, 0xfb, 0x8b, 0x57, 0xf9,
 	0xdb, 0xc9, 0xba, 0x87, 0x27, 0x63, 0x4b, 0x19, 0x3b, 0x52, 0x55, 0xdb, 0xcc, 0xe6, 0x36, 0x33,
-	0x89, 0x7e, 0x04, 0xe0, 0x8c, 0x5b, 0xf7, 0x2e, 0x29, 0x6d, 0xbe, 0xf8, 0x71, 0x5f, 0x4e, 0xb8,
+	0x89, 0x7e, 0x08, 0xe0, 0x8c, 0x5b, 0xf7, 0x2e, 0x29, 0x6d, 0xbe, 0xf8, 0x71, 0x5f, 0x4e, 0xb8,
 	0x97, 0xf7, 0x98, 0x8a, 0x47, 0x96, 0xa2, 0x1e, 0x12, 0xab, 0x3d, 0x25, 0x71, 0xfa, 0xb1, 0x84,
 	0xfc, 0xcf, 0x51, 0x6f, 0xbc, 0x7e, 0x93, 0xf3, 0x7a, 0x4c, 0x24, 0x86, 0x5c, 0xe7, 0x40, 0x39,
 	0x19, 0x70, 0x92, 0x79, 0x9b, 0x82, 0xf9, 0xae, 0x5e, 0xf0, 0x54, 0x3e, 0x07, 0xf0, 0x7e, 0x6c,
 	0x2a, 0x69, 0x9d, 0xed, 0x33, 0x22, 0x6b, 0xe2, 0x80, 0x92, 0xe9, 0xbe, 0x6c, 0x28, 0xb6, 0x23,
-	0x3b, 0x96, 0x72, 0x4c, 0x2c, 0xfb, 0xf3, 0x4c, 0xf4, 0x52, 0x67, 0xa2, 0x3f, 0xe3, 0x0e, 0x05,
-	0x07, 0xe6, 0x67, 0xfb, 0x0f, 0x15, 0xdb, 0x79, 0x24, 0x9c, 0x41, 0x4f, 0xe0, 0x24, 0xcf, 0x90,
-	0xc3, 0x51, 0x9e, 0x2b, 0xf9, 0x39, 0x9e, 0xfc, 0xd9, 0x96, 0xe4, 0x0b, 0xd5, 0x58, 0xba, 0xea,
-	0x46, 0xd9, 0x6d, 0xfc, 0x63, 0x00, 0xe7, 0x82, 0x4d, 0x29, 0xb1, 0x4b, 0xea, 0x60, 0xc9, 0xbe,
-	0xa8, 0xab, 0xc7, 0x0b, 0x00, 0x33, 0x9d, 0x0e, 0xf1, 0xbc, 0xeb, 0xf0, 0x5a, 0xfb, 0x95, 0x5a,
-	0xb4, 0xc5, 0x2f, 0x25, 0x0c, 0x57, 0x9b, 0x6e, 0x7e, 0xde, 0x4d, 0xe9, 0x6d, 0x26, 0x2f, 0xec,
-	0xe6, 0xb2, 0xf4, 0x4f, 0x04, 0x47, 0xbe, 0xee, 0xb1, 0xa2, 0x5f, 0x00, 0xc8, 0x6e, 0x47, 0x36,
-	0xba, 0x9b, 0xd0, 0xd9, 0xe8, 0xe5, 0x2e, 0xbb, 0xdc, 0x9f, 0x90, 0xef, 0x0a, 0x5e, 0xfe, 0xe1,
-	0x9f, 0xfe, 0xf1, 0xd3, 0x54, 0x01, 0x7d, 0x58, 0x8c, 0x7b, 0xab, 0x08, 0x9f, 0x2a, 0x82, 0x77,
-	0x1a, 0xe6, 0xe0, 0xaf, 0x00, 0x1c, 0xf5, 0xef, 0x47, 0x28, 0xb1, 0xd9, 0xe8, 0xf5, 0x2c, 0xbb,
+	0x3b, 0x96, 0x72, 0x4c, 0x2c, 0xfb, 0xff, 0x99, 0xe8, 0xa5, 0xce, 0x44, 0x7f, 0xce, 0x1d, 0x0a,
+	0x0e, 0xcc, 0xcf, 0xf7, 0x1f, 0x2a, 0xb6, 0xf3, 0x48, 0x38, 0x83, 0x9e, 0xc0, 0x49, 0x9e, 0x21,
+	0x87, 0xa3, 0x3c, 0x57, 0xf2, 0x73, 0x3c, 0xf9, 0xb3, 0x2d, 0xc9, 0x17, 0xaa, 0xb1, 0x74, 0xd5,
+	0x8d, 0xb2, 0xdb, 0xf8, 0x47, 0x00, 0xce, 0x05, 0x9b, 0x52, 0x62, 0x97, 0xd4, 0xc1, 0x92, 0x7d,
+	0x51, 0x57, 0x8f, 0x17, 0x00, 0x66, 0x3a, 0x1d, 0xe2, 0x79, 0xd7, 0xe1, 0xb5, 0xf6, 0x2b, 0xb5,
+	0x68, 0x8b, 0x1f, 0x25, 0x0c, 0x57, 0x9b, 0x6e, 0x7e, 0xde, 0x4d, 0xe9, 0x6d, 0x26, 0x2f, 0xec,
+	0xe6, 0xb2, 0xf4, 0x0f, 0x04, 0x47, 0xbe, 0xe6, 0xb1, 0xa2, 0x9f, 0x03, 0xc8, 0x6e, 0x47, 0x36,
+	0xba, 0x9b, 0xd0, 0xd9, 0xe8, 0xe5, 0x2e, 0xbb, 0xdc, 0x9f, 0x90, 0xef, 0x0a, 0x5e, 0xfe, 0xc1,
+	0x1f, 0xff, 0xfe, 0x93, 0x54, 0x01, 0x7d, 0x58, 0x8c, 0x7b, 0xab, 0x08, 0x9f, 0x2a, 0x82, 0x77,
+	0x1a, 0xe6, 0xe0, 0x2f, 0x01, 0x1c, 0xf5, 0xef, 0x47, 0x28, 0xb1, 0xd9, 0xe8, 0xf5, 0x2c, 0xbb,
 	0xd2, 0xa7, 0x14, 0xf7, 0x76, 0x85, 0x79, 0x5b, 0x44, 0x8b, 0x49, 0xbd, 0xf5, 0x7d, 0x7c, 0x01,
 	0xe0, 0x44, 0xcb, 0xa3, 0x04, 0x5a, 0x4b, 0xba, 0x7b, 0x62, 0x9e, 0x61, 0xb2, 0x0f, 0x06, 0x13,
-	0xe6, 0x18, 0x4a, 0x0c, 0xc3, 0x03, 0xb4, 0x9a, 0x38, 0xe2, 0x5c, 0x43, 0xf1, 0xfb, 0xfc, 0x65,
+	0xe6, 0x18, 0x4a, 0x0c, 0xc3, 0x03, 0xb4, 0x9a, 0x38, 0xe2, 0x5c, 0x43, 0xf1, 0x7b, 0xfc, 0x65,
 	0xe7, 0x09, 0x7a, 0x0b, 0xe0, 0xf5, 0xd8, 0xd1, 0x0f, 0x6d, 0xf4, 0x3b, 0xdf, 0xc5, 0x8c, 0xa1,
-	0xd9, 0xcd, 0xf3, 0x29, 0xe1, 0x40, 0xb7, 0x19, 0xd0, 0x75, 0xf4, 0x49, 0x42, 0xa0, 0xe1, 0xfd,
-	0x40, 0xdc, 0xe3, 0x64, 0x8b, 0x61, 0xfa, 0x6f, 0xf4, 0xf2, 0xda, 0x7a, 0xbf, 0x40, 0x9f, 0xf6,
+	0xd9, 0xcd, 0xf3, 0x29, 0xe1, 0x40, 0xb7, 0x19, 0xd0, 0x75, 0xf4, 0x69, 0x42, 0xa0, 0xe1, 0xfd,
+	0x40, 0xdc, 0xe3, 0x64, 0x8b, 0x61, 0xfa, 0x4f, 0xf4, 0xf2, 0xda, 0x7a, 0xbf, 0x40, 0x9f, 0xf5,
 	0xeb, 0x6a, 0xec, 0x0d, 0x30, 0xbb, 0x75, 0x5e, 0x35, 0x1c, 0x73, 0x99, 0x61, 0xde, 0x40, 0xeb,
-	0x7d, 0x63, 0x36, 0x89, 0x23, 0xeb, 0x66, 0x78, 0x30, 0xa1, 0xff, 0x00, 0x38, 0x1b, 0x3f, 0xfe,
-	0xa2, 0xa4, 0xf9, 0x39, 0x73, 0x30, 0xcf, 0x7e, 0x7a, 0x4e, 0x2d, 0x03, 0xa6, 0xb9, 0xdb, 0x9c,
-	0x8d, 0xfe, 0x0e, 0xe0, 0x74, 0xcc, 0xdc, 0x8b, 0xd6, 0xfb, 0xf5, 0xb3, 0x63, 0x16, 0xcf, 0x96,
-	0xce, 0xa3, 0x82, 0xe3, 0xdc, 0x60, 0x38, 0x3f, 0x42, 0x6b, 0x7d, 0xe3, 0x0c, 0x67, 0x5d, 0xf4,
-	0x07, 0x00, 0xc7, 0xa3, 0x4f, 0x81, 0x68, 0x35, 0x71, 0xd7, 0xee, 0x78, 0x8f, 0xcc, 0xae, 0x0d,
-	0x24, 0xcb, 0xe1, 0x7c, 0xc4, 0xe0, 0xdc, 0x43, 0x2b, 0x7d, 0xb6, 0x21, 0xb9, 0xd2, 0x90, 0x75,
-	0x0d, 0xfd, 0x0b, 0xc0, 0xd9, 0xf8, 0x81, 0x3a, 0x71, 0x75, 0x9e, 0x39, 0xde, 0x27, 0xae, 0xce,
+	0x7d, 0x63, 0x36, 0x89, 0x23, 0xeb, 0x66, 0x78, 0x30, 0xa1, 0x7f, 0x03, 0x38, 0x1b, 0x3f, 0xfe,
+	0xa2, 0xa4, 0xf9, 0x39, 0x73, 0x30, 0xcf, 0x7e, 0x76, 0x4e, 0x2d, 0x03, 0xa6, 0xb9, 0xdb, 0x9c,
+	0x8d, 0xfe, 0x06, 0xe0, 0x74, 0xcc, 0xdc, 0x8b, 0xd6, 0xfb, 0xf5, 0xb3, 0x63, 0x16, 0xcf, 0x96,
+	0xce, 0xa3, 0x82, 0xe3, 0xdc, 0x60, 0x38, 0x3f, 0x46, 0x6b, 0x7d, 0xe3, 0x0c, 0x67, 0x5d, 0xf4,
+	0x7b, 0x00, 0xc7, 0xa3, 0x4f, 0x81, 0x68, 0x35, 0x71, 0xd7, 0xee, 0x78, 0x8f, 0xcc, 0xae, 0x0d,
+	0x24, 0xcb, 0xe1, 0x7c, 0xcc, 0xe0, 0xdc, 0x43, 0x2b, 0x7d, 0xb6, 0x21, 0xb9, 0xd2, 0x90, 0x75,
+	0x0d, 0xfd, 0x13, 0xc0, 0xd9, 0xf8, 0x81, 0x3a, 0x71, 0x75, 0x9e, 0x39, 0xde, 0x27, 0xae, 0xce,
 	0xb3, 0xa7, 0x7a, 0xbc, 0xce, 0x60, 0xae, 0xa1, 0xfb, 0x7d, 0x9c, 0x6f, 0xb2, 0xe2, 0xe9, 0x0b,
-	0xea, 0xf2, 0xcf, 0x00, 0x4e, 0xb5, 0x8f, 0x1c, 0xe8, 0xe3, 0xc1, 0xe6, 0x89, 0x00, 0xde, 0x27,
-	0x03, 0xcb, 0x73, 0x60, 0x5f, 0x61, 0xc0, 0x56, 0xd1, 0x97, 0x13, 0x02, 0xeb, 0x18, 0x8c, 0xd0,
-	0xbf, 0x01, 0x9c, 0xeb, 0x32, 0x49, 0x27, 0x6e, 0xab, 0x67, 0xdf, 0x07, 0x12, 0xb7, 0xd5, 0x1e,
+	0xea, 0xf2, 0x4f, 0x00, 0x4e, 0xb5, 0x8f, 0x1c, 0xe8, 0x93, 0xc1, 0xe6, 0x89, 0x00, 0xde, 0xa7,
+	0x03, 0xcb, 0x73, 0x60, 0x5f, 0x66, 0xc0, 0x56, 0xd1, 0x97, 0x12, 0x02, 0xeb, 0x18, 0x8c, 0xd0,
+	0xbf, 0x00, 0x9c, 0xeb, 0x32, 0x49, 0x27, 0x6e, 0xab, 0x67, 0xdf, 0x07, 0x12, 0xb7, 0xd5, 0x1e,
 	0x03, 0x7d, 0xdf, 0x67, 0x26, 0x3b, 0x3c, 0xfc, 0x2c, 0x8a, 0xd9, 0xb6, 0x74, 0xf0, 0xfc, 0x75,
-	0x0e, 0xbc, 0x7c, 0x9d, 0x03, 0x7f, 0x7b, 0x9d, 0x03, 0xcf, 0xde, 0xe4, 0x86, 0x5e, 0xbe, 0xc9,
-	0x0d, 0xfd, 0xe5, 0x4d, 0x6e, 0xe8, 0x3b, 0x3b, 0x91, 0x21, 0x9e, 0xeb, 0x5f, 0x34, 0x94, 0x8a,
-	0x1d, 0x18, 0x3b, 0xbe, 0xb3, 0x52, 0x7c, 0xdc, 0xed, 0x9f, 0x38, 0xaa, 0xa1, 0x13, 0xd3, 0xf1,
-	0xff, 0x9d, 0xe5, 0x3f, 0x77, 0x8f, 0xb2, 0x3f, 0x77, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xe7,
-	0xa0, 0x40, 0x85, 0xd4, 0x1b, 0x00, 0x00,
+	0x0e, 0xbc, 0x7c, 0x9d, 0x03, 0x7f, 0x7d, 0x9d, 0x03, 0xcf, 0xde, 0xe4, 0x86, 0x5e, 0xbe, 0xc9,
+	0x0d, 0xfd, 0xf9, 0x4d, 0x6e, 0xe8, 0xdb, 0x3b, 0x91, 0x21, 0x9e, 0xeb, 0x5f, 0x34, 0x94, 0x8a,
+	0x1d, 0x18, 0x3b, 0xbe, 0xf3, 0x51, 0xf1, 0x71, 0xb7, 0x7f, 0xe2, 0xa8, 0x86, 0x4e, 0x4c, 0xc7,
+	0xff, 0x77, 0x96, 0xff, 0xdc, 0x3d, 0xca, 0xfe, 0xdc, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xf0, 0xa4, 0x15, 0x3f, 0xd4, 0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/clmocks/listeners.go b/x/concentrated-liquidity/clmocks/listeners.go
index 82af37a6db5..42ed2f87e22 100644
--- a/x/concentrated-liquidity/clmocks/listeners.go
+++ b/x/concentrated-liquidity/clmocks/listeners.go
@@ -1,7 +1,7 @@
 package clmocks
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/concentrated-liquidity/clmodule/module.go b/x/concentrated-liquidity/clmodule/module.go
index 43265b39bcf..b4d330cf529 100644
--- a/x/concentrated-liquidity/clmodule/module.go
+++ b/x/concentrated-liquidity/clmodule/module.go
@@ -16,17 +16,17 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/simulation"
-
-	clkeeper "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clclient "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/simulation"
+
+	clkeeper "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clclient "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 var (
diff --git a/x/concentrated-liquidity/export_test.go b/x/concentrated-liquidity/export_test.go
index f4cd8adb5a2..399b0ac9f07 100644
--- a/x/concentrated-liquidity/export_test.go
+++ b/x/concentrated-liquidity/export_test.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/concentrated-liquidity/genesis.go b/x/concentrated-liquidity/genesis.go
index a70b12e3983..a454184f687 100644
--- a/x/concentrated-liquidity/genesis.go
+++ b/x/concentrated-liquidity/genesis.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	types "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	types "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 // InitGenesis initializes the concentrated-liquidity module with the provided genesis state.
diff --git a/x/concentrated-liquidity/genesis_test.go b/x/concentrated-liquidity/genesis_test.go
index e7938ac2aac..d25148ac110 100644
--- a/x/concentrated-liquidity/genesis_test.go
+++ b/x/concentrated-liquidity/genesis_test.go
@@ -11,12 +11,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	osmoapp "github.com/osmosis-labs/osmosis/v15/app"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clmodule "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/clmodule"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	osmoapp "github.com/osmosis-labs/osmosis/v16/app"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clmodule "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/clmodule"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 type singlePoolGenesisEntry struct {
diff --git a/x/concentrated-liquidity/gov.go b/x/concentrated-liquidity/gov.go
index 7adfd8da2ed..532bf4234f7 100644
--- a/x/concentrated-liquidity/gov.go
+++ b/x/concentrated-liquidity/gov.go
@@ -3,9 +3,9 @@ package concentrated_liquidity
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func handleCreateConcentratedLiquidityPoolsProposal(ctx sdk.Context, k Keeper, p *types.CreateConcentratedLiquidityPoolsProposal) error {
diff --git a/x/concentrated-liquidity/handler.go b/x/concentrated-liquidity/handler.go
index f682f3704df..9aa263c7b1c 100644
--- a/x/concentrated-liquidity/handler.go
+++ b/x/concentrated-liquidity/handler.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func NewConcentratedLiquidityProposalHandler(k Keeper) govtypes.Handler {
diff --git a/x/concentrated-liquidity/incentives.go b/x/concentrated-liquidity/incentives.go
index 9c529a5203d..6baaa47f4b9 100644
--- a/x/concentrated-liquidity/incentives.go
+++ b/x/concentrated-liquidity/incentives.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // createUptimeAccumulators creates accumulator objects in store for each supported uptime for the given poolId.
diff --git a/x/concentrated-liquidity/incentives_test.go b/x/concentrated-liquidity/incentives_test.go
index 73ecf1c44f9..7c24dc8a443 100644
--- a/x/concentrated-liquidity/incentives_test.go
+++ b/x/concentrated-liquidity/incentives_test.go
@@ -12,13 +12,13 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var (
diff --git a/x/concentrated-liquidity/keeper.go b/x/concentrated-liquidity/keeper.go
index 80d77073e03..9ccb376d82e 100644
--- a/x/concentrated-liquidity/keeper.go
+++ b/x/concentrated-liquidity/keeper.go
@@ -8,7 +8,7 @@ import (
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type Keeper struct {
diff --git a/x/concentrated-liquidity/keeper_test.go b/x/concentrated-liquidity/keeper_test.go
index 6f827cc3347..3bde22db31b 100644
--- a/x/concentrated-liquidity/keeper_test.go
+++ b/x/concentrated-liquidity/keeper_test.go
@@ -10,16 +10,16 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	concentrated_liquidity "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/clmocks"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	concentrated_liquidity "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/clmocks"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 )
 
 var (
diff --git a/x/concentrated-liquidity/lp.go b/x/concentrated-liquidity/lp.go
index ee86807870a..a4d3a0d669b 100644
--- a/x/concentrated-liquidity/lp.go
+++ b/x/concentrated-liquidity/lp.go
@@ -7,9 +7,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	types "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	types "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 const noUnderlyingLockId = uint64(0)
diff --git a/x/concentrated-liquidity/lp_test.go b/x/concentrated-liquidity/lp_test.go
index 0287b1bc71a..98d68c85059 100644
--- a/x/concentrated-liquidity/lp_test.go
+++ b/x/concentrated-liquidity/lp_test.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	types "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	types "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type lpTest struct {
diff --git a/x/concentrated-liquidity/math/math_test.go b/x/concentrated-liquidity/math/math_test.go
index 2fbbdcb9c5e..8a1b99ce45c 100644
--- a/x/concentrated-liquidity/math/math_test.go
+++ b/x/concentrated-liquidity/math/math_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type ConcentratedMathTestSuite struct {
diff --git a/x/concentrated-liquidity/math/tick.go b/x/concentrated-liquidity/math/tick.go
index fb59bb8d5e4..f3d98066450 100644
--- a/x/concentrated-liquidity/math/tick.go
+++ b/x/concentrated-liquidity/math/tick.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // TicksToSqrtPrice returns the sqrtPrice for the lower and upper ticks by
diff --git a/x/concentrated-liquidity/math/tick_test.go b/x/concentrated-liquidity/math/tick_test.go
index c1998271bb3..5d953c455ab 100644
--- a/x/concentrated-liquidity/math/tick_test.go
+++ b/x/concentrated-liquidity/math/tick_test.go
@@ -3,8 +3,8 @@ package math_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 const (
diff --git a/x/concentrated-liquidity/model/codec.go b/x/concentrated-liquidity/model/codec.go
index 2e420b30612..3df914bcf73 100644
--- a/x/concentrated-liquidity/model/codec.go
+++ b/x/concentrated-liquidity/model/codec.go
@@ -8,8 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
diff --git a/x/concentrated-liquidity/model/msgs.go b/x/concentrated-liquidity/model/msgs.go
index fbbc4b7cbe2..6ab6213162a 100644
--- a/x/concentrated-liquidity/model/msgs.go
+++ b/x/concentrated-liquidity/model/msgs.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // constants.
diff --git a/x/concentrated-liquidity/model/msgs_test.go b/x/concentrated-liquidity/model/msgs_test.go
index 6d5450d462c..d6b804c6b50 100644
--- a/x/concentrated-liquidity/model/msgs_test.go
+++ b/x/concentrated-liquidity/model/msgs_test.go
@@ -7,9 +7,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func TestMsgCreateConcentratedPool(t *testing.T) {
diff --git a/x/concentrated-liquidity/model/pool.go b/x/concentrated-liquidity/model/pool.go
index d3404d445f0..16fea944810 100644
--- a/x/concentrated-liquidity/model/pool.go
+++ b/x/concentrated-liquidity/model/pool.go
@@ -8,9 +8,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/concentrated-liquidity/model/pool.pb.go b/x/concentrated-liquidity/model/pool.pb.go
index 08457101ef0..8e1cdb04cae 100644
--- a/x/concentrated-liquidity/model/pool.pb.go
+++ b/x/concentrated-liquidity/model/pool.pb.go
@@ -101,47 +101,47 @@ func init() {
 
 var fileDescriptor_3526ea5373d96c9a = []byte{
 	// 648 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
-	0x14, 0x8d, 0xfb, 0xfb, 0x75, 0xd2, 0x56, 0x5f, 0xa7, 0x69, 0x71, 0x2b, 0x1a, 0x07, 0x4b, 0xa0,
-	0x20, 0x11, 0x9b, 0x80, 0xd8, 0x74, 0xd7, 0x80, 0x2a, 0x21, 0x55, 0x6a, 0x35, 0x2d, 0x42, 0x42,
-	0x48, 0xd6, 0xc4, 0x9e, 0x86, 0x51, 0x1c, 0x8f, 0xe3, 0x99, 0x94, 0xf6, 0x01, 0x90, 0x58, 0x76,
-	0xc9, 0xb2, 0x0f, 0xc1, 0x43, 0x54, 0xac, 0xba, 0x44, 0x48, 0x18, 0xd4, 0xbe, 0x41, 0x9e, 0x00,
-	0x79, 0x66, 0x9c, 0x18, 0x35, 0x2c, 0xba, 0x4a, 0xce, 0xb9, 0xe7, 0x9e, 0xb9, 0xf7, 0x7a, 0xee,
-	0x80, 0xc7, 0x8c, 0xf7, 0x18, 0xa7, 0xdc, 0xf5, 0x59, 0xe4, 0x93, 0x48, 0x24, 0x58, 0x90, 0xa0,
-	0x11, 0xd2, 0xfe, 0x80, 0x06, 0x54, 0x9c, 0xb9, 0x31, 0x63, 0xa1, 0x13, 0x27, 0x4c, 0x30, 0xf8,
-	0x50, 0x4b, 0x9d, 0xa2, 0x74, 0xa4, 0x74, 0x4e, 0x9a, 0x6d, 0x22, 0x70, 0x73, 0x73, 0xc3, 0x97,
-	0x3a, 0x4f, 0x26, 0xb9, 0x0a, 0x28, 0x87, 0xcd, 0x4a, 0x87, 0x75, 0x98, 0xe2, 0xb3, 0x7f, 0x9a,
-	0xb5, 0x3a, 0x8c, 0x75, 0x42, 0xe2, 0x4a, 0xd4, 0x1e, 0x1c, 0xbb, 0x82, 0xf6, 0x08, 0x17, 0xb8,
-	0x17, 0x2b, 0x81, 0xfd, 0x73, 0x1e, 0xcc, 0x1c, 0x30, 0x16, 0xc2, 0x27, 0x60, 0x1e, 0x07, 0x41,
-	0x42, 0x38, 0x37, 0x8d, 0x9a, 0x51, 0x5f, 0x68, 0xc1, 0x61, 0x6a, 0x2d, 0x9f, 0xe1, 0x5e, 0xb8,
-	0x6d, 0xeb, 0x80, 0x8d, 0x72, 0x09, 0xdc, 0x03, 0x90, 0xca, 0x42, 0xe9, 0x09, 0xe1, 0x5e, 0x9e,
-	0x38, 0x25, 0x13, 0xb7, 0x86, 0xa9, 0xb5, 0xa1, 0x12, 0x6f, 0x6b, 0x6c, 0xb4, 0x32, 0x26, 0x77,
-	0xb4, 0xdb, 0x5b, 0xb0, 0xce, 0xe3, 0x84, 0xe0, 0xc0, 0x4b, 0xc8, 0x47, 0x9c, 0x04, 0x63, 0xc7,
-	0x69, 0xe9, 0xf8, 0x60, 0x98, 0x5a, 0x5b, 0xca, 0x71, 0xb2, 0xce, 0x46, 0x15, 0x15, 0x40, 0x8a,
-	0xcf, 0x8d, 0x97, 0xc1, 0x14, 0x0d, 0xcc, 0x99, 0x9a, 0x51, 0x9f, 0x41, 0x53, 0x34, 0x80, 0x9f,
-	0x0c, 0xb0, 0xee, 0x0f, 0x92, 0x84, 0x44, 0xc2, 0x13, 0xd4, 0xef, 0x7a, 0xa3, 0x11, 0x9b, 0xb3,
-	0xf2, 0xa4, 0xfd, 0xcb, 0xd4, 0x2a, 0xfd, 0x48, 0xad, 0x47, 0x1d, 0x2a, 0x3e, 0x0c, 0xda, 0x8e,
-	0xcf, 0x7a, 0x7a, 0xcc, 0xfa, 0xa7, 0xc1, 0x83, 0xae, 0x2b, 0xce, 0x62, 0xc2, 0x9d, 0x57, 0xc4,
-	0x1f, 0xd7, 0x35, 0xd9, 0xd5, 0x46, 0x15, 0x1d, 0x38, 0xa2, 0x7e, 0x77, 0x2f, 0xa7, 0xe1, 0x3a,
-	0x98, 0x13, 0xac, 0x4b, 0xa2, 0xa7, 0xe6, 0x5c, 0x76, 0x2c, 0xd2, 0x68, 0xc4, 0x37, 0xcd, 0xf9,
-	0x02, 0xdf, 0x84, 0x7d, 0x00, 0xf3, 0x03, 0x78, 0x3f, 0x11, 0x5e, 0x9c, 0x50, 0x9f, 0x98, 0xff,
-	0xc9, 0x92, 0x5f, 0xde, 0xb9, 0xe4, 0x95, 0x7c, 0x94, 0x4c, 0x3b, 0xd9, 0xe8, 0x7f, 0x6d, 0x7f,
-	0xd8, 0x4f, 0xc4, 0x41, 0x46, 0xc1, 0x6d, 0xb0, 0x58, 0xec, 0xc9, 0x5c, 0xa8, 0x19, 0xf5, 0xe9,
-	0xd6, 0xbd, 0x61, 0x6a, 0xad, 0xde, 0xee, 0xd8, 0x46, 0xe5, 0x42, 0x9f, 0x59, 0xae, 0x9c, 0x03,
-	0x8f, 0xb1, 0x4f, 0xa3, 0x8e, 0x09, 0xb2, 0x0f, 0x50, 0xcc, 0x2d, 0x46, 0x6d, 0x54, 0xce, 0xe0,
-	0xa1, 0x42, 0xf0, 0x10, 0xac, 0x91, 0xd3, 0x98, 0x45, 0x99, 0x35, 0xd6, 0xf5, 0x79, 0x2c, 0x22,
-	0x66, 0x59, 0x16, 0x50, 0x1b, 0xa6, 0xd6, 0x7d, 0x65, 0x32, 0x51, 0x66, 0x23, 0x98, 0xf3, 0x3b,
-	0xaa, 0x93, 0xfd, 0x88, 0xc0, 0x2e, 0x58, 0xd2, 0x17, 0xe7, 0x18, 0xfb, 0x82, 0x25, 0xe6, 0xa2,
-	0x1c, 0xdd, 0xee, 0x9d, 0x47, 0x57, 0xf9, 0xeb, 0x16, 0x2a, 0x33, 0x1b, 0x2d, 0x2a, 0xbc, 0x2b,
-	0x21, 0x3c, 0x05, 0x6b, 0x21, 0xe6, 0x62, 0x7c, 0x0b, 0xbc, 0x41, 0x1c, 0x60, 0x41, 0xcc, 0xa5,
-	0x9a, 0x51, 0x2f, 0x3f, 0xdb, 0x74, 0xd4, 0x4e, 0x3a, 0xf9, 0x4e, 0x3a, 0x47, 0xf9, 0x4e, 0xb6,
-	0xea, 0x59, 0x41, 0xe3, 0x0e, 0x27, 0xda, 0xd8, 0xe7, 0xbf, 0x2c, 0x03, 0xad, 0x66, 0xb1, 0xd1,
-	0x85, 0x7a, 0x23, 0x23, 0xdb, 0x2b, 0x9f, 0x2f, 0xac, 0xd2, 0x97, 0x0b, 0xab, 0xf4, 0xed, 0x6b,
-	0x63, 0x36, 0xdb, 0xea, 0xd7, 0xad, 0xf7, 0x97, 0xd7, 0x55, 0xe3, 0xea, 0xba, 0x6a, 0xfc, 0xbe,
-	0xae, 0x1a, 0xe7, 0x37, 0xd5, 0xd2, 0xd5, 0x4d, 0xb5, 0xf4, 0xfd, 0xa6, 0x5a, 0x7a, 0xd7, 0x2a,
-	0x34, 0xad, 0x5f, 0x9f, 0x46, 0x88, 0xdb, 0x3c, 0x07, 0xee, 0x49, 0xf3, 0x85, 0x7b, 0xfa, 0xaf,
-	0xb7, 0xab, 0xc7, 0x02, 0x12, 0xb6, 0xe7, 0x64, 0x0f, 0xcf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff,
-	0xd8, 0xba, 0x26, 0xce, 0xea, 0x04, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6a, 0xdb, 0x4c,
+	0x14, 0xb5, 0xf2, 0xfb, 0x65, 0x9c, 0x84, 0x2f, 0x13, 0x27, 0x55, 0x42, 0x63, 0xb9, 0x82, 0x16,
+	0x17, 0x6a, 0xa9, 0x6e, 0xa1, 0x8b, 0xec, 0xe2, 0x96, 0x40, 0x21, 0x90, 0x30, 0x49, 0x29, 0x94,
+	0x82, 0x18, 0x4b, 0x13, 0x77, 0xb0, 0xac, 0x91, 0x35, 0xe3, 0x34, 0x79, 0x80, 0x42, 0x97, 0x59,
+	0x76, 0x99, 0x87, 0xe8, 0x43, 0x84, 0xae, 0xb2, 0x2c, 0x85, 0xaa, 0x25, 0x79, 0x03, 0x3f, 0x41,
+	0xd1, 0xcc, 0xc8, 0x56, 0x89, 0xbb, 0xc8, 0xca, 0x3e, 0xe7, 0x9e, 0x7b, 0xe6, 0xde, 0xab, 0xb9,
+	0x03, 0x1e, 0x33, 0xde, 0x63, 0x9c, 0x72, 0xd7, 0x67, 0x91, 0x4f, 0x22, 0x91, 0x60, 0x41, 0x82,
+	0x46, 0x48, 0xfb, 0x03, 0x1a, 0x50, 0x71, 0xe6, 0xc6, 0x8c, 0x85, 0x4e, 0x9c, 0x30, 0xc1, 0xe0,
+	0x43, 0x2d, 0x75, 0x8a, 0xd2, 0x91, 0xd2, 0x39, 0x69, 0xb6, 0x89, 0xc0, 0xcd, 0xcd, 0x0d, 0x5f,
+	0xea, 0x3c, 0x99, 0xe4, 0x2a, 0xa0, 0x1c, 0x36, 0x2b, 0x1d, 0xd6, 0x61, 0x8a, 0xcf, 0xfe, 0x69,
+	0xd6, 0xea, 0x30, 0xd6, 0x09, 0x89, 0x2b, 0x51, 0x7b, 0x70, 0xec, 0x0a, 0xda, 0x23, 0x5c, 0xe0,
+	0x5e, 0xac, 0x04, 0xf6, 0xcf, 0x79, 0x30, 0x73, 0xc0, 0x58, 0x08, 0x9f, 0x80, 0x79, 0x1c, 0x04,
+	0x09, 0xe1, 0xdc, 0x34, 0x6a, 0x46, 0x7d, 0xa1, 0x05, 0x87, 0xa9, 0xb5, 0x7c, 0x86, 0x7b, 0xe1,
+	0xb6, 0xad, 0x03, 0x36, 0xca, 0x25, 0x70, 0x0f, 0x40, 0x2a, 0x0b, 0xa5, 0x27, 0x84, 0x7b, 0x79,
+	0xe2, 0x94, 0x4c, 0xdc, 0x1a, 0xa6, 0xd6, 0x86, 0x4a, 0xbc, 0xad, 0xb1, 0xd1, 0xca, 0x98, 0xdc,
+	0xd1, 0x6e, 0x6f, 0xc1, 0x3a, 0x8f, 0x13, 0x82, 0x03, 0x2f, 0x21, 0x1f, 0x71, 0x12, 0x8c, 0x1d,
+	0xa7, 0xa5, 0xe3, 0x83, 0x61, 0x6a, 0x6d, 0x29, 0xc7, 0xc9, 0x3a, 0x1b, 0x55, 0x54, 0x00, 0x29,
+	0x3e, 0x37, 0x5e, 0x06, 0x53, 0x34, 0x30, 0x67, 0x6a, 0x46, 0x7d, 0x06, 0x4d, 0xd1, 0x00, 0x7e,
+	0x32, 0xc0, 0xba, 0x3f, 0x48, 0x12, 0x12, 0x09, 0x4f, 0x50, 0xbf, 0xeb, 0x8d, 0x46, 0x6c, 0xce,
+	0xca, 0x93, 0xf6, 0x2f, 0x53, 0xab, 0xf4, 0x23, 0xb5, 0x1e, 0x75, 0xa8, 0xf8, 0x30, 0x68, 0x3b,
+	0x3e, 0xeb, 0xe9, 0x31, 0xeb, 0x9f, 0x06, 0x0f, 0xba, 0xae, 0x38, 0x8b, 0x09, 0x77, 0x5e, 0x11,
+	0x7f, 0x5c, 0xd7, 0x64, 0x57, 0x1b, 0x55, 0x74, 0xe0, 0x88, 0xfa, 0xdd, 0xbd, 0x9c, 0x86, 0xeb,
+	0x60, 0x4e, 0xb0, 0x2e, 0x89, 0x9e, 0x9a, 0x73, 0xd9, 0xb1, 0x48, 0xa3, 0x11, 0xdf, 0x34, 0xe7,
+	0x0b, 0x7c, 0x13, 0xf6, 0x01, 0xcc, 0x0f, 0xe0, 0xfd, 0x44, 0x78, 0x71, 0x42, 0x7d, 0x62, 0xfe,
+	0x27, 0x4b, 0x7e, 0x79, 0xe7, 0x92, 0x57, 0xf2, 0x51, 0x32, 0xed, 0x64, 0xa3, 0xff, 0xb5, 0xfd,
+	0x61, 0x3f, 0x11, 0x07, 0x19, 0x05, 0xb7, 0xc1, 0x62, 0xb1, 0x27, 0x73, 0xa1, 0x66, 0xd4, 0xa7,
+	0x5b, 0xf7, 0x86, 0xa9, 0xb5, 0x7a, 0xbb, 0x63, 0x1b, 0x95, 0x0b, 0x7d, 0x66, 0xb9, 0x72, 0x0e,
+	0x3c, 0xc6, 0x3e, 0x8d, 0x3a, 0x26, 0xc8, 0x3e, 0x40, 0x31, 0xb7, 0x18, 0xb5, 0x51, 0x39, 0x83,
+	0x87, 0x0a, 0xc1, 0x43, 0xb0, 0x46, 0x4e, 0x63, 0x16, 0x65, 0xd6, 0x58, 0xd7, 0xe7, 0xb1, 0x88,
+	0x98, 0x65, 0x59, 0x40, 0x6d, 0x98, 0x5a, 0xf7, 0x95, 0xc9, 0x44, 0x99, 0x8d, 0x60, 0xce, 0xef,
+	0xa8, 0x4e, 0xf6, 0x23, 0x02, 0xbb, 0x60, 0x49, 0x5f, 0x9c, 0x63, 0xec, 0x0b, 0x96, 0x98, 0x8b,
+	0x72, 0x74, 0xbb, 0x77, 0x1e, 0x5d, 0xe5, 0xaf, 0x5b, 0xa8, 0xcc, 0x6c, 0xb4, 0xa8, 0xf0, 0xae,
+	0x84, 0xf0, 0x14, 0xac, 0x85, 0x98, 0x8b, 0xf1, 0x2d, 0xf0, 0x06, 0x71, 0x80, 0x05, 0x31, 0x97,
+	0x6a, 0x46, 0xbd, 0xfc, 0x6c, 0xd3, 0x51, 0x3b, 0xe9, 0xe4, 0x3b, 0xe9, 0x1c, 0xe5, 0x3b, 0xd9,
+	0xaa, 0x67, 0x05, 0x8d, 0x3b, 0x9c, 0x68, 0x63, 0x9f, 0xff, 0xb2, 0x0c, 0xb4, 0x9a, 0xc5, 0x46,
+	0x17, 0xea, 0x8d, 0x8c, 0x6c, 0xaf, 0x7c, 0xbe, 0xb0, 0x4a, 0x5f, 0x2e, 0xac, 0xd2, 0xb7, 0xaf,
+	0x8d, 0xd9, 0x6c, 0xab, 0x5f, 0xb7, 0xde, 0x5f, 0x5e, 0x57, 0x8d, 0xab, 0xeb, 0xaa, 0xf1, 0xfb,
+	0xba, 0x6a, 0x9c, 0xdf, 0x54, 0x4b, 0x57, 0x37, 0xd5, 0xd2, 0xf7, 0x9b, 0x6a, 0xe9, 0x5d, 0xab,
+	0xd0, 0xb4, 0x7e, 0x7d, 0x1a, 0x21, 0x6e, 0xf3, 0x1c, 0xb8, 0x27, 0xcd, 0x17, 0xee, 0xe9, 0xbf,
+	0xde, 0xae, 0x1e, 0x0b, 0x48, 0xd8, 0x9e, 0x93, 0x3d, 0x3c, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff,
+	0x50, 0x0a, 0x9a, 0xe4, 0xea, 0x04, 0x00, 0x00,
 }
 
 func (m *Pool) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/pool_test.go b/x/concentrated-liquidity/model/pool_test.go
index 7c818d60a4f..7beb795ab91 100644
--- a/x/concentrated-liquidity/model/pool_test.go
+++ b/x/concentrated-liquidity/model/pool_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	clmath "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	clmath "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 const (
diff --git a/x/concentrated-liquidity/model/position.pb.go b/x/concentrated-liquidity/model/position.pb.go
index d07ed6197eb..219c0cd389d 100644
--- a/x/concentrated-liquidity/model/position.pb.go
+++ b/x/concentrated-liquidity/model/position.pb.go
@@ -226,7 +226,7 @@ var fileDescriptor_ffdfd7b30d37d326 = []byte{
 	// 633 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcf, 0x6e, 0xd3, 0x30,
 	0x18, 0x6f, 0x68, 0xd7, 0xad, 0xae, 0x98, 0x50, 0xb6, 0xa1, 0xac, 0xb0, 0xa4, 0x0a, 0x02, 0x2a,
-	0x41, 0x63, 0x3a, 0x84, 0x90, 0x38, 0x06, 0x34, 0x69, 0x37, 0x88, 0xc6, 0x05, 0x21, 0x95, 0x24,
+	0x41, 0x63, 0x3a, 0x24, 0x90, 0x38, 0x06, 0x34, 0x69, 0x37, 0x88, 0xc6, 0x05, 0x21, 0x95, 0x24,
 	0x76, 0x8b, 0x69, 0x52, 0x67, 0xb1, 0xbb, 0xb1, 0xb7, 0xd8, 0x85, 0x97, 0xe0, 0x49, 0x76, 0xdc,
 	0x11, 0x71, 0xe8, 0xd0, 0xf6, 0x06, 0xbd, 0x71, 0x43, 0x76, 0x1c, 0xb7, 0x4c, 0xfc, 0x19, 0x07,
 	0x4e, 0xcb, 0xf7, 0x7d, 0xbf, 0x3f, 0xf6, 0xf7, 0xf3, 0x0a, 0xba, 0x94, 0xa5, 0x94, 0x11, 0x06,
@@ -263,7 +263,7 @@ var fileDescriptor_ffdfd7b30d37d326 = []byte{
 	0x9d, 0xdb, 0xc6, 0xf1, 0x85, 0x5d, 0x39, 0xbd, 0xb0, 0x2b, 0x5f, 0x2e, 0xec, 0xca, 0x1b, 0x7f,
 	0x21, 0x11, 0xf5, 0xe6, 0xba, 0x49, 0x18, 0xb1, 0xb2, 0x80, 0x07, 0xbd, 0x27, 0xf0, 0xe3, 0xef,
 	0x7e, 0x33, 0x53, 0x8a, 0x70, 0x12, 0xd5, 0xe5, 0xff, 0xdd, 0xe3, 0x1f, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x51, 0x05, 0x8d, 0xd7, 0x62, 0x05, 0x00, 0x00,
+	0xff, 0xd9, 0xb5, 0x31, 0xfd, 0x62, 0x05, 0x00, 0x00,
 }
 
 func (m *Position) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/model/tickInfo.pb.go b/x/concentrated-liquidity/model/tickInfo.pb.go
index 7230c068418..7fb8de44845 100644
--- a/x/concentrated-liquidity/model/tickInfo.pb.go
+++ b/x/concentrated-liquidity/model/tickInfo.pb.go
@@ -206,37 +206,37 @@ var fileDescriptor_1ccb7e45032b943a = []byte{
 	// 530 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x41, 0x8b, 0xd3, 0x40,
 	0x14, 0xc7, 0x3b, 0xee, 0x22, 0x3a, 0x75, 0xbb, 0x90, 0x5d, 0x25, 0x2e, 0x92, 0x96, 0x80, 0x52,
-	0x90, 0x26, 0xb4, 0xeb, 0x1e, 0xf4, 0x18, 0x17, 0x57, 0x41, 0x5c, 0x08, 0xf5, 0x22, 0x4a, 0x98,
-	0x24, 0xd3, 0xee, 0xd0, 0x24, 0x93, 0x9d, 0x79, 0xe9, 0xda, 0x8b, 0x37, 0xef, 0xde, 0xfc, 0x0e,
-	0xde, 0xfd, 0x0e, 0x3d, 0xee, 0x51, 0x3c, 0x54, 0x69, 0xbf, 0x81, 0x9f, 0x40, 0x92, 0x4c, 0xba,
-	0xdb, 0x82, 0xb0, 0x0a, 0x9e, 0x92, 0x79, 0xf9, 0xbf, 0xff, 0xff, 0xc7, 0x7b, 0x49, 0x70, 0x87,
-	0xcb, 0x98, 0x4b, 0x26, 0xed, 0x80, 0x27, 0x01, 0x4d, 0x40, 0x10, 0xa0, 0x61, 0x27, 0x62, 0xa7,
-	0x19, 0x0b, 0x19, 0x4c, 0x6c, 0x60, 0xc1, 0xe8, 0x45, 0x32, 0xe0, 0x56, 0x2a, 0x38, 0x70, 0xed,
-	0xbe, 0x92, 0x5b, 0x97, 0xe5, 0x4b, 0xb5, 0x35, 0xee, 0xfa, 0x14, 0x48, 0x77, 0xef, 0x6e, 0x50,
-	0xe8, 0xbc, 0xa2, 0xc9, 0x2e, 0x0f, 0xa5, 0xc3, 0xde, 0xee, 0x90, 0x0f, 0x79, 0x59, 0xcf, 0xef,
-	0x54, 0xd5, 0x28, 0x35, 0xb6, 0x4f, 0x24, 0xb5, 0x95, 0x8b, 0x1d, 0x70, 0x96, 0x94, 0xcf, 0xcd,
-	0xaf, 0x9b, 0xf8, 0x46, 0x5f, 0xa1, 0x68, 0xa7, 0x78, 0x7b, 0x19, 0xe9, 0x0d, 0x05, 0x97, 0x52,
-	0x47, 0x2d, 0xd4, 0xbe, 0xe9, 0x3c, 0x9f, 0xce, 0x9a, 0xb5, 0xef, 0xb3, 0xe6, 0x83, 0x21, 0x83,
-	0x93, 0xcc, 0xb7, 0x02, 0x1e, 0xab, 0x70, 0x75, 0xe9, 0xc8, 0x70, 0x64, 0xc3, 0x24, 0xa5, 0xd2,
-	0x3a, 0xa4, 0xc1, 0xaf, 0x59, 0xf3, 0xce, 0x84, 0xc4, 0xd1, 0x13, 0x73, 0xcd, 0xce, 0x74, 0x1b,
-	0xcb, 0xca, 0x51, 0x5e, 0xd0, 0x46, 0x78, 0xeb, 0x42, 0x93, 0x50, 0xd0, 0xaf, 0x15, 0x81, 0xcf,
-	0xfe, 0x3a, 0x70, 0x77, 0x3d, 0x30, 0xa1, 0x60, 0xba, 0xb7, 0x96, 0xe7, 0x57, 0x14, 0xb4, 0x29,
-	0xc2, 0x8f, 0x65, 0x2a, 0x28, 0x09, 0x3d, 0x41, 0xcf, 0x88, 0x08, 0x73, 0xaa, 0x33, 0x38, 0xf1,
-	0x78, 0x9a, 0x72, 0xc9, 0x80, 0x7a, 0x21, 0x13, 0x34, 0x00, 0xc6, 0x13, 0x8f, 0x0f, 0xbc, 0x88,
-	0x48, 0xf0, 0x40, 0x90, 0x31, 0x15, 0x92, 0x44, 0xfa, 0x46, 0x6b, 0xa3, 0x5d, 0xef, 0xdd, 0xb3,
-	0xd4, 0xd4, 0xf3, 0x89, 0x56, 0x7b, 0xc9, 0x19, 0x9e, 0x72, 0x96, 0x38, 0xfb, 0x39, 0xf7, 0x97,
-	0x1f, 0xcd, 0x87, 0x57, 0xe3, 0xce, 0x7b, 0xa4, 0xdb, 0x2b, 0x99, 0xdc, 0x02, 0xe9, 0xa8, 0x20,
-	0x3a, 0x56, 0x40, 0x87, 0x15, 0xcf, 0xf1, 0xe0, 0x25, 0x91, 0xd0, 0xaf, 0x60, 0xb4, 0x0f, 0x78,
-	0x3b, 0x4b, 0x81, 0xc5, 0x34, 0x07, 0x0c, 0x46, 0x54, 0x48, 0x7d, 0xb3, 0x85, 0xda, 0xf5, 0xde,
-	0x81, 0x75, 0xa5, 0x37, 0xc9, 0x7a, 0x5d, 0x74, 0xf7, 0x55, 0xb3, 0x63, 0xe4, 0xe0, 0x17, 0x7b,
-	0x5b, 0xf3, 0x36, 0xdd, 0x46, 0xb6, 0xa2, 0x37, 0x39, 0x6e, 0xac, 0x3a, 0x68, 0xef, 0xf0, 0x66,
-	0xc4, 0x24, 0xe8, 0xa8, 0x18, 0xd3, 0xa3, 0x7f, 0xc1, 0x70, 0x76, 0x14, 0x45, 0xbd, 0x5a, 0xa6,
-	0x04, 0xd3, 0x2d, 0x6c, 0xcd, 0xcf, 0x08, 0x6f, 0xad, 0x88, 0xb5, 0x8f, 0x08, 0xdf, 0x56, 0x9c,
-	0xd5, 0x1a, 0x33, 0x90, 0x2c, 0xa4, 0x0a, 0xe1, 0x3f, 0x6c, 0x6a, 0xa7, 0xcc, 0x53, 0x3b, 0x2a,
-	0xd3, 0x9c, 0xb7, 0xd3, 0xb9, 0x81, 0xce, 0xe7, 0x06, 0xfa, 0x39, 0x37, 0xd0, 0xa7, 0x85, 0x51,
-	0x3b, 0x5f, 0x18, 0xb5, 0x6f, 0x0b, 0xa3, 0xf6, 0xc6, 0xb9, 0xe4, 0xad, 0xc6, 0xd1, 0x89, 0x88,
-	0x2f, 0xab, 0x83, 0x3d, 0xee, 0x1e, 0xd8, 0xef, 0xff, 0xf4, 0x87, 0x88, 0x79, 0x48, 0x23, 0xff,
-	0x7a, 0xf1, 0x9d, 0xee, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x33, 0x05, 0x30, 0xcd, 0x50, 0x04,
+	0x90, 0x26, 0xb4, 0xab, 0x82, 0x1e, 0xe3, 0xe2, 0x2a, 0x88, 0x0b, 0xa1, 0x5e, 0x44, 0x09, 0x93,
+	0x64, 0xda, 0x1d, 0x9a, 0x64, 0xb2, 0x33, 0x2f, 0x5d, 0x7b, 0xf1, 0xe6, 0xdd, 0x9b, 0xdf, 0xc1,
+	0xbb, 0xdf, 0xa1, 0xc7, 0x3d, 0x8a, 0x87, 0x2a, 0xed, 0x37, 0xf0, 0x13, 0x48, 0x92, 0x49, 0x77,
+	0x5b, 0x10, 0x56, 0xc1, 0x53, 0x32, 0x2f, 0xff, 0xf7, 0xff, 0xff, 0x78, 0x2f, 0x09, 0xee, 0x70,
+	0x19, 0x73, 0xc9, 0xa4, 0x1d, 0xf0, 0x24, 0xa0, 0x09, 0x08, 0x02, 0x34, 0xec, 0x44, 0xec, 0x24,
+	0x63, 0x21, 0x83, 0x89, 0x0d, 0x2c, 0x18, 0xbd, 0x48, 0x06, 0xdc, 0x4a, 0x05, 0x07, 0xae, 0xdd,
+	0x55, 0x72, 0xeb, 0xa2, 0x7c, 0xa9, 0xb6, 0xc6, 0x5d, 0x9f, 0x02, 0xe9, 0xee, 0xdd, 0x0e, 0x0a,
+	0x9d, 0x57, 0x34, 0xd9, 0xe5, 0xa1, 0x74, 0xd8, 0xdb, 0x1d, 0xf2, 0x21, 0x2f, 0xeb, 0xf9, 0x9d,
+	0xaa, 0x1a, 0xa5, 0xc6, 0xf6, 0x89, 0xa4, 0xb6, 0x72, 0xb1, 0x03, 0xce, 0x92, 0xf2, 0xb9, 0xf9,
+	0x75, 0x13, 0x5f, 0xeb, 0x2b, 0x14, 0xed, 0x04, 0x6f, 0x2f, 0x23, 0xbd, 0xa1, 0xe0, 0x52, 0xea,
+	0xa8, 0x85, 0xda, 0xd7, 0x9d, 0xe7, 0xd3, 0x59, 0xb3, 0xf6, 0x7d, 0xd6, 0xbc, 0x37, 0x64, 0x70,
+	0x9c, 0xf9, 0x56, 0xc0, 0x63, 0x15, 0xae, 0x2e, 0x1d, 0x19, 0x8e, 0x6c, 0x98, 0xa4, 0x54, 0x5a,
+	0x07, 0x34, 0xf8, 0x35, 0x6b, 0xde, 0x9a, 0x90, 0x38, 0x7a, 0x62, 0xae, 0xd9, 0x99, 0x6e, 0x63,
+	0x59, 0x39, 0xcc, 0x0b, 0xda, 0x08, 0x6f, 0x9d, 0x6b, 0x12, 0x0a, 0xfa, 0x95, 0x22, 0xf0, 0xd9,
+	0x5f, 0x07, 0xee, 0xae, 0x07, 0x26, 0x14, 0x4c, 0xf7, 0xc6, 0xf2, 0xfc, 0x8a, 0x82, 0x36, 0x45,
+	0xf8, 0xb1, 0x4c, 0x05, 0x25, 0xa1, 0x27, 0xe8, 0x29, 0x11, 0x61, 0x4e, 0x75, 0x0a, 0xc7, 0x1e,
+	0x4f, 0x53, 0x2e, 0x19, 0x50, 0x2f, 0x64, 0x82, 0x06, 0xc0, 0x78, 0xe2, 0xf1, 0x81, 0x17, 0x11,
+	0x09, 0x1e, 0x08, 0x32, 0xa6, 0x42, 0x92, 0x48, 0xdf, 0x68, 0x6d, 0xb4, 0xeb, 0xbd, 0x3b, 0x96,
+	0x9a, 0x7a, 0x3e, 0xd1, 0x6a, 0x2f, 0x39, 0xc3, 0x53, 0xce, 0x12, 0x67, 0x3f, 0xe7, 0xfe, 0xf2,
+	0xa3, 0x79, 0xff, 0x72, 0xdc, 0x79, 0x8f, 0x74, 0x7b, 0x25, 0x93, 0x5b, 0x20, 0x1d, 0x16, 0x44,
+	0x47, 0x0a, 0xe8, 0xa0, 0xe2, 0x39, 0x1a, 0xbc, 0x24, 0x12, 0xfa, 0x15, 0x8c, 0xf6, 0x01, 0x6f,
+	0x67, 0x29, 0xb0, 0x98, 0xe6, 0x80, 0xc1, 0x88, 0x0a, 0xa9, 0x6f, 0xb6, 0x50, 0xbb, 0xde, 0x7b,
+	0x68, 0x5d, 0xea, 0x4d, 0xb2, 0x5e, 0x17, 0xdd, 0x7d, 0xd5, 0xec, 0x18, 0x39, 0xf8, 0xf9, 0xde,
+	0xd6, 0xbc, 0x4d, 0xb7, 0x91, 0xad, 0xe8, 0x4d, 0x8e, 0x1b, 0xab, 0x0e, 0xda, 0x3b, 0xbc, 0x19,
+	0x31, 0x09, 0x3a, 0x2a, 0xc6, 0xf4, 0xe0, 0x5f, 0x30, 0x9c, 0x1d, 0x45, 0x51, 0xaf, 0x96, 0x29,
+	0xc1, 0x74, 0x0b, 0x5b, 0xf3, 0x33, 0xc2, 0x5b, 0x2b, 0x62, 0xed, 0x23, 0xc2, 0x37, 0x15, 0x67,
+	0xb5, 0xc6, 0x0c, 0x24, 0x0b, 0xa9, 0x42, 0xf8, 0x0f, 0x9b, 0xda, 0x29, 0xf3, 0xd4, 0x8e, 0xca,
+	0x34, 0xe7, 0xed, 0x74, 0x6e, 0xa0, 0xb3, 0xb9, 0x81, 0x7e, 0xce, 0x0d, 0xf4, 0x69, 0x61, 0xd4,
+	0xce, 0x16, 0x46, 0xed, 0xdb, 0xc2, 0xa8, 0xbd, 0x71, 0x2e, 0x78, 0xab, 0x71, 0x74, 0x22, 0xe2,
+	0xcb, 0xea, 0x60, 0x8f, 0xbb, 0x8f, 0xec, 0xf7, 0x7f, 0xfa, 0x43, 0xc4, 0x3c, 0xa4, 0x91, 0x7f,
+	0xb5, 0xf8, 0x4e, 0xf7, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xb5, 0x8c, 0xe7, 0x50, 0x04,
 	0x00, 0x00,
 }
 
diff --git a/x/concentrated-liquidity/model/tx.pb.go b/x/concentrated-liquidity/model/tx.pb.go
index 2a20e829cde..ae763ed39bf 100644
--- a/x/concentrated-liquidity/model/tx.pb.go
+++ b/x/concentrated-liquidity/model/tx.pb.go
@@ -155,36 +155,36 @@ func init() {
 }
 
 var fileDescriptor_6c324e8c9dd2851d = []byte{
-	// 449 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x6e, 0xd4, 0x30,
-	0x14, 0x86, 0xc7, 0x65, 0x18, 0x84, 0x69, 0x17, 0x84, 0x0a, 0xc2, 0x2c, 0x92, 0x12, 0x04, 0x2a,
-	0x8b, 0x89, 0x49, 0x11, 0x9b, 0xae, 0x50, 0x5a, 0x55, 0xed, 0x02, 0x09, 0x85, 0x1d, 0x42, 0x1a,
-	0x39, 0xb6, 0x09, 0xd6, 0x24, 0x79, 0x21, 0x76, 0xab, 0xce, 0x2d, 0x38, 0x04, 0x37, 0xe0, 0x0c,
-	0x48, 0x5d, 0x76, 0x89, 0x58, 0x44, 0x68, 0xe6, 0x06, 0x73, 0x02, 0x94, 0x38, 0x33, 0x8a, 0x10,
-	0x91, 0x90, 0xba, 0x4a, 0x7e, 0xbf, 0xef, 0x7f, 0xcf, 0x7e, 0xf6, 0xc3, 0x07, 0xa0, 0x32, 0x50,
-	0x52, 0x11, 0x06, 0x39, 0x13, 0xb9, 0x2e, 0xa9, 0x16, 0x7c, 0x92, 0xca, 0x2f, 0xe7, 0x92, 0x4b,
-	0x3d, 0x27, 0x05, 0x40, 0x3a, 0xc9, 0x80, 0x8b, 0x94, 0xe8, 0x4b, 0xbf, 0x28, 0x41, 0x83, 0xf5,
-	0xac, 0xf5, 0xf8, 0x5d, 0xcf, 0xc6, 0xe2, 0x5f, 0x04, 0xb1, 0xd0, 0x34, 0x18, 0xef, 0x26, 0x90,
-	0x40, 0xe3, 0x20, 0xf5, 0x9f, 0x31, 0x8f, 0x1d, 0xd6, 0xb8, 0x49, 0x4c, 0x95, 0x20, 0x2d, 0x4a,
-	0x18, 0xc8, 0xdc, 0xc4, 0xbd, 0x1f, 0x5b, 0xf8, 0xf1, 0x5b, 0x95, 0x1c, 0x95, 0x82, 0x6a, 0x71,
-	0xd4, 0x29, 0xf0, 0x0e, 0x20, 0xb5, 0x5e, 0xe0, 0x91, 0x12, 0x39, 0x17, 0xa5, 0x8d, 0xf6, 0xd0,
-	0xfe, 0xdd, 0xf0, 0xfe, 0xaa, 0x72, 0x77, 0xe6, 0x34, 0x4b, 0x0f, 0x3d, 0xb3, 0xee, 0x45, 0x2d,
-	0x50, 0xa3, 0x5c, 0xe4, 0x90, 0xbd, 0xb4, 0xb7, 0xfe, 0x46, 0xcd, 0xba, 0x17, 0xb5, 0xc0, 0x06,
-	0x0d, 0xec, 0x5b, 0xff, 0x44, 0x83, 0x35, 0x1a, 0x58, 0x87, 0x78, 0x5b, 0x4b, 0x36, 0x9b, 0xaa,
-	0x82, 0x32, 0x99, 0x27, 0xf6, 0x70, 0x0f, 0xed, 0x0f, 0xc3, 0x47, 0xab, 0xca, 0x7d, 0x60, 0x0c,
-	0xdd, 0xa8, 0x17, 0xdd, 0xab, 0xe5, 0x7b, 0xa3, 0xac, 0x19, 0xde, 0x51, 0x45, 0x29, 0x28, 0x9f,
-	0x7e, 0xa2, 0x4c, 0x43, 0x69, 0xdf, 0x6e, 0xaa, 0x9d, 0x5c, 0x55, 0xee, 0xe0, 0x57, 0xe5, 0x3e,
-	0x4f, 0xa4, 0xfe, 0x7c, 0x1e, 0xfb, 0x0c, 0x32, 0xd2, 0x36, 0xc9, 0x7c, 0x26, 0x8a, 0xcf, 0x88,
-	0x9e, 0x17, 0x42, 0xf9, 0xc7, 0x82, 0xad, 0x2a, 0x77, 0xb7, 0x3d, 0x71, 0x37, 0x99, 0x17, 0x6d,
-	0x1b, 0x7d, 0x62, 0xe4, 0x29, 0x7e, 0xd2, 0xdb, 0xc6, 0x48, 0xa8, 0x02, 0x72, 0x25, 0xac, 0xa7,
-	0xf8, 0x4e, 0x7d, 0xc1, 0x53, 0xc9, 0x9b, 0x7e, 0x0e, 0x43, 0xbc, 0xa8, 0xdc, 0x51, 0x8d, 0x9c,
-	0x1d, 0x47, 0xa3, 0x3a, 0x74, 0xc6, 0x0f, 0xbe, 0x23, 0x8c, 0xd7, 0xa9, 0xa0, 0xb4, 0xbe, 0x21,
-	0xfc, 0xb0, 0xe7, 0x76, 0xde, 0xf8, 0xff, 0xf5, 0x32, 0xfc, 0xde, 0x8d, 0x8d, 0x4f, 0x6f, 0x9a,
-	0x61, 0x7d, 0xb4, 0xf0, 0xe3, 0xd5, 0xc2, 0x41, 0xd7, 0x0b, 0x07, 0xfd, 0x5e, 0x38, 0xe8, 0xeb,
-	0xd2, 0x19, 0x5c, 0x2f, 0x9d, 0xc1, 0xcf, 0xa5, 0x33, 0xf8, 0x10, 0x76, 0xfa, 0xdc, 0x56, 0x9b,
-	0xa4, 0x34, 0x56, 0x6b, 0x41, 0x2e, 0x82, 0xd7, 0xe4, 0xb2, 0x6f, 0x20, 0x9a, 0x59, 0x88, 0x47,
-	0xcd, 0x63, 0x7d, 0xf5, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x14, 0x6f, 0xc1, 0x3f, 0x03, 0x00,
-	0x00,
+	// 450 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xc1, 0x6a, 0xd4, 0x40,
+	0x18, 0xc7, 0x77, 0xea, 0xba, 0xe2, 0xd8, 0x1e, 0x8c, 0x45, 0xe3, 0x1e, 0x92, 0x1a, 0x51, 0xea,
+	0x61, 0x33, 0xa6, 0x82, 0x87, 0x9e, 0x24, 0x2d, 0xa5, 0x3d, 0x08, 0x12, 0x6f, 0x22, 0x2c, 0x93,
+	0x99, 0x31, 0x0e, 0x9b, 0xe4, 0x8b, 0x99, 0x69, 0xe9, 0xbe, 0x85, 0x0f, 0xe1, 0x1b, 0xf8, 0x0c,
+	0x42, 0x8f, 0x3d, 0x8a, 0x87, 0x20, 0xbb, 0x6f, 0xb0, 0x4f, 0x20, 0xc9, 0x64, 0x97, 0x20, 0x06,
+	0x84, 0x9e, 0x92, 0xff, 0x7c, 0xbf, 0xff, 0xf7, 0xcd, 0x7c, 0x33, 0x1f, 0x3e, 0x00, 0x95, 0x81,
+	0x92, 0x8a, 0x30, 0xc8, 0x99, 0xc8, 0x75, 0x49, 0xb5, 0xe0, 0x93, 0x54, 0x7e, 0x39, 0x97, 0x5c,
+	0xea, 0x39, 0x29, 0x00, 0xd2, 0x49, 0x06, 0x5c, 0xa4, 0x44, 0x5f, 0xfa, 0x45, 0x09, 0x1a, 0xac,
+	0x67, 0xad, 0xc7, 0xef, 0x7a, 0x36, 0x16, 0xff, 0x22, 0x88, 0x85, 0xa6, 0xc1, 0x78, 0x37, 0x81,
+	0x04, 0x1a, 0x07, 0xa9, 0xff, 0x8c, 0x79, 0xec, 0xb0, 0xc6, 0x4d, 0x62, 0xaa, 0x04, 0x69, 0x51,
+	0xc2, 0x40, 0xe6, 0x26, 0xee, 0xfd, 0xd8, 0xc2, 0x8f, 0xdf, 0xaa, 0xe4, 0xa8, 0x14, 0x54, 0x8b,
+	0xa3, 0x4e, 0x81, 0x77, 0x00, 0xa9, 0xf5, 0x02, 0x8f, 0x94, 0xc8, 0xb9, 0x28, 0x6d, 0xb4, 0x87,
+	0xf6, 0xef, 0x86, 0xf7, 0x57, 0x95, 0xbb, 0x33, 0xa7, 0x59, 0x7a, 0xe8, 0x99, 0x75, 0x2f, 0x6a,
+	0x81, 0x1a, 0xe5, 0x22, 0x87, 0xec, 0xa5, 0xbd, 0xf5, 0x37, 0x6a, 0xd6, 0xbd, 0xa8, 0x05, 0x36,
+	0x68, 0x60, 0xdf, 0xfa, 0x27, 0x1a, 0xac, 0xd1, 0xc0, 0x3a, 0xc4, 0xdb, 0x5a, 0xb2, 0xd9, 0x54,
+	0x15, 0x94, 0xc9, 0x3c, 0xb1, 0x87, 0x7b, 0x68, 0x7f, 0x18, 0x3e, 0x5a, 0x55, 0xee, 0x03, 0x63,
+	0xe8, 0x46, 0xbd, 0xe8, 0x5e, 0x2d, 0xdf, 0x1b, 0x65, 0xcd, 0xf0, 0x8e, 0x2a, 0x4a, 0x41, 0xf9,
+	0xf4, 0x13, 0x65, 0x1a, 0x4a, 0xfb, 0x76, 0x53, 0xed, 0xe4, 0xaa, 0x72, 0x07, 0xbf, 0x2a, 0xf7,
+	0x79, 0x22, 0xf5, 0xe7, 0xf3, 0xd8, 0x67, 0x90, 0x91, 0xb6, 0x49, 0xe6, 0x33, 0x51, 0x7c, 0x46,
+	0xf4, 0xbc, 0x10, 0xca, 0x3f, 0x16, 0x6c, 0x55, 0xb9, 0xbb, 0xed, 0x89, 0xbb, 0xc9, 0xbc, 0x68,
+	0xdb, 0xe8, 0x13, 0x23, 0x4f, 0xf1, 0x93, 0xde, 0x36, 0x46, 0x42, 0x15, 0x90, 0x2b, 0x61, 0x3d,
+	0xc5, 0x77, 0xea, 0x0b, 0x9e, 0x4a, 0xde, 0xf4, 0x73, 0x18, 0xe2, 0x45, 0xe5, 0x8e, 0x6a, 0xe4,
+	0xec, 0x38, 0x1a, 0xd5, 0xa1, 0x33, 0x7e, 0xf0, 0x1d, 0x61, 0xbc, 0x4e, 0x05, 0xa5, 0xf5, 0x0d,
+	0xe1, 0x87, 0x3d, 0xb7, 0xf3, 0xc6, 0xff, 0xaf, 0x97, 0xe1, 0xf7, 0x6e, 0x6c, 0x7c, 0x7a, 0xd3,
+	0x0c, 0xeb, 0xa3, 0x85, 0x1f, 0xaf, 0x16, 0x0e, 0xba, 0x5e, 0x38, 0xe8, 0xf7, 0xc2, 0x41, 0x5f,
+	0x97, 0xce, 0xe0, 0x7a, 0xe9, 0x0c, 0x7e, 0x2e, 0x9d, 0xc1, 0x87, 0xb0, 0xd3, 0xe7, 0xb6, 0xda,
+	0x24, 0xa5, 0xb1, 0x5a, 0x0b, 0x72, 0x11, 0xbc, 0x26, 0x97, 0x7d, 0x03, 0xd1, 0xcc, 0x42, 0x3c,
+	0x6a, 0x1e, 0xeb, 0xab, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x75, 0xa4, 0xd3, 0xeb, 0x3f, 0x03,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/concentrated-liquidity/msg_server.go b/x/concentrated-liquidity/msg_server.go
index 997d44324ec..d65501afffe 100644
--- a/x/concentrated-liquidity/msg_server.go
+++ b/x/concentrated-liquidity/msg_server.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type msgServer struct {
diff --git a/x/concentrated-liquidity/msg_server_test.go b/x/concentrated-liquidity/msg_server_test.go
index a05569482e8..24c05a5a517 100644
--- a/x/concentrated-liquidity/msg_server_test.go
+++ b/x/concentrated-liquidity/msg_server_test.go
@@ -6,10 +6,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // TestCreateConcentratedPool_Events tests that events are correctly emitted
diff --git a/x/concentrated-liquidity/pool.go b/x/concentrated-liquidity/pool.go
index 94968202476..2d2d3b7de7d 100644
--- a/x/concentrated-liquidity/pool.go
+++ b/x/concentrated-liquidity/pool.go
@@ -10,9 +10,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/query"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	types "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	types "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // InitializePool initializes a new concentrated liquidity pool with the given PoolI interface and creator address.
diff --git a/x/concentrated-liquidity/pool_test.go b/x/concentrated-liquidity/pool_test.go
index 465bec67191..792adcd8b68 100644
--- a/x/concentrated-liquidity/pool_test.go
+++ b/x/concentrated-liquidity/pool_test.go
@@ -6,10 +6,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (s *KeeperTestSuite) TestInitializePool() {
diff --git a/x/concentrated-liquidity/position.go b/x/concentrated-liquidity/position.go
index 6e72f82ffc1..a596ec185ac 100644
--- a/x/concentrated-liquidity/position.go
+++ b/x/concentrated-liquidity/position.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 const MinNumPositions = 2
diff --git a/x/concentrated-liquidity/position_test.go b/x/concentrated-liquidity/position_test.go
index 7f712332684..1ba4087b810 100644
--- a/x/concentrated-liquidity/position_test.go
+++ b/x/concentrated-liquidity/position_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 var DefaultIncentiveRecords = []types.IncentiveRecord{incentiveRecordOne, incentiveRecordTwo, incentiveRecordThree, incentiveRecordFour}
diff --git a/x/concentrated-liquidity/simulation/sim_msgs.go b/x/concentrated-liquidity/simulation/sim_msgs.go
index fed14688f71..7d304e83798 100644
--- a/x/concentrated-liquidity/simulation/sim_msgs.go
+++ b/x/concentrated-liquidity/simulation/sim_msgs.go
@@ -8,13 +8,13 @@ import (
 	legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
-	clkeeper "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	clmodeltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
+	clkeeper "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	clmodeltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 var PoolCreationFee = sdk.NewInt64Coin("stake", 10_000_000)
diff --git a/x/concentrated-liquidity/spread_rewards.go b/x/concentrated-liquidity/spread_rewards.go
index 62a2a1d7d1a..0567c9fb6d4 100644
--- a/x/concentrated-liquidity/spread_rewards.go
+++ b/x/concentrated-liquidity/spread_rewards.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 var emptyCoins = sdk.DecCoins(nil)
diff --git a/x/concentrated-liquidity/spread_rewards_test.go b/x/concentrated-liquidity/spread_rewards_test.go
index 0daa1e7dd1e..1d6373cd2f3 100644
--- a/x/concentrated-liquidity/spread_rewards_test.go
+++ b/x/concentrated-liquidity/spread_rewards_test.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 const (
diff --git a/x/concentrated-liquidity/store.go b/x/concentrated-liquidity/store.go
index 1e057bffa90..90982294f46 100644
--- a/x/concentrated-liquidity/store.go
+++ b/x/concentrated-liquidity/store.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gogo/protobuf/proto"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 const (
diff --git a/x/concentrated-liquidity/store_test.go b/x/concentrated-liquidity/store_test.go
index 1ff6d05ec55..9362cb5067c 100644
--- a/x/concentrated-liquidity/store_test.go
+++ b/x/concentrated-liquidity/store_test.go
@@ -6,10 +6,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 const (
diff --git a/x/concentrated-liquidity/swaps.go b/x/concentrated-liquidity/swaps.go
index 1dd03887d32..0c6bc728d9a 100644
--- a/x/concentrated-liquidity/swaps.go
+++ b/x/concentrated-liquidity/swaps.go
@@ -5,13 +5,13 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	events "github.com/osmosis-labs/osmosis/v15/x/poolmanager/events"
+	events "github.com/osmosis-labs/osmosis/v16/x/poolmanager/events"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // SwapState defines the state of a swap.
diff --git a/x/concentrated-liquidity/swaps_test.go b/x/concentrated-liquidity/swaps_test.go
index 524a8b0f441..b8eba4caee1 100644
--- a/x/concentrated-liquidity/swaps_test.go
+++ b/x/concentrated-liquidity/swaps_test.go
@@ -7,11 +7,11 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var _ = suite.TestingSuite(nil)
diff --git a/x/concentrated-liquidity/swapstrategy/one_for_zero.go b/x/concentrated-liquidity/swapstrategy/one_for_zero.go
index bc58d8a4907..73a1c41afa8 100644
--- a/x/concentrated-liquidity/swapstrategy/one_for_zero.go
+++ b/x/concentrated-liquidity/swapstrategy/one_for_zero.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // oneForZeroStrategy implements the swapStrategy interface.
diff --git a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
index bc4e5ef4fc7..acf8b2bcf9d 100644
--- a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
+++ b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go
@@ -3,9 +3,9 @@ package swapstrategy_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func (suite *StrategyTestSuite) setupNewOneForZeroSwapStrategy(sqrtPriceLimit sdk.Dec, spread sdk.Dec) swapstrategy.SwapStrategy {
diff --git a/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go b/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go
index 4a4b1815a6d..98899d0517e 100644
--- a/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go
+++ b/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
 )
 
 var onePercentSpreadFactor = sdk.NewDecWithPrec(1, 2)
diff --git a/x/concentrated-liquidity/swapstrategy/swap_strategy.go b/x/concentrated-liquidity/swapstrategy/swap_strategy.go
index 4a9eaae4a92..7f262f67242 100644
--- a/x/concentrated-liquidity/swapstrategy/swap_strategy.go
+++ b/x/concentrated-liquidity/swapstrategy/swap_strategy.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // swapStrategy defines the interface for computing a swap.
diff --git a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
index 3b17637673c..97c16d9c22f 100644
--- a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
+++ b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type StrategyTestSuite struct {
diff --git a/x/concentrated-liquidity/swapstrategy/zero_for_one.go b/x/concentrated-liquidity/swapstrategy/zero_for_one.go
index 3142f0c0f17..a5bbf9d6c14 100644
--- a/x/concentrated-liquidity/swapstrategy/zero_for_one.go
+++ b/x/concentrated-liquidity/swapstrategy/zero_for_one.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	dbm "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // zeroForOneStrategy implements the swapStrategy interface.
diff --git a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
index 48974bf7e4b..8abdbf82442 100644
--- a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
+++ b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go
@@ -3,8 +3,8 @@ package swapstrategy_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func (suite *StrategyTestSuite) setupNewZeroForOneSwapStrategy(sqrtPriceLimit sdk.Dec, spread sdk.Dec) swapstrategy.SwapStrategy {
diff --git a/x/concentrated-liquidity/tick.go b/x/concentrated-liquidity/tick.go
index 170ba9bdf04..2704d90e395 100644
--- a/x/concentrated-liquidity/tick.go
+++ b/x/concentrated-liquidity/tick.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/swapstrategy"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/swapstrategy"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 // initOrUpdateTick retrieves the tickInfo from the specified tickIndex and updates both the liquidityNet and LiquidityGross.
diff --git a/x/concentrated-liquidity/tick_test.go b/x/concentrated-liquidity/tick_test.go
index af8d0b6aa34..6713ae484b1 100644
--- a/x/concentrated-liquidity/tick_test.go
+++ b/x/concentrated-liquidity/tick_test.go
@@ -8,12 +8,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/math"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types/genesis"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/math"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types/genesis"
 )
 
 const validPoolId = 1
diff --git a/x/concentrated-liquidity/types/cl_pool_extensionI.go b/x/concentrated-liquidity/types/cl_pool_extensionI.go
index 726cebbb958..649bb03a667 100644
--- a/x/concentrated-liquidity/types/cl_pool_extensionI.go
+++ b/x/concentrated-liquidity/types/cl_pool_extensionI.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type ConcentratedPoolExtension interface {
diff --git a/x/concentrated-liquidity/types/cl_test.go b/x/concentrated-liquidity/types/cl_test.go
index 855cee672a4..f582ea9f3a0 100644
--- a/x/concentrated-liquidity/types/cl_test.go
+++ b/x/concentrated-liquidity/types/cl_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func TestGetConcentratedLockupDenomFromPoolId(t *testing.T) {
diff --git a/x/concentrated-liquidity/types/expected_keepers.go b/x/concentrated-liquidity/types/expected_keepers.go
index b66b63540d1..4398d2b1e9f 100644
--- a/x/concentrated-liquidity/types/expected_keepers.go
+++ b/x/concentrated-liquidity/types/expected_keepers.go
@@ -7,8 +7,8 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type AccountKeeper interface {
diff --git a/x/concentrated-liquidity/types/genesis/genesis.go b/x/concentrated-liquidity/types/genesis/genesis.go
index 383577747dd..db546065a89 100644
--- a/x/concentrated-liquidity/types/genesis/genesis.go
+++ b/x/concentrated-liquidity/types/genesis/genesis.go
@@ -3,7 +3,7 @@ package genesis
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // DefaultGenesis returns the default GenesisState for the concentrated-liquidity module.
diff --git a/x/concentrated-liquidity/types/genesis/genesis.pb.go b/x/concentrated-liquidity/types/genesis/genesis.pb.go
index 2fd62f38fa9..ed981cff683 100644
--- a/x/concentrated-liquidity/types/genesis/genesis.pb.go
+++ b/x/concentrated-liquidity/types/genesis/genesis.pb.go
@@ -11,8 +11,8 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	accum "github.com/osmosis-labs/osmosis/osmoutils/accum"
-	model "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	model "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -375,7 +375,7 @@ var fileDescriptor_5c140d686ee6724a = []byte{
 	// 814 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcb, 0x6e, 0xf3, 0x44,
 	0x14, 0x8e, 0x1b, 0x37, 0x24, 0x93, 0xb4, 0xb4, 0x56, 0xa1, 0x6e, 0x51, 0x93, 0x60, 0x54, 0x29,
-	0xa8, 0xc4, 0x56, 0x53, 0xca, 0x82, 0x5d, 0x5d, 0x2e, 0x0a, 0x48, 0x50, 0x0d, 0x5d, 0x81, 0x20,
+	0xa8, 0xc4, 0x56, 0x53, 0xe8, 0x82, 0x5d, 0x5d, 0x2e, 0x0a, 0x48, 0x50, 0x0d, 0x5d, 0x81, 0x20,
 	0x4c, 0xec, 0x49, 0x18, 0xea, 0x78, 0x82, 0x67, 0x52, 0x92, 0x2d, 0x4f, 0x80, 0x58, 0xf1, 0x20,
 	0x48, 0xbc, 0x42, 0x85, 0x10, 0xea, 0x92, 0x55, 0x84, 0xda, 0x1d, 0xcb, 0x3c, 0xc1, 0x2f, 0xcf,
 	0x25, 0x97, 0xfe, 0xad, 0x92, 0xfe, 0x3b, 0xcf, 0x9c, 0xf3, 0x7d, 0xe7, 0x3b, 0xb7, 0x31, 0x78,
@@ -387,24 +387,24 @@ var fileDescriptor_5c140d686ee6724a = []byte{
 	0x97, 0xd2, 0x6e, 0x84, 0x3d, 0x71, 0x6a, 0x0f, 0x3a, 0x1e, 0x8a, 0x47, 0xca, 0xf4, 0xb6, 0x4e,
 	0x00, 0x05, 0xc1, 0xa0, 0x37, 0x05, 0x8b, 0x93, 0x72, 0x39, 0x5a, 0x92, 0x63, 0x1f, 0x25, 0xa8,
 	0xa7, 0xa5, 0xd4, 0x97, 0x39, 0x53, 0x46, 0x38, 0xa1, 0xf1, 0x8a, 0xee, 0x9c, 0x04, 0x57, 0xcd,
-	0xb8, 0xa3, 0x6b, 0x70, 0xba, 0xc4, 0x9d, 0x88, 0x5b, 0x72, 0x8d, 0x5b, 0x09, 0x0e, 0x68, 0x12,
-	0x4a, 0x98, 0xf3, 0xb7, 0x01, 0xf2, 0x9f, 0x0c, 0xa2, 0xe8, 0x92, 0x04, 0x57, 0xd6, 0x11, 0x78,
-	0xad, 0x4f, 0x69, 0xd4, 0x22, 0xa1, 0x6d, 0x54, 0x8d, 0x9a, 0xe9, 0x5b, 0x93, 0x71, 0x65, 0x73,
-	0x84, 0x7a, 0xd1, 0x87, 0x8e, 0x32, 0x38, 0x30, 0x97, 0x7e, 0x35, 0x43, 0xeb, 0x7d, 0x00, 0x52,
-	0x09, 0x2d, 0x12, 0x87, 0x78, 0x68, 0xaf, 0x55, 0x8d, 0x5a, 0xd6, 0x7f, 0x63, 0x32, 0xae, 0x6c,
-	0x4b, 0xff, 0x99, 0xcd, 0x81, 0x05, 0xa9, 0x35, 0xc4, 0x43, 0xeb, 0x5b, 0x60, 0x92, 0xb8, 0x43,
-	0xed, 0x6c, 0xd5, 0xa8, 0x15, 0x1b, 0x9e, 0xbb, 0x52, 0xdb, 0xdd, 0x4b, 0x95, 0xab, 0x6f, 0xdf,
-	0x8c, 0x2b, 0x99, 0xc9, 0xb8, 0xb2, 0xb5, 0x10, 0xa4, 0x43, 0x1d, 0x28, 0x68, 0x9d, 0x3f, 0x4d,
-	0x90, 0xbf, 0xa0, 0x34, 0xfa, 0x08, 0x71, 0x64, 0x9d, 0x00, 0x33, 0xd5, 0x2a, 0x72, 0x29, 0x36,
-	0x76, 0x5c, 0xd9, 0x6a, 0x57, 0xb7, 0xda, 0x3d, 0x8b, 0x47, 0x7e, 0xe1, 0xaf, 0x3f, 0xea, 0xeb,
-	0x29, 0xa2, 0x09, 0x85, 0xb3, 0xf5, 0x0d, 0x58, 0x4f, 0x59, 0x99, 0xbd, 0x56, 0xcd, 0x3e, 0x43,
-	0xa1, 0xae, 0xa1, 0xbf, 0xa3, 0x14, 0x96, 0x66, 0x0a, 0x99, 0x03, 0x25, 0xa7, 0xf5, 0xbb, 0x01,
-	0xf6, 0x58, 0x3f, 0xc1, 0x28, 0x6c, 0x25, 0xf8, 0x67, 0x94, 0x84, 0x2d, 0x31, 0x4d, 0x83, 0x08,
-	0x71, 0x9a, 0xa8, 0x9a, 0x34, 0x56, 0x8c, 0x78, 0x96, 0x22, 0xbf, 0x6c, 0xff, 0x88, 0x03, 0xee,
-	0xd7, 0x54, 0xd0, 0xaa, 0x0c, 0xfa, 0x64, 0x08, 0x07, 0xee, 0x4a, 0x1b, 0x14, 0xa6, 0xb3, 0x99,
-	0xc5, 0xfa, 0xcd, 0x00, 0xbb, 0xd3, 0x19, 0x61, 0xf3, 0x20, 0x66, 0x9b, 0xa2, 0x14, 0xaf, 0x22,
-	0xec, 0x50, 0x09, 0x3b, 0x90, 0xc2, 0x1e, 0x0f, 0xe0, 0xc0, 0x37, 0x67, 0x86, 0x39, 0x4d, 0xcc,
-	0x22, 0x60, 0xfb, 0xe1, 0xdc, 0x32, 0x7b, 0x5d, 0xa8, 0xf9, 0x60, 0x45, 0x35, 0x4d, 0x8d, 0x87,
+	0xb8, 0xa3, 0x6b, 0xf0, 0xc1, 0x12, 0x77, 0x22, 0x6e, 0xc9, 0x35, 0x6e, 0x25, 0x38, 0xa0, 0x49,
+	0x28, 0x61, 0xce, 0xdf, 0x06, 0xc8, 0x7f, 0x32, 0x88, 0xa2, 0x4b, 0x12, 0x5c, 0x59, 0x47, 0xe0,
+	0xb5, 0x3e, 0xa5, 0x51, 0x8b, 0x84, 0xb6, 0x51, 0x35, 0x6a, 0xa6, 0x6f, 0x4d, 0xc6, 0x95, 0xcd,
+	0x11, 0xea, 0x45, 0x1f, 0x3a, 0xca, 0xe0, 0xc0, 0x5c, 0xfa, 0xd5, 0x0c, 0xad, 0xf7, 0x01, 0x48,
+	0x25, 0xb4, 0x48, 0x1c, 0xe2, 0xa1, 0xbd, 0x56, 0x35, 0x6a, 0x59, 0xff, 0x8d, 0xc9, 0xb8, 0xb2,
+	0x2d, 0xfd, 0x67, 0x36, 0x07, 0x16, 0xa4, 0xd6, 0x10, 0x0f, 0xad, 0x6f, 0x81, 0x49, 0xe2, 0x0e,
+	0xb5, 0xb3, 0x55, 0xa3, 0x56, 0x6c, 0x78, 0xee, 0x4a, 0x6d, 0x77, 0x2f, 0x55, 0xae, 0xbe, 0x7d,
+	0x33, 0xae, 0x64, 0x26, 0xe3, 0xca, 0xd6, 0x42, 0x90, 0x0e, 0x75, 0xa0, 0xa0, 0x75, 0xfe, 0x34,
+	0x41, 0xfe, 0x82, 0xd2, 0xe8, 0x23, 0xc4, 0x91, 0x75, 0x02, 0xcc, 0x54, 0xab, 0xc8, 0xa5, 0xd8,
+	0xd8, 0x71, 0x65, 0xab, 0x5d, 0xdd, 0x6a, 0xf7, 0x2c, 0x1e, 0xf9, 0x85, 0xbf, 0xfe, 0xa8, 0xaf,
+	0xa7, 0x88, 0x26, 0x14, 0xce, 0xd6, 0x37, 0x60, 0x3d, 0x65, 0x65, 0xf6, 0x5a, 0x35, 0xfb, 0x0c,
+	0x85, 0xba, 0x86, 0xfe, 0x8e, 0x52, 0x58, 0x9a, 0x29, 0x64, 0x0e, 0x94, 0x9c, 0xd6, 0xef, 0x06,
+	0xd8, 0x63, 0xfd, 0x04, 0xa3, 0xb0, 0x95, 0xe0, 0x9f, 0x51, 0x12, 0xb6, 0xc4, 0x34, 0x0d, 0x22,
+	0xc4, 0x69, 0xa2, 0x6a, 0xd2, 0x58, 0x31, 0xe2, 0x59, 0x8a, 0xfc, 0xb2, 0xfd, 0x23, 0x0e, 0xb8,
+	0x5f, 0x53, 0x41, 0xab, 0x32, 0xe8, 0x93, 0x21, 0x1c, 0xb8, 0x2b, 0x6d, 0x50, 0x98, 0xce, 0x66,
+	0x16, 0xeb, 0x37, 0x03, 0xec, 0x4e, 0x67, 0x84, 0xcd, 0x83, 0x98, 0x6d, 0x8a, 0x52, 0xbc, 0x8a,
+	0xb0, 0x43, 0x25, 0xec, 0x40, 0x0a, 0x7b, 0x3c, 0x80, 0x03, 0xdf, 0x9c, 0x19, 0xe6, 0x34, 0x31,
+	0x8b, 0x80, 0xed, 0x87, 0x73, 0xcb, 0xec, 0x75, 0xa1, 0xe6, 0x74, 0x45, 0x35, 0x4d, 0x8d, 0x87,
 	0x02, 0xee, 0x9b, 0xa9, 0x22, 0xb8, 0x45, 0x16, 0xaf, 0x99, 0xf3, 0xbf, 0x01, 0x4a, 0x17, 0x6a,
 	0x03, 0xc5, 0xf4, 0x7c, 0x0e, 0xf2, 0x7a, 0x23, 0xd5, 0x04, 0xad, 0x3a, 0x0b, 0x9a, 0x06, 0x4e,
 	0x09, 0xd2, 0xcd, 0x8a, 0x68, 0x3a, 0xab, 0xa1, 0xd8, 0x94, 0x85, 0xcd, 0x52, 0x06, 0x07, 0xe6,
@@ -423,7 +423,7 @@ var fileDescriptor_5c140d686ee6724a = []byte{
 	0xf5, 0xbe, 0x9c, 0xb9, 0xbd, 0x2f, 0x67, 0xfe, 0xbd, 0x2f, 0x67, 0xbe, 0xfe, 0xac, 0x4b, 0xf8,
 	0x0f, 0x83, 0xb6, 0x1b, 0xd0, 0x9e, 0xa7, 0xc8, 0xeb, 0x11, 0x6a, 0x33, 0x7d, 0xf0, 0xae, 0x8f,
 	0x4f, 0xbd, 0xe1, 0x93, 0x7f, 0x9a, 0x51, 0x1f, 0x33, 0xfd, 0xbf, 0x6e, 0xe7, 0xc4, 0xfb, 0x79,
-	0xf2, 0x22, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x35, 0x2e, 0x7a, 0xe0, 0x07, 0x00, 0x00,
+	0xf2, 0x22, 0x00, 0x00, 0xff, 0xff, 0x95, 0x00, 0xfc, 0x3c, 0xe0, 0x07, 0x00, 0x00,
 }
 
 func (m *FullTick) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/gov.pb.go b/x/concentrated-liquidity/types/gov.pb.go
index 24ee2b9be5b..85d27755728 100644
--- a/x/concentrated-liquidity/types/gov.pb.go
+++ b/x/concentrated-liquidity/types/gov.pb.go
@@ -237,44 +237,44 @@ func init() {
 }
 
 var fileDescriptor_e6d167276ceeedc2 = []byte{
-	// 583 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x31, 0x6f, 0xd3, 0x40,
-	0x14, 0xb6, 0x49, 0x1a, 0xc4, 0x25, 0x45, 0x60, 0x82, 0x1a, 0x5a, 0x64, 0x47, 0x96, 0x40, 0x61,
-	0x88, 0x8d, 0x41, 0x2c, 0x99, 0x20, 0xad, 0x2a, 0x55, 0x42, 0x10, 0x99, 0x4e, 0x08, 0xc9, 0x72,
-	0xce, 0x47, 0x38, 0xc5, 0xb9, 0x73, 0x7d, 0xd7, 0xb4, 0x19, 0xd9, 0x90, 0x58, 0x58, 0x90, 0x18,
-	0xf3, 0x73, 0x3a, 0x76, 0x44, 0x0c, 0x16, 0x4a, 0x16, 0x56, 0xf2, 0x0b, 0x90, 0xef, 0x9c, 0xc4,
-	0x29, 0x44, 0xa2, 0xea, 0x64, 0xbf, 0x77, 0xdf, 0x7b, 0xdf, 0xf7, 0xbd, 0x77, 0x3a, 0xd0, 0xa0,
-	0x6c, 0x40, 0x19, 0x66, 0x36, 0xa4, 0x04, 0x22, 0xc2, 0x63, 0x9f, 0xa3, 0xa0, 0x19, 0xe2, 0xa3,
-	0x63, 0x1c, 0x60, 0x3e, 0xb2, 0x7b, 0x74, 0x68, 0x45, 0x31, 0xe5, 0x54, 0x7b, 0x90, 0x21, 0xad,
-	0x3c, 0x72, 0x01, 0xb4, 0x86, 0x4e, 0x17, 0x71, 0xdf, 0xd9, 0xae, 0xf6, 0x68, 0x8f, 0x8a, 0x0a,
-	0x3b, 0xfd, 0x93, 0xc5, 0xe6, 0x54, 0x05, 0x8d, 0xdd, 0x18, 0xf9, 0x1c, 0xed, 0xe6, 0xaa, 0x5f,
-	0xce, 0xab, 0x3b, 0x94, 0x86, 0xac, 0x13, 0xd3, 0x88, 0x32, 0x3f, 0xd4, 0xaa, 0x60, 0x83, 0x63,
-	0x1e, 0xa2, 0x9a, 0x5a, 0x57, 0x1b, 0x37, 0x5c, 0x19, 0x68, 0x75, 0x50, 0x0e, 0x10, 0x83, 0x31,
-	0x8e, 0x38, 0xa6, 0xa4, 0x76, 0x4d, 0x9c, 0xe5, 0x53, 0xda, 0x11, 0xa8, 0x44, 0x94, 0x86, 0x5e,
-	0x8c, 0x20, 0x8d, 0x03, 0x56, 0x2b, 0xd4, 0x0b, 0x8d, 0xf2, 0x13, 0xc7, 0xfa, 0x2f, 0xe1, 0x56,
-	0xaa, 0xc1, 0x15, 0x95, 0xed, 0x9d, 0xb3, 0xc4, 0x50, 0x66, 0x89, 0x71, 0x67, 0xe4, 0x0f, 0xc2,
-	0x96, 0x99, 0x6f, 0x6a, 0xba, 0xe5, 0x68, 0x01, 0x64, 0xad, 0xca, 0xa7, 0xb1, 0xa1, 0x7c, 0x1b,
-	0x1b, 0xca, 0xaf, 0xb1, 0xa1, 0x9a, 0xbf, 0x55, 0xb0, 0x73, 0x88, 0x61, 0xff, 0x4d, 0xe4, 0x43,
-	0x4c, 0x7a, 0x7b, 0x08, 0xc6, 0xc8, 0x67, 0xe8, 0xca, 0xc6, 0x3e, 0xab, 0xc0, 0x10, 0x22, 0x70,
-	0xe0, 0x71, 0xea, 0x71, 0x0c, 0xfb, 0x1e, 0x93, 0x1c, 0x17, 0xcc, 0x3e, 0xbf, 0x84, 0xd9, 0x83,
-	0xe0, 0x90, 0xe6, 0xd4, 0x66, 0xde, 0x8b, 0xa9, 0x77, 0x77, 0x3b, 0x5a, 0x07, 0xb8, 0xe8, 0x39,
-	0x00, 0xf7, 0xd6, 0x36, 0xd3, 0xb6, 0xc0, 0xf5, 0x4c, 0xb7, 0xb0, 0x5c, 0x74, 0x4b, 0xb2, 0xaf,
-	0xd6, 0x00, 0xb7, 0x08, 0x3a, 0x59, 0x71, 0x22, 0x8c, 0x17, 0xdd, 0x9b, 0x04, 0x9d, 0xe4, 0x1a,
-	0xb5, 0x8a, 0x82, 0xe5, 0x6b, 0x01, 0x80, 0xe5, 0x82, 0xb4, 0x47, 0xa0, 0x14, 0x20, 0x42, 0x07,
-	0x8f, 0xe5, 0x24, 0xdb, 0xb7, 0x67, 0x89, 0xb1, 0x29, 0x97, 0x25, 0xf3, 0xa6, 0x9b, 0x01, 0x16,
-	0x50, 0x47, 0x0e, 0xf6, 0x2f, 0xa8, 0x33, 0x87, 0x3a, 0x5a, 0x0b, 0x54, 0x56, 0x04, 0x15, 0x52,
-	0x41, 0xed, 0xad, 0xe5, 0x45, 0xc8, 0x9f, 0x9a, 0x6e, 0x99, 0x2f, 0x65, 0x6a, 0x1f, 0x55, 0x70,
-	0x17, 0x9d, 0x46, 0x94, 0x20, 0xc2, 0x3d, 0x9f, 0x7b, 0x51, 0x8c, 0x21, 0xf2, 0x28, 0x41, 0xb5,
-	0xa2, 0xa0, 0x7d, 0x95, 0x8e, 0xf5, 0x47, 0x62, 0x3c, 0xec, 0x61, 0xfe, 0xe1, 0xb8, 0x6b, 0x41,
-	0x3a, 0xb0, 0xa1, 0xd8, 0x55, 0xf6, 0x69, 0xb2, 0xa0, 0x6f, 0xf3, 0x51, 0x84, 0x98, 0x75, 0x40,
-	0xf8, 0x2c, 0x31, 0xee, 0x4b, 0xce, 0x7f, 0x36, 0x35, 0x5d, 0x6d, 0x9e, 0x7f, 0xc1, 0x3b, 0x69,
-	0xf6, 0x35, 0x41, 0x5a, 0x1f, 0x6c, 0xb2, 0x28, 0x46, 0x7e, 0xe0, 0xbd, 0xf7, 0x21, 0xa7, 0x71,
-	0x6d, 0x43, 0x50, 0xef, 0x5f, 0x82, 0x7a, 0x0f, 0xc1, 0x59, 0x62, 0x54, 0x25, 0xf5, 0x4a, 0x33,
-	0xd3, 0xad, 0xc8, 0x78, 0x5f, 0x84, 0x72, 0x2f, 0xed, 0x77, 0x67, 0x13, 0x5d, 0x3d, 0x9f, 0xe8,
-	0xea, 0xcf, 0x89, 0xae, 0x7e, 0x99, 0xea, 0xca, 0xf9, 0x54, 0x57, 0xbe, 0x4f, 0x75, 0xe5, 0x6d,
-	0x3b, 0xc7, 0x96, 0xdd, 0xc9, 0x66, 0xe8, 0x77, 0xd9, 0x3c, 0xb0, 0x87, 0xce, 0x33, 0xfb, 0x74,
-	0xdd, 0xb3, 0x23, 0xd4, 0x74, 0x4b, 0xe2, 0xf1, 0x78, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xbd,
-	0xd4, 0x34, 0x21, 0xa5, 0x04, 0x00, 0x00,
+	// 584 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x8b, 0xd3, 0x40,
+	0x14, 0x4e, 0x6c, 0xb7, 0xe2, 0xb4, 0x2b, 0x1a, 0x2b, 0x5b, 0x77, 0x25, 0x29, 0x01, 0xa5, 0x1e,
+	0x9a, 0x18, 0x05, 0x0f, 0x3d, 0x69, 0x77, 0x59, 0x58, 0x10, 0x2d, 0x71, 0x4f, 0x22, 0x84, 0x74,
+	0x32, 0xd6, 0xa1, 0xe9, 0x4c, 0x36, 0x33, 0xdb, 0xdd, 0x1e, 0xbd, 0x09, 0x5e, 0xbc, 0x08, 0x1e,
+	0xfb, 0x73, 0xf6, 0xb8, 0x47, 0xf1, 0x10, 0xa4, 0xbd, 0x78, 0xb5, 0xbf, 0x40, 0x32, 0x93, 0xb6,
+	0xe9, 0x6a, 0xc1, 0x65, 0x4f, 0xc9, 0x7b, 0xf3, 0xbd, 0xf7, 0x7d, 0xdf, 0x7b, 0xc3, 0x80, 0x06,
+	0x65, 0x03, 0xca, 0x30, 0xb3, 0x21, 0x25, 0x10, 0x11, 0x1e, 0xfb, 0x1c, 0x05, 0xcd, 0x10, 0x1f,
+	0x1d, 0xe3, 0x00, 0xf3, 0x91, 0xdd, 0xa3, 0x43, 0x2b, 0x8a, 0x29, 0xa7, 0xda, 0x83, 0x0c, 0x69,
+	0xe5, 0x91, 0x0b, 0xa0, 0x35, 0x74, 0xba, 0x88, 0xfb, 0xce, 0x76, 0xb5, 0x47, 0x7b, 0x54, 0x54,
+	0xd8, 0xe9, 0x9f, 0x2c, 0x36, 0xa7, 0x2a, 0x68, 0xec, 0xc6, 0xc8, 0xe7, 0x68, 0x37, 0x57, 0xfd,
+	0x72, 0x5e, 0xdd, 0xa1, 0x34, 0x64, 0x9d, 0x98, 0x46, 0x94, 0xf9, 0xa1, 0x56, 0x05, 0x1b, 0x1c,
+	0xf3, 0x10, 0xd5, 0xd4, 0xba, 0xda, 0xb8, 0xe1, 0xca, 0x40, 0xab, 0x83, 0x72, 0x80, 0x18, 0x8c,
+	0x71, 0xc4, 0x31, 0x25, 0xb5, 0x6b, 0xe2, 0x2c, 0x9f, 0xd2, 0x8e, 0x40, 0x25, 0xa2, 0x34, 0xf4,
+	0x62, 0x04, 0x69, 0x1c, 0xb0, 0x5a, 0xa1, 0x5e, 0x68, 0x94, 0x9f, 0x38, 0xd6, 0x7f, 0x09, 0xb7,
+	0x52, 0x0d, 0xae, 0xa8, 0x6c, 0xef, 0x9c, 0x25, 0x86, 0x32, 0x4b, 0x8c, 0x3b, 0x23, 0x7f, 0x10,
+	0xb6, 0xcc, 0x7c, 0x53, 0xd3, 0x2d, 0x47, 0x0b, 0x20, 0x6b, 0x55, 0x3e, 0x8d, 0x0d, 0xe5, 0xdb,
+	0xd8, 0x50, 0x7e, 0x8d, 0x0d, 0xd5, 0xfc, 0xad, 0x82, 0x9d, 0x43, 0x0c, 0xfb, 0x6f, 0x22, 0x1f,
+	0x62, 0xd2, 0xdb, 0x43, 0x30, 0x46, 0x3e, 0x43, 0x57, 0x36, 0xf6, 0x59, 0x05, 0x86, 0x10, 0x81,
+	0x03, 0x8f, 0x53, 0x8f, 0x63, 0xd8, 0xf7, 0x98, 0xe4, 0xb8, 0x60, 0xf6, 0xf9, 0x25, 0xcc, 0x1e,
+	0x04, 0x87, 0x34, 0xa7, 0x36, 0xf3, 0x5e, 0x4c, 0xbd, 0xbb, 0xdb, 0xd1, 0x3a, 0xc0, 0x45, 0xcf,
+	0x01, 0xb8, 0xb7, 0xb6, 0x99, 0xb6, 0x05, 0xae, 0x67, 0xba, 0x85, 0xe5, 0xa2, 0x5b, 0x92, 0x7d,
+	0xb5, 0x06, 0xb8, 0x45, 0xd0, 0xc9, 0x8a, 0x13, 0x61, 0xbc, 0xe8, 0xde, 0x24, 0xe8, 0x24, 0xd7,
+	0xa8, 0x55, 0x14, 0x2c, 0x5f, 0x0b, 0x00, 0x2c, 0x17, 0xa4, 0x3d, 0x02, 0xa5, 0x00, 0x11, 0x3a,
+	0x78, 0x2c, 0x27, 0xd9, 0xbe, 0x3d, 0x4b, 0x8c, 0x4d, 0xb9, 0x2c, 0x99, 0x37, 0xdd, 0x0c, 0xb0,
+	0x80, 0x3a, 0x72, 0xb0, 0x7f, 0x41, 0x9d, 0x39, 0xd4, 0xd1, 0x5a, 0xa0, 0xb2, 0x22, 0xa8, 0x90,
+	0x0a, 0x6a, 0x6f, 0x2d, 0x2f, 0x42, 0xfe, 0xd4, 0x74, 0xcb, 0x7c, 0x29, 0x53, 0xfb, 0xa8, 0x82,
+	0xbb, 0xe8, 0x34, 0xa2, 0x04, 0x11, 0xee, 0xf9, 0xdc, 0x8b, 0x62, 0x0c, 0x91, 0x47, 0x09, 0xaa,
+	0x15, 0x05, 0xed, 0xab, 0x74, 0xac, 0x3f, 0x12, 0xe3, 0x61, 0x0f, 0xf3, 0x0f, 0xc7, 0x5d, 0x0b,
+	0xd2, 0x81, 0x0d, 0xc5, 0xae, 0xb2, 0x4f, 0x93, 0x05, 0x7d, 0x9b, 0x8f, 0x22, 0xc4, 0xac, 0x03,
+	0xc2, 0x67, 0x89, 0x71, 0x5f, 0x72, 0xfe, 0xb3, 0xa9, 0xe9, 0x6a, 0xf3, 0xfc, 0x0b, 0xde, 0x49,
+	0xb3, 0xaf, 0x09, 0xd2, 0xfa, 0x60, 0x93, 0x45, 0x31, 0xf2, 0x03, 0xef, 0xbd, 0x0f, 0x39, 0x8d,
+	0x6b, 0x1b, 0x82, 0x7a, 0xff, 0x12, 0xd4, 0x7b, 0x08, 0xce, 0x12, 0xa3, 0x2a, 0xa9, 0x57, 0x9a,
+	0x99, 0x6e, 0x45, 0xc6, 0xfb, 0x22, 0x94, 0x7b, 0x69, 0xbf, 0x3b, 0x9b, 0xe8, 0xea, 0xf9, 0x44,
+	0x57, 0x7f, 0x4e, 0x74, 0xf5, 0xcb, 0x54, 0x57, 0xce, 0xa7, 0xba, 0xf2, 0x7d, 0xaa, 0x2b, 0x6f,
+	0xdb, 0x39, 0xb6, 0xec, 0x4e, 0x36, 0x43, 0xbf, 0xcb, 0xe6, 0x81, 0x3d, 0x74, 0x9e, 0xd9, 0xa7,
+	0xeb, 0x9e, 0x1d, 0xa1, 0xa6, 0x5b, 0x12, 0x8f, 0xc7, 0xd3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x35, 0x64, 0x88, 0x0b, 0xa5, 0x04, 0x00, 0x00,
 }
 
 func (this *CreateConcentratedLiquidityPoolsProposal) Equal(that interface{}) bool {
diff --git a/x/concentrated-liquidity/types/gov_test.go b/x/concentrated-liquidity/types/gov_test.go
index 38916ff0155..898b0ea03d9 100644
--- a/x/concentrated-liquidity/types/gov_test.go
+++ b/x/concentrated-liquidity/types/gov_test.go
@@ -7,7 +7,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func TestCreateConcentratedLiquidityPoolsProposalMarshalUnmarshal(t *testing.T) {
diff --git a/x/concentrated-liquidity/types/incentive_record.pb.go b/x/concentrated-liquidity/types/incentive_record.pb.go
index 6a44813249e..7b5f8d4c4ed 100644
--- a/x/concentrated-liquidity/types/incentive_record.pb.go
+++ b/x/concentrated-liquidity/types/incentive_record.pb.go
@@ -182,39 +182,39 @@ var fileDescriptor_9d38bf94e42ee434 = []byte{
 	// 558 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x6e, 0xd3, 0x40,
 	0x18, 0x8d, 0x9b, 0x52, 0x94, 0xe1, 0x27, 0xe0, 0x86, 0x36, 0x8d, 0xa8, 0x1d, 0x2c, 0x40, 0xd9,
-	0xc4, 0x56, 0x40, 0xdd, 0x74, 0x57, 0x37, 0x42, 0xca, 0xd6, 0x02, 0x15, 0x21, 0x24, 0x6b, 0xec,
-	0x19, 0xcc, 0xa8, 0x19, 0x4f, 0x18, 0x8f, 0x23, 0x72, 0x8b, 0x2e, 0x58, 0x70, 0x14, 0x8e, 0xd0,
-	0x65, 0xc5, 0x0a, 0xb1, 0x30, 0x28, 0xb9, 0x41, 0x4e, 0x80, 0x3c, 0x63, 0x27, 0xc1, 0x05, 0x09,
-	0x56, 0xc9, 0xf7, 0xe6, 0xbd, 0xef, 0x7b, 0xf3, 0xbe, 0x49, 0xc0, 0x11, 0x4b, 0x28, 0x4b, 0x48,
-	0xe2, 0x84, 0x2c, 0x0e, 0x71, 0x2c, 0x38, 0x14, 0x18, 0xf5, 0xc7, 0xe4, 0x43, 0x4a, 0x10, 0x11,
-	0x33, 0x87, 0x48, 0x94, 0x4c, 0xb1, 0xcf, 0x71, 0xc8, 0x38, 0xb2, 0x27, 0x9c, 0x09, 0xa6, 0x3f,
-	0x29, 0x64, 0xf6, 0xa6, 0x6c, 0xa5, 0xb2, 0xa7, 0x83, 0x00, 0x0b, 0x38, 0xe8, 0x1c, 0x84, 0x92,
-	0xe7, 0x4b, 0x91, 0xa3, 0x0a, 0xd5, 0xa1, 0xd3, 0x8a, 0x58, 0xc4, 0x14, 0x9e, 0x7f, 0x2b, 0x50,
-	0x33, 0x62, 0x2c, 0x1a, 0x63, 0x47, 0x56, 0x41, 0xfa, 0xce, 0x11, 0x84, 0xe2, 0x44, 0x40, 0x3a,
-	0x29, 0x08, 0x46, 0x95, 0x80, 0x52, 0x0e, 0x05, 0x61, 0xb1, 0x3a, 0xb7, 0xbe, 0xd4, 0x41, 0x73,
-	0x54, 0x7a, 0xf6, 0xa4, 0x65, 0x7d, 0x1f, 0xdc, 0x9c, 0x30, 0x36, 0xf6, 0x09, 0x6a, 0x6b, 0x5d,
-	0xad, 0xb7, 0xed, 0xed, 0xe4, 0xe5, 0x08, 0xe9, 0xa7, 0xa0, 0xb9, 0xbe, 0x1f, 0xc2, 0x31, 0xa3,
-	0xed, 0xad, 0xae, 0xd6, 0x6b, 0xb8, 0x9d, 0x65, 0x66, 0xee, 0xcd, 0x20, 0x1d, 0x1f, 0x5b, 0x15,
-	0x82, 0xe5, 0xdd, 0x5d, 0x21, 0xc3, 0x1c, 0xd0, 0xcf, 0xc0, 0xde, 0x9a, 0x13, 0x72, 0x0c, 0x05,
-	0xe3, 0x3e, 0x44, 0x88, 0xb7, 0xeb, 0xb2, 0xd7, 0xa3, 0x65, 0x66, 0x1e, 0x56, 0x7b, 0x6d, 0xf2,
-	0x2c, 0xaf, 0xb5, 0x3a, 0x38, 0x55, 0xf8, 0x09, 0x42, 0x5c, 0xff, 0xa4, 0x81, 0x07, 0xd5, 0xf8,
-	0xfd, 0x80, 0xa1, 0x59, 0x7b, 0xbb, 0xab, 0xf5, 0x6e, 0x3d, 0x3b, 0xb6, 0xff, 0x69, 0x09, 0x76,
-	0x25, 0x0e, 0x97, 0xa1, 0x99, 0xfb, 0xf8, 0x32, 0x33, 0x6b, 0xcb, 0xcc, 0x7c, 0x58, 0x35, 0xb6,
-	0x31, 0xc6, 0xf2, 0x76, 0xc9, 0x75, 0xa9, 0x7e, 0x06, 0x00, 0x25, 0xb1, 0x9f, 0x4e, 0xf2, 0xd5,
-	0xb4, 0x6f, 0x48, 0x2b, 0x07, 0xb6, 0x5a, 0x8b, 0x5d, 0xae, 0xc5, 0x1e, 0x16, 0x6b, 0x71, 0x0f,
-	0x8b, 0x49, 0xf7, 0xd5, 0xa4, 0xb5, 0xd4, 0xfa, 0xfc, 0xc3, 0xd4, 0xbc, 0x06, 0x25, 0xf1, 0x2b,
-	0x55, 0x7f, 0xdd, 0x02, 0xbb, 0x7f, 0xf0, 0xaa, 0x0b, 0x70, 0x8f, 0x63, 0x0a, 0x49, 0x4c, 0xe2,
-	0xc8, 0x87, 0x94, 0xa5, 0xb1, 0x90, 0x7b, 0x6c, 0xb8, 0xa3, 0xbc, 0xf7, 0xf7, 0xcc, 0x7c, 0x1a,
-	0x11, 0xf1, 0x3e, 0x0d, 0xec, 0x90, 0xd1, 0xe2, 0x91, 0x15, 0x1f, 0xfd, 0x04, 0x9d, 0x3b, 0x62,
-	0x36, 0xc1, 0x89, 0x3d, 0xc4, 0xe1, 0x32, 0x33, 0xf7, 0x95, 0x8b, 0x6a, 0x3f, 0xcb, 0x6b, 0xae,
-	0xa0, 0x13, 0x89, 0xe8, 0xe7, 0xe0, 0x0e, 0xa6, 0x24, 0x49, 0x08, 0x8b, 0xfd, 0x3c, 0xd8, 0xe2,
-	0x65, 0xbc, 0xf8, 0xef, 0x91, 0x2d, 0x35, 0xf2, 0xb7, 0x66, 0x96, 0x77, 0xbb, 0xac, 0x3d, 0x28,
-	0xb0, 0xfe, 0x1a, 0x80, 0x44, 0x40, 0x2e, 0x7c, 0x99, 0x69, 0x5d, 0x66, 0xda, 0xb9, 0x96, 0xe9,
-	0xcb, 0xf2, 0xb7, 0x50, 0x0d, 0x75, 0xad, 0xb5, 0x2e, 0x64, 0xa8, 0x12, 0xc8, 0xe9, 0xee, 0xdb,
-	0xcb, 0xb9, 0xa1, 0x5d, 0xcd, 0x0d, 0xed, 0xe7, 0xdc, 0xd0, 0x2e, 0x16, 0x46, 0xed, 0x6a, 0x61,
-	0xd4, 0xbe, 0x2d, 0x8c, 0xda, 0x1b, 0x77, 0xe3, 0x06, 0xc5, 0x43, 0xea, 0x8f, 0x61, 0x90, 0x94,
-	0x85, 0x33, 0x1d, 0x1c, 0x39, 0x1f, 0xff, 0xf6, 0xbf, 0x20, 0x6f, 0x18, 0xec, 0x48, 0x6f, 0xcf,
-	0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x95, 0x8c, 0x40, 0x92, 0x46, 0x04, 0x00, 0x00,
+	0xc4, 0x56, 0x40, 0xb0, 0xe8, 0xae, 0x6e, 0x84, 0x94, 0xad, 0x05, 0x2a, 0x42, 0x48, 0xd6, 0xd8,
+	0x33, 0x98, 0x51, 0x33, 0x9e, 0x30, 0x1e, 0x47, 0xe4, 0x16, 0x5d, 0xb0, 0xe0, 0x28, 0x1c, 0xa1,
+	0xcb, 0x8a, 0x15, 0x62, 0x61, 0x50, 0x72, 0x83, 0x9c, 0x00, 0x79, 0xc6, 0x4e, 0x82, 0x0b, 0x12,
+	0xac, 0x92, 0xef, 0xcd, 0x7b, 0xdf, 0xf7, 0xe6, 0x7d, 0x93, 0x80, 0x67, 0x2c, 0xa1, 0x2c, 0x21,
+	0x89, 0x13, 0xb2, 0x38, 0xc4, 0xb1, 0xe0, 0x50, 0x60, 0xd4, 0x1f, 0x93, 0x0f, 0x29, 0x41, 0x44,
+	0xcc, 0x1c, 0x22, 0x51, 0x32, 0xc5, 0x3e, 0xc7, 0x21, 0xe3, 0xc8, 0x9e, 0x70, 0x26, 0x98, 0xfe,
+	0xa8, 0x90, 0xd9, 0x9b, 0xb2, 0x95, 0xca, 0x9e, 0x0e, 0x02, 0x2c, 0xe0, 0xa0, 0x73, 0x10, 0x4a,
+	0x9e, 0x2f, 0x45, 0x8e, 0x2a, 0x54, 0x87, 0x4e, 0x2b, 0x62, 0x11, 0x53, 0x78, 0xfe, 0xad, 0x40,
+	0xcd, 0x88, 0xb1, 0x68, 0x8c, 0x1d, 0x59, 0x05, 0xe9, 0x3b, 0x47, 0x10, 0x8a, 0x13, 0x01, 0xe9,
+	0xa4, 0x20, 0x18, 0x55, 0x02, 0x4a, 0x39, 0x14, 0x84, 0xc5, 0xea, 0xdc, 0xfa, 0x52, 0x07, 0xcd,
+	0x51, 0xe9, 0xd9, 0x93, 0x96, 0xf5, 0x7d, 0x70, 0x7d, 0xc2, 0xd8, 0xd8, 0x27, 0xa8, 0xad, 0x75,
+	0xb5, 0xde, 0xb6, 0xb7, 0x93, 0x97, 0x23, 0xa4, 0x9f, 0x80, 0xe6, 0xfa, 0x7e, 0x08, 0xc7, 0x8c,
+	0xb6, 0xb7, 0xba, 0x5a, 0xaf, 0xe1, 0x76, 0x96, 0x99, 0xb9, 0x37, 0x83, 0x74, 0x7c, 0x64, 0x55,
+	0x08, 0x96, 0x77, 0x7b, 0x85, 0x0c, 0x73, 0x40, 0x3f, 0x05, 0x7b, 0x6b, 0x4e, 0xc8, 0x31, 0x14,
+	0x8c, 0xfb, 0x10, 0x21, 0xde, 0xae, 0xcb, 0x5e, 0x0f, 0x96, 0x99, 0x79, 0x58, 0xed, 0xb5, 0xc9,
+	0xb3, 0xbc, 0xd6, 0xea, 0xe0, 0x44, 0xe1, 0xc7, 0x08, 0x71, 0xfd, 0x93, 0x06, 0xee, 0x55, 0xe3,
+	0xf7, 0x03, 0x86, 0x66, 0xed, 0xed, 0xae, 0xd6, 0xbb, 0xf1, 0xe4, 0xc8, 0xfe, 0xa7, 0x25, 0xd8,
+	0x95, 0x38, 0x5c, 0x86, 0x66, 0xee, 0xc3, 0x8b, 0xcc, 0xac, 0x2d, 0x33, 0xf3, 0x7e, 0xd5, 0xd8,
+	0xc6, 0x18, 0xcb, 0xdb, 0x25, 0x57, 0xa5, 0xfa, 0x29, 0x00, 0x94, 0xc4, 0x7e, 0x3a, 0xc9, 0x57,
+	0xd3, 0xbe, 0x26, 0xad, 0x1c, 0xd8, 0x6a, 0x2d, 0x76, 0xb9, 0x16, 0x7b, 0x58, 0xac, 0xc5, 0x3d,
+	0x2c, 0x26, 0xdd, 0x55, 0x93, 0xd6, 0x52, 0xeb, 0xf3, 0x0f, 0x53, 0xf3, 0x1a, 0x94, 0xc4, 0xaf,
+	0x54, 0xfd, 0x75, 0x0b, 0xec, 0xfe, 0xc1, 0xab, 0x2e, 0xc0, 0x1d, 0x8e, 0x29, 0x24, 0x31, 0x89,
+	0x23, 0x1f, 0x52, 0x96, 0xc6, 0x42, 0xee, 0xb1, 0xe1, 0x8e, 0xf2, 0xde, 0xdf, 0x33, 0xf3, 0x71,
+	0x44, 0xc4, 0xfb, 0x34, 0xb0, 0x43, 0x46, 0x8b, 0x47, 0x56, 0x7c, 0xf4, 0x13, 0x74, 0xe6, 0x88,
+	0xd9, 0x04, 0x27, 0xf6, 0x10, 0x87, 0xcb, 0xcc, 0xdc, 0x57, 0x2e, 0xaa, 0xfd, 0x2c, 0xaf, 0xb9,
+	0x82, 0x8e, 0x25, 0xa2, 0x9f, 0x81, 0x5b, 0x98, 0x92, 0x24, 0x21, 0x2c, 0xf6, 0xf3, 0x60, 0x8b,
+	0x97, 0xf1, 0xe2, 0xbf, 0x47, 0xb6, 0xd4, 0xc8, 0xdf, 0x9a, 0x59, 0xde, 0xcd, 0xb2, 0xf6, 0xa0,
+	0xc0, 0xfa, 0x6b, 0x00, 0x12, 0x01, 0xb9, 0xf0, 0x65, 0xa6, 0x75, 0x99, 0x69, 0xe7, 0x4a, 0xa6,
+	0x2f, 0xcb, 0xdf, 0x42, 0x35, 0xd4, 0xb5, 0xd6, 0x3a, 0x97, 0xa1, 0x4a, 0x20, 0xa7, 0xbb, 0x6f,
+	0x2f, 0xe6, 0x86, 0x76, 0x39, 0x37, 0xb4, 0x9f, 0x73, 0x43, 0x3b, 0x5f, 0x18, 0xb5, 0xcb, 0x85,
+	0x51, 0xfb, 0xb6, 0x30, 0x6a, 0x6f, 0xdc, 0x8d, 0x1b, 0x14, 0x0f, 0xa9, 0x3f, 0x86, 0x41, 0x52,
+	0x16, 0xce, 0x74, 0xf0, 0xdc, 0xf9, 0xf8, 0xb7, 0xff, 0x05, 0x79, 0xc3, 0x60, 0x47, 0x7a, 0x7b,
+	0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x3c, 0xfc, 0xb8, 0x46, 0x04, 0x00, 0x00,
 }
 
 func (m *IncentiveRecord) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/keys_test.go b/x/concentrated-liquidity/types/keys_test.go
index ee31504b87a..d14e71bb614 100644
--- a/x/concentrated-liquidity/types/keys_test.go
+++ b/x/concentrated-liquidity/types/keys_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // TestReverseRelationTickIndexToBytes tests if TickIndexToBytes and TickIndexFromBytes
diff --git a/x/concentrated-liquidity/types/msgs_test.go b/x/concentrated-liquidity/types/msgs_test.go
index 8a0a258c781..3d2f8109080 100644
--- a/x/concentrated-liquidity/types/msgs_test.go
+++ b/x/concentrated-liquidity/types/msgs_test.go
@@ -7,11 +7,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 type extMsg interface {
diff --git a/x/concentrated-liquidity/types/params.pb.go b/x/concentrated-liquidity/types/params.pb.go
index 45c9dc14246..7adc2dd76e6 100644
--- a/x/concentrated-liquidity/types/params.pb.go
+++ b/x/concentrated-liquidity/types/params.pb.go
@@ -128,42 +128,42 @@ func init() {
 }
 
 var fileDescriptor_cd3784445b6f6ba7 = []byte{
-	// 546 bytes of a gzipped FileDescriptorProto
+	// 547 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x6f, 0xd3, 0x40,
 	0x14, 0xc7, 0x63, 0x52, 0x22, 0x6a, 0x26, 0x2c, 0x10, 0x4e, 0x05, 0xb6, 0x65, 0xa4, 0x12, 0x09,
-	0x6a, 0x8b, 0x22, 0x16, 0xd8, 0x4c, 0x60, 0x2e, 0x0e, 0x48, 0xa8, 0x42, 0x3a, 0x9d, 0xcf, 0x57,
-	0xe7, 0x14, 0xdb, 0xcf, 0xbd, 0x3b, 0x03, 0x61, 0x07, 0x31, 0x21, 0x46, 0x36, 0xbe, 0x4e, 0xc7,
-	0x8e, 0x88, 0xc1, 0xa0, 0x64, 0x63, 0xcc, 0x27, 0x40, 0x39, 0x3b, 0xd4, 0xa1, 0x54, 0xc0, 0x64,
-	0xbf, 0xf7, 0xff, 0xbd, 0x77, 0xef, 0xde, 0x7b, 0xa7, 0xdf, 0x02, 0x91, 0x81, 0x60, 0xc2, 0x27,
-	0x90, 0x13, 0x9a, 0x4b, 0x8e, 0x25, 0x8d, 0x77, 0x52, 0x76, 0x58, 0xb2, 0x98, 0xc9, 0xa9, 0x5f,
-	0x60, 0x8e, 0x33, 0xe1, 0x15, 0x1c, 0x24, 0x18, 0xd7, 0x1b, 0xd8, 0x6b, 0xc3, 0xbf, 0xd8, 0xad,
-	0xcb, 0x09, 0x24, 0xa0, 0x48, 0x7f, 0xf9, 0x57, 0x07, 0x6d, 0xf5, 0x89, 0x8a, 0x42, 0xb5, 0x50,
-	0x1b, 0x8d, 0x64, 0x25, 0x00, 0x49, 0x4a, 0x7d, 0x65, 0x45, 0xe5, 0x81, 0x1f, 0x97, 0x1c, 0x4b,
-	0x06, 0x79, 0xad, 0xbb, 0xef, 0x7a, 0x7a, 0x6f, 0x4f, 0x15, 0x60, 0xec, 0xeb, 0x57, 0x71, 0x29,
-	0xc7, 0xc0, 0xd9, 0x1b, 0x1a, 0x23, 0xc9, 0xc8, 0x04, 0x89, 0x02, 0x13, 0x96, 0x27, 0xa6, 0xe6,
-	0x74, 0x07, 0x1b, 0x81, 0xbb, 0xa8, 0x6c, 0x6b, 0x8a, 0xb3, 0xf4, 0xbe, 0x7b, 0x06, 0xe8, 0x86,
-	0x57, 0x4e, 0x94, 0xa7, 0x8c, 0x4c, 0x46, 0xb5, 0xdf, 0xf8, 0xa0, 0xe9, 0xfd, 0x56, 0x8c, 0x28,
-	0x38, 0xc5, 0x31, 0x3a, 0xc0, 0x44, 0x02, 0x17, 0xe6, 0x39, 0xa7, 0x3b, 0xd8, 0x0c, 0xc2, 0xa3,
-	0xca, 0xee, 0x7c, 0xad, 0xec, 0xed, 0x84, 0xc9, 0x71, 0x19, 0x79, 0x04, 0xb2, 0xe6, 0x2e, 0xcd,
-	0x67, 0x47, 0xc4, 0x13, 0x5f, 0x4e, 0x0b, 0x2a, 0xbc, 0x21, 0x25, 0x8b, 0xca, 0x76, 0x4e, 0x15,
-	0xb3, 0x9e, 0xd8, 0x0d, 0x5b, 0x37, 0x1a, 0x29, 0xe9, 0x71, 0xad, 0x18, 0x9f, 0x35, 0xdd, 0x8e,
-	0x70, 0x8a, 0x73, 0x42, 0x39, 0x12, 0x63, 0xcc, 0xa9, 0x40, 0x9c, 0xbe, 0xc2, 0x3c, 0x46, 0x31,
-	0x13, 0x04, 0xca, 0x5c, 0x9a, 0x5d, 0x47, 0x1b, 0x6c, 0x06, 0xcf, 0xff, 0xbb, 0xac, 0xed, 0xba,
-	0xac, 0xbf, 0xa4, 0x77, 0xc3, 0x6b, 0x2b, 0x62, 0xa4, 0x80, 0x50, 0xe9, 0xc3, 0x46, 0xfe, 0x6d,
-	0x1c, 0x87, 0x25, 0x48, 0x8a, 0x62, 0x9a, 0x43, 0x26, 0xcc, 0x0d, 0xd5, 0xaf, 0x3f, 0x8f, 0xa3,
-	0x0d, 0xae, 0x8d, 0xe3, 0xc9, 0x52, 0x18, 0x2a, 0xbf, 0xf1, 0x56, 0xd3, 0x8d, 0x56, 0x4c, 0x59,
-	0x48, 0x96, 0x51, 0x61, 0x9e, 0x77, 0xba, 0x83, 0x8b, 0xbb, 0x7d, 0xaf, 0xde, 0x19, 0x6f, 0xb5,
-	0x33, 0xde, 0xb0, 0xd9, 0x99, 0xe0, 0xc1, 0xb2, 0x17, 0x3f, 0x2a, 0xdb, 0x58, 0x6d, 0xd1, 0x6d,
-	0xc8, 0x98, 0xa4, 0x59, 0x21, 0xa7, 0x8b, 0xca, 0xee, 0x9f, 0x2a, 0xa6, 0x49, 0xec, 0x7e, 0xfa,
-	0x66, 0x6b, 0xe1, 0xa5, 0x13, 0xe1, 0x59, 0xed, 0x37, 0xde, 0x6b, 0xfa, 0x4d, 0x26, 0x50, 0x41,
-	0x79, 0xc6, 0x84, 0x60, 0x90, 0xa7, 0x54, 0x08, 0x54, 0x00, 0xa4, 0x88, 0x70, 0xaa, 0x4e, 0x40,
-	0x34, 0xc7, 0x51, 0x4a, 0x63, 0xb3, 0xe7, 0x68, 0x83, 0x0b, 0xc1, 0xee, 0xa2, 0xb2, 0xbd, 0xfa,
-	0x9c, 0x7f, 0x0c, 0x74, 0xc3, 0x1b, 0x4c, 0xec, 0xad, 0x81, 0x7b, 0x00, 0xe9, 0xc3, 0x06, 0x7b,
-	0x54, 0x53, 0xc1, 0x8b, 0xa3, 0x99, 0xa5, 0x1d, 0xcf, 0x2c, 0xed, 0xfb, 0xcc, 0xd2, 0x3e, 0xce,
-	0xad, 0xce, 0xf1, 0xdc, 0xea, 0x7c, 0x99, 0x5b, 0x9d, 0xfd, 0xa0, 0x35, 0xf8, 0xe6, 0x75, 0xee,
-	0xa4, 0x38, 0x12, 0x2b, 0xc3, 0x7f, 0x79, 0xe7, 0x9e, 0xff, 0xfa, 0xac, 0xd7, 0xad, 0x16, 0x23,
-	0xea, 0xa9, 0x5e, 0xde, 0xfd, 0x19, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x38, 0xad, 0x30, 0x0c, 0x04,
-	0x00, 0x00,
+	0x6a, 0x8b, 0x22, 0x31, 0xc0, 0x66, 0x02, 0x73, 0x71, 0x40, 0x42, 0x15, 0xd2, 0xe9, 0x7c, 0xbe,
+	0x3a, 0xa7, 0xd8, 0x7e, 0xee, 0xdd, 0x19, 0x08, 0x3b, 0x88, 0x09, 0x31, 0xb2, 0xf1, 0x75, 0x3a,
+	0x76, 0x44, 0x0c, 0x06, 0x25, 0x1b, 0x63, 0x3e, 0x01, 0xca, 0xd9, 0xa1, 0x0e, 0xa5, 0x02, 0x26,
+	0xfb, 0xbd, 0xff, 0xef, 0xbd, 0x7b, 0xf7, 0xde, 0x3b, 0xfd, 0x16, 0x88, 0x0c, 0x04, 0x13, 0x3e,
+	0x81, 0x9c, 0xd0, 0x5c, 0x72, 0x2c, 0x69, 0xbc, 0x93, 0xb2, 0xc3, 0x92, 0xc5, 0x4c, 0x4e, 0xfd,
+	0x02, 0x73, 0x9c, 0x09, 0xaf, 0xe0, 0x20, 0xc1, 0xb8, 0xde, 0xc0, 0x5e, 0x1b, 0xfe, 0xc5, 0x6e,
+	0x5d, 0x4e, 0x20, 0x01, 0x45, 0xfa, 0xcb, 0xbf, 0x3a, 0x68, 0xab, 0x4f, 0x54, 0x14, 0xaa, 0x85,
+	0xda, 0x68, 0x24, 0x2b, 0x01, 0x48, 0x52, 0xea, 0x2b, 0x2b, 0x2a, 0x0f, 0xfc, 0xb8, 0xe4, 0x58,
+	0x32, 0xc8, 0x6b, 0xdd, 0x7d, 0xd7, 0xd3, 0x7b, 0x7b, 0xaa, 0x00, 0x63, 0x5f, 0xbf, 0x8a, 0x4b,
+	0x39, 0x06, 0xce, 0xde, 0xd0, 0x18, 0x49, 0x46, 0x26, 0x48, 0x14, 0x98, 0xb0, 0x3c, 0x31, 0x35,
+	0xa7, 0x3b, 0xd8, 0x08, 0xdc, 0x45, 0x65, 0x5b, 0x53, 0x9c, 0xa5, 0xf7, 0xdd, 0x33, 0x40, 0x37,
+	0xbc, 0x72, 0xa2, 0x3c, 0x65, 0x64, 0x32, 0xaa, 0xfd, 0xc6, 0x07, 0x4d, 0xef, 0xb7, 0x62, 0x44,
+	0xc1, 0x29, 0x8e, 0xd1, 0x01, 0x26, 0x12, 0xb8, 0x30, 0xcf, 0x39, 0xdd, 0xc1, 0x66, 0x10, 0x1e,
+	0x55, 0x76, 0xe7, 0x6b, 0x65, 0x6f, 0x27, 0x4c, 0x8e, 0xcb, 0xc8, 0x23, 0x90, 0x35, 0x77, 0x69,
+	0x3e, 0x3b, 0x22, 0x9e, 0xf8, 0x72, 0x5a, 0x50, 0xe1, 0x0d, 0x29, 0x59, 0x54, 0xb6, 0x73, 0xaa,
+	0x98, 0xf5, 0xc4, 0x6e, 0xd8, 0xba, 0xd1, 0x48, 0x49, 0x8f, 0x6b, 0xc5, 0xf8, 0xac, 0xe9, 0x76,
+	0x84, 0x53, 0x9c, 0x13, 0xca, 0x91, 0x18, 0x63, 0x4e, 0x05, 0xe2, 0xf4, 0x15, 0xe6, 0x31, 0x8a,
+	0x99, 0x20, 0x50, 0xe6, 0xd2, 0xec, 0x3a, 0xda, 0x60, 0x33, 0x78, 0xfe, 0xdf, 0x65, 0x6d, 0xd7,
+	0x65, 0xfd, 0x25, 0xbd, 0x1b, 0x5e, 0x5b, 0x11, 0x23, 0x05, 0x84, 0x4a, 0x1f, 0x36, 0xf2, 0x6f,
+	0xe3, 0x38, 0x2c, 0x41, 0x52, 0x14, 0xd3, 0x1c, 0x32, 0x61, 0x6e, 0xa8, 0x7e, 0xfd, 0x79, 0x1c,
+	0x6d, 0x70, 0x6d, 0x1c, 0x4f, 0x96, 0xc2, 0x50, 0xf9, 0x8d, 0xb7, 0x9a, 0x6e, 0xb4, 0x62, 0xca,
+	0x42, 0xb2, 0x8c, 0x0a, 0xf3, 0xbc, 0xd3, 0x1d, 0x5c, 0xdc, 0xed, 0x7b, 0xf5, 0xce, 0x78, 0xab,
+	0x9d, 0xf1, 0x86, 0xcd, 0xce, 0x04, 0x0f, 0x96, 0xbd, 0xf8, 0x51, 0xd9, 0xc6, 0x6a, 0x8b, 0x6e,
+	0x43, 0xc6, 0x24, 0xcd, 0x0a, 0x39, 0x5d, 0x54, 0x76, 0xff, 0x54, 0x31, 0x4d, 0x62, 0xf7, 0xd3,
+	0x37, 0x5b, 0x0b, 0x2f, 0x9d, 0x08, 0xcf, 0x6a, 0xbf, 0xf1, 0x5e, 0xd3, 0x6f, 0x32, 0x81, 0x0a,
+	0xca, 0x33, 0x26, 0x04, 0x83, 0x3c, 0xa5, 0x42, 0xa0, 0x02, 0x20, 0x45, 0x84, 0x53, 0x75, 0x02,
+	0xa2, 0x39, 0x8e, 0x52, 0x1a, 0x9b, 0x3d, 0x47, 0x1b, 0x5c, 0x08, 0x76, 0x17, 0x95, 0xed, 0xd5,
+	0xe7, 0xfc, 0x63, 0xa0, 0x1b, 0xde, 0x60, 0x62, 0x6f, 0x0d, 0xdc, 0x03, 0x48, 0x1f, 0x36, 0xd8,
+	0xa3, 0x9a, 0x0a, 0x5e, 0x1c, 0xcd, 0x2c, 0xed, 0x78, 0x66, 0x69, 0xdf, 0x67, 0x96, 0xf6, 0x71,
+	0x6e, 0x75, 0x8e, 0xe7, 0x56, 0xe7, 0xcb, 0xdc, 0xea, 0xec, 0x07, 0xad, 0xc1, 0x37, 0xaf, 0x73,
+	0x27, 0xc5, 0x91, 0x58, 0x19, 0xfe, 0xcb, 0x3b, 0xf7, 0xfc, 0xd7, 0x67, 0xbd, 0x6e, 0xb5, 0x18,
+	0x51, 0x4f, 0xf5, 0xf2, 0xee, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x88, 0x11, 0x1a, 0x0c,
+	0x04, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/concentrated-liquidity/types/params_test.go b/x/concentrated-liquidity/types/params_test.go
index 3e46e8e32a5..ab8da3b5e6a 100644
--- a/x/concentrated-liquidity/types/params_test.go
+++ b/x/concentrated-liquidity/types/params_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 func TestValidateTicks(t *testing.T) {
diff --git a/x/concentrated-liquidity/types/tx.pb.go b/x/concentrated-liquidity/types/tx.pb.go
index 4530b895d79..eb942ac493d 100644
--- a/x/concentrated-liquidity/types/tx.pb.go
+++ b/x/concentrated-liquidity/types/tx.pb.go
@@ -719,7 +719,7 @@ var fileDescriptor_1f1fff802923d7db = []byte{
 	// 1117 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4f, 0x6f, 0xe3, 0x44,
 	0x14, 0xef, 0xb4, 0xd9, 0x94, 0x4e, 0xe9, 0x9f, 0xb8, 0xa5, 0xcd, 0x7a, 0x57, 0x71, 0x35, 0x08,
-	0x36, 0x08, 0xd5, 0xde, 0x14, 0x10, 0xa8, 0x48, 0xb0, 0x4d, 0xd1, 0x4a, 0x41, 0x8a, 0xb4, 0x32,
+	0x36, 0x08, 0xd5, 0xde, 0x14, 0x04, 0xa8, 0x48, 0xb0, 0x4d, 0xd1, 0x4a, 0x41, 0x8a, 0xb4, 0x32,
 	0x45, 0x48, 0x0b, 0x92, 0xe5, 0xd8, 0x53, 0x77, 0x68, 0xe2, 0x49, 0x3d, 0x4e, 0xbb, 0x95, 0x40,
 	0x42, 0x82, 0x0b, 0x82, 0xc3, 0x0a, 0x09, 0x89, 0x13, 0x7b, 0x44, 0xe2, 0x3b, 0x70, 0xef, 0x71,
 	0x2f, 0x48, 0x88, 0x83, 0x17, 0xb5, 0x1f, 0x00, 0x29, 0x9f, 0x00, 0xd9, 0x63, 0x8f, 0xb3, 0x4e,
@@ -786,7 +786,7 @@ var fileDescriptor_1f1fff802923d7db = []byte{
 	0x12, 0xf8, 0xeb, 0xb4, 0x04, 0x1e, 0x9e, 0x95, 0x26, 0x1e, 0x9f, 0x95, 0x26, 0xfe, 0x38, 0x2b,
 	0x4d, 0xdc, 0xaf, 0xf6, 0x3c, 0x92, 0x63, 0x77, 0xeb, 0x4d, 0xb3, 0xc1, 0x92, 0x85, 0x76, 0x58,
 	0x79, 0x4b, 0x7b, 0x30, 0xf4, 0x3f, 0x37, 0xe1, 0x23, 0xbb, 0x91, 0x8f, 0x3e, 0xd7, 0xde, 0xf8,
-	0x27, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x5f, 0x98, 0x25, 0xe8, 0x11, 0x00, 0x00,
+	0x27, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xef, 0x24, 0x0f, 0xe8, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/client/grpc/grpc_query.go b/x/cosmwasmpool/client/grpc/grpc_query.go
index 9d58888d32f..2b094ee327f 100644
--- a/x/cosmwasmpool/client/grpc/grpc_query.go
+++ b/x/cosmwasmpool/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/cosmwasmpool/client/query_proto_wrap.go b/x/cosmwasmpool/client/query_proto_wrap.go
index cf9c4e8d002..c3b96251459 100644
--- a/x/cosmwasmpool/client/query_proto_wrap.go
+++ b/x/cosmwasmpool/client/query_proto_wrap.go
@@ -3,8 +3,8 @@ package client
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/queryproto"
 )
 
 // This file should evolve to being code gen'd, off of `proto/poolmanager/v1beta/query.yml`
diff --git a/x/cosmwasmpool/client/queryproto/query.pb.go b/x/cosmwasmpool/client/queryproto/query.pb.go
index 2c611a4fe85..c14872dbab0 100644
--- a/x/cosmwasmpool/client/queryproto/query.pb.go
+++ b/x/cosmwasmpool/client/queryproto/query.pb.go
@@ -14,7 +14,7 @@ import (
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
-	types "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -129,27 +129,27 @@ var fileDescriptor_733c758985c393b2 = []byte{
 	// 366 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0x2b, 0x31,
 	0x18, 0x85, 0x67, 0x2e, 0xf7, 0x76, 0x31, 0x97, 0x7b, 0x85, 0xc1, 0x85, 0x96, 0x32, 0x95, 0x52,
-	0xa5, 0x68, 0x9d, 0xd0, 0x8a, 0x2f, 0x50, 0x7c, 0x00, 0x2d, 0xae, 0x5c, 0x28, 0x99, 0x21, 0xc6,
-	0xc0, 0x24, 0x7f, 0xda, 0x64, 0x6a, 0xbb, 0xf5, 0x09, 0x14, 0x97, 0xbe, 0x50, 0x97, 0x05, 0x37,
-	0xae, 0x44, 0x5a, 0x1f, 0x44, 0x9a, 0x64, 0x4a, 0x75, 0x31, 0x74, 0x35, 0x93, 0x9c, 0xef, 0x9c,
-	0x9c, 0xe4, 0x0f, 0x5a, 0xa0, 0x38, 0x28, 0xa6, 0x50, 0x0a, 0x8a, 0xdf, 0x63, 0xc5, 0x25, 0x40,
-	0x86, 0x46, 0x9d, 0x84, 0x68, 0xdc, 0x41, 0x83, 0x9c, 0x0c, 0x27, 0xb1, 0x1c, 0x82, 0x86, 0xb0,
-	0xe6, 0xc8, 0x78, 0x9d, 0x8c, 0x1d, 0x59, 0xdd, 0xa6, 0x40, 0xc1, 0x80, 0x68, 0xf9, 0x67, 0x3d,
-	0xd5, 0xc3, 0xd2, 0x74, 0x4a, 0x04, 0x59, 0x06, 0x5a, 0x76, 0xbf, 0x94, 0xd5, 0x63, 0x87, 0x45,
-	0xa9, 0xe1, 0x50, 0x82, 0x15, 0x59, 0xa9, 0x29, 0x30, 0x51, 0x1c, 0xb9, 0xae, 0x9b, 0xfe, 0x2b,
-	0x4a, 0x62, 0xca, 0x04, 0xd6, 0x0c, 0x0a, 0xb6, 0x46, 0x01, 0x68, 0x46, 0x10, 0x96, 0x0c, 0x61,
-	0x21, 0x40, 0x1b, 0xb1, 0x28, 0xb4, 0xeb, 0x54, 0xb3, 0x4a, 0xf2, 0x5b, 0x84, 0xc5, 0xa4, 0x90,
-	0xec, 0x21, 0x37, 0xf6, 0xc2, 0x76, 0xe1, 0xa4, 0xfa, 0x4f, 0x97, 0x66, 0x9c, 0x28, 0x8d, 0xb9,
-	0xb4, 0x40, 0x63, 0x2b, 0xf8, 0x77, 0x8e, 0x87, 0x98, 0xab, 0x3e, 0x19, 0xe4, 0x44, 0xe9, 0xc6,
-	0x65, 0xf0, 0xbf, 0xd8, 0x50, 0x12, 0x84, 0x22, 0x61, 0x2f, 0xa8, 0x48, 0xb3, 0xb3, 0xe3, 0xef,
-	0xf9, 0xad, 0xbf, 0xdd, 0x66, 0x5c, 0xf6, 0xf6, 0xb1, 0x75, 0xf7, 0x7e, 0x4f, 0xdf, 0xeb, 0x5e,
-	0xdf, 0x39, 0xbb, 0x2f, 0x7e, 0xf0, 0xe7, 0x62, 0x79, 0xfd, 0xf0, 0xc9, 0x0f, 0x2a, 0x16, 0x09,
-	0x8f, 0x36, 0x09, 0x72, 0xbd, 0xaa, 0xed, 0xcd, 0x60, 0xdb, 0xb9, 0xd1, 0x7e, 0x78, 0xfd, 0x7c,
-	0xfe, 0x75, 0x10, 0x36, 0x51, 0xe9, 0x1c, 0x5d, 0xd7, 0xeb, 0xe9, 0x3c, 0xf2, 0x67, 0xf3, 0xc8,
-	0xff, 0x98, 0x47, 0xfe, 0xe3, 0x22, 0xf2, 0x66, 0x8b, 0xc8, 0x7b, 0x5b, 0x44, 0xde, 0xd5, 0x19,
-	0x65, 0xfa, 0x2e, 0x4f, 0xe2, 0x14, 0x78, 0x91, 0x74, 0x9c, 0xe1, 0x44, 0xad, 0x62, 0x47, 0x9d,
-	0x53, 0x34, 0xfe, 0x1e, 0x9e, 0x66, 0x8c, 0x08, 0x6d, 0xa7, 0x6d, 0xdf, 0xbd, 0x62, 0x3e, 0x27,
-	0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x79, 0x12, 0x48, 0xaa, 0xdf, 0x02, 0x00, 0x00,
+	0xa5, 0x68, 0x9d, 0xd0, 0x0a, 0x3e, 0x40, 0xf1, 0x01, 0xb4, 0xb8, 0x72, 0xa1, 0x64, 0x86, 0x18,
+	0x03, 0x93, 0xfc, 0x69, 0x93, 0xa9, 0xed, 0xd6, 0x27, 0x50, 0x5c, 0xfa, 0x42, 0x5d, 0x16, 0xdc,
+	0xb8, 0x12, 0x69, 0x7d, 0x10, 0x69, 0x92, 0x29, 0xd5, 0xc5, 0xd0, 0xd5, 0x4c, 0x72, 0xbe, 0x73,
+	0x72, 0x92, 0x3f, 0x68, 0x81, 0xe2, 0xa0, 0x98, 0x42, 0x29, 0x28, 0x7e, 0x8f, 0x15, 0x97, 0x00,
+	0x19, 0x1a, 0x75, 0x12, 0xa2, 0x71, 0x07, 0x0d, 0x72, 0x32, 0x9c, 0xc4, 0x72, 0x08, 0x1a, 0xc2,
+	0x9a, 0x23, 0xe3, 0x75, 0x32, 0x76, 0x64, 0x75, 0x9b, 0x02, 0x05, 0x03, 0xa2, 0xe5, 0x9f, 0xf5,
+	0x54, 0x0f, 0x4b, 0xd3, 0x29, 0x11, 0x64, 0x19, 0x68, 0xd9, 0xfd, 0x52, 0x56, 0x8f, 0x1d, 0x16,
+	0xa5, 0x86, 0x43, 0x09, 0x56, 0x64, 0xa5, 0xa6, 0xc0, 0x44, 0x71, 0xe4, 0xba, 0x6e, 0xfa, 0xaf,
+	0x28, 0x89, 0x29, 0x13, 0x58, 0x33, 0x28, 0xd8, 0x1a, 0x05, 0xa0, 0x19, 0x41, 0x58, 0x32, 0x84,
+	0x85, 0x00, 0x6d, 0xc4, 0xa2, 0xd0, 0xae, 0x53, 0xcd, 0x2a, 0xc9, 0x6f, 0x11, 0x16, 0x93, 0x42,
+	0xb2, 0x87, 0xdc, 0xd8, 0x0b, 0xdb, 0x85, 0x93, 0xea, 0x3f, 0x5d, 0x9a, 0x71, 0xa2, 0x34, 0xe6,
+	0xd2, 0x02, 0x8d, 0xad, 0xe0, 0xdf, 0x39, 0x1e, 0x62, 0xae, 0xfa, 0x64, 0x90, 0x13, 0xa5, 0x1b,
+	0x97, 0xc1, 0xff, 0x62, 0x43, 0x49, 0x10, 0x8a, 0x84, 0xbd, 0xa0, 0x22, 0xcd, 0xce, 0x8e, 0xbf,
+	0xe7, 0xb7, 0xfe, 0x76, 0x9b, 0x71, 0xd9, 0xdb, 0xc7, 0xd6, 0xdd, 0xfb, 0x3d, 0x7d, 0xaf, 0x7b,
+	0x7d, 0xe7, 0xec, 0xbe, 0xf8, 0xc1, 0x9f, 0x8b, 0xe5, 0xf5, 0xc3, 0x27, 0x3f, 0xa8, 0x58, 0x24,
+	0x3c, 0xda, 0x24, 0xc8, 0xf5, 0xaa, 0xb6, 0x37, 0x83, 0x6d, 0xe7, 0x46, 0xfb, 0xe1, 0xf5, 0xf3,
+	0xf9, 0xd7, 0x41, 0xd8, 0x44, 0xa5, 0x73, 0x74, 0x5d, 0xaf, 0xa7, 0xf3, 0xc8, 0x9f, 0xcd, 0x23,
+	0xff, 0x63, 0x1e, 0xf9, 0x8f, 0x8b, 0xc8, 0x9b, 0x2d, 0x22, 0xef, 0x6d, 0x11, 0x79, 0x57, 0x67,
+	0x94, 0xe9, 0xbb, 0x3c, 0x89, 0x53, 0xe0, 0x45, 0xd2, 0x71, 0x86, 0x13, 0xb5, 0x8a, 0x1d, 0x75,
+	0x4e, 0xd1, 0xf8, 0x7b, 0x78, 0x9a, 0x31, 0x22, 0xb4, 0x9d, 0xb6, 0x7d, 0xf7, 0x8a, 0xf9, 0x9c,
+	0x7c, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x99, 0x73, 0x92, 0xdf, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
index e36c78fc259..68f196b7182 100644
--- a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go
@@ -93,9 +93,9 @@ var fileDescriptor_834d7406456b7712 = []byte{
 	0x19, 0xc4, 0x0f, 0x92, 0x70, 0x04, 0x89, 0xbb, 0x80, 0x85, 0x9d, 0x22, 0x4f, 0x3c, 0x92, 0x63,
 	0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96,
 	0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x3e, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39,
-	0x3f, 0x57, 0x1f, 0xea, 0x6c, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x54,
+	0x3f, 0x57, 0x1f, 0xea, 0x6c, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x4c,
 	0xbf, 0x02, 0x35, 0x0c, 0x60, 0x1c, 0xfd, 0xdc, 0xe2, 0xf4, 0x24, 0x36, 0xb0, 0xfb, 0x8c, 0x01,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x36, 0x74, 0xe3, 0xf4, 0x2f, 0x01, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0xff, 0xff, 0x56, 0x4b, 0x82, 0xae, 0x2f, 0x01, 0x00, 0x00,
 }
 
 func (m *InstantiateMsg) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
index 366aa249c4e..c832bcb1510 100644
--- a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go
@@ -338,33 +338,33 @@ var fileDescriptor_4e43e2b40a371ec3 = []byte{
 	// 465 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x4f, 0x6b, 0x13, 0x41,
 	0x18, 0xc6, 0x33, 0x2a, 0x36, 0x1d, 0xff, 0xd1, 0x45, 0x21, 0x2d, 0xb2, 0x2d, 0x41, 0x4a, 0x2f,
-	0x9d, 0x21, 0x8a, 0x07, 0x45, 0x10, 0xd3, 0xa2, 0xe4, 0x14, 0xc8, 0x45, 0xea, 0x65, 0x99, 0x9d,
-	0xbc, 0xae, 0x4b, 0x77, 0xe6, 0xdd, 0x76, 0x66, 0x52, 0x7b, 0xf6, 0x0b, 0xf8, 0x99, 0x3c, 0xf5,
-	0xd8, 0xa3, 0x78, 0x28, 0x92, 0x7c, 0x11, 0x99, 0xfd, 0x93, 0x66, 0x53, 0x91, 0x42, 0xf1, 0x92,
-	0x64, 0xe6, 0x9d, 0xe7, 0x99, 0xf7, 0x79, 0x7f, 0xd9, 0xa5, 0xaf, 0xd0, 0x28, 0x34, 0xa9, 0xe1,
-	0x12, 0x8d, 0x3a, 0x11, 0x46, 0xe5, 0x88, 0x19, 0x9f, 0xf4, 0x62, 0xb0, 0xa2, 0xc7, 0x15, 0x8e,
-	0x21, 0xf3, 0x9f, 0x2e, 0x83, 0xe8, 0xc8, 0xc1, 0xf1, 0x69, 0xa4, 0x4c, 0xc2, 0xf2, 0x63, 0xb4,
-	0x18, 0x3c, 0xad, 0xa4, 0x6c, 0x51, 0xca, 0x2a, 0xe9, 0xc6, 0xe3, 0x04, 0x13, 0x2c, 0x0e, 0x72,
-	0xff, 0xab, 0xd4, 0x6c, 0x84, 0xb2, 0x10, 0xf1, 0x58, 0x18, 0x98, 0xdf, 0x22, 0x31, 0xd5, 0x65,
-	0xbd, 0xfb, 0x83, 0xd0, 0xb5, 0x3d, 0x91, 0xc9, 0xa1, 0xb3, 0xef, 0x94, 0xfd, 0x90, 0x4e, 0x40,
-	0x0f, 0x74, 0xf0, 0x9a, 0xb6, 0x2d, 0x1e, 0x82, 0x8e, 0x52, 0xdd, 0x21, 0x5b, 0x64, 0xe7, 0xde,
-	0xf3, 0x75, 0x56, 0x1a, 0x31, 0x6f, 0x54, 0xdf, 0xc9, 0xf6, 0x30, 0xd5, 0xfd, 0x3b, 0x67, 0x17,
-	0x9b, 0xad, 0xd1, 0x4a, 0x21, 0x18, 0xe8, 0x60, 0x9b, 0x3e, 0x2a, 0xb5, 0xe8, 0x6c, 0x34, 0x06,
-	0x8d, 0xaa, 0x73, 0x6b, 0x8b, 0xec, 0xac, 0x8e, 0x1e, 0x14, 0xdb, 0x43, 0x67, 0xf7, 0xfd, 0x66,
-	0x30, 0xa0, 0x6d, 0x73, 0x22, 0xf2, 0xe8, 0x33, 0x40, 0xe7, 0xb6, 0x3f, 0xd0, 0x67, 0xde, 0xe8,
-	0xd7, 0xc5, 0xe6, 0x76, 0x92, 0xda, 0x2f, 0x2e, 0x66, 0x12, 0x15, 0xaf, 0xda, 0x2f, 0xbf, 0x76,
-	0xcd, 0xf8, 0x90, 0xdb, 0xd3, 0x1c, 0x0c, 0xdb, 0x07, 0x39, 0x5a, 0xf1, 0xfa, 0xf7, 0x00, 0xdd,
-	0x6f, 0x84, 0x76, 0xae, 0x84, 0x18, 0xc1, 0x91, 0x03, 0x63, 0x83, 0x84, 0x3e, 0x91, 0x22, 0x93,
-	0x45, 0x3b, 0x42, 0xd9, 0x28, 0xf1, 0xe5, 0xcb, 0x60, 0x9c, 0xfd, 0x6b, 0xaa, 0xec, 0x8a, 0x6d,
-	0x15, 0x77, 0x4d, 0x2e, 0x17, 0xba, 0x07, 0x74, 0xfd, 0x2f, 0x4d, 0x98, 0x1c, 0xb5, 0x81, 0xe0,
-	0x0d, 0x5d, 0x9d, 0x4f, 0xe5, 0xba, 0x23, 0x6d, 0xd7, 0x03, 0x9b, 0x53, 0x1a, 0xe8, 0xda, 0x7a,
-	0xe8, 0xec, 0xcd, 0x3c, 0x83, 0x67, 0xf4, 0x61, 0xcd, 0xb8, 0x81, 0xe9, 0x7e, 0x05, 0xf2, 0xbf,
-	0x51, 0x6a, 0x84, 0x58, 0xa6, 0x94, 0xea, 0x05, 0x48, 0x97, 0xb9, 0xae, 0x41, 0xa9, 0x61, 0xbb,
-	0x48, 0xa9, 0x51, 0xe8, 0x7e, 0x2c, 0x29, 0x2d, 0x35, 0x51, 0x51, 0xba, 0xc1, 0xff, 0xbe, 0x7f,
-	0x70, 0x36, 0x0d, 0xc9, 0xf9, 0x34, 0x24, 0xbf, 0xa7, 0x21, 0xf9, 0x3e, 0x0b, 0x5b, 0xe7, 0xb3,
-	0xb0, 0xf5, 0x73, 0x16, 0xb6, 0x3e, 0xbd, 0x5d, 0x98, 0x54, 0x15, 0x63, 0x37, 0x13, 0xb1, 0xa9,
-	0x17, 0x7c, 0xd2, 0x7b, 0xc9, 0xbf, 0x36, 0x5f, 0x08, 0xf5, 0x82, 0x2b, 0x93, 0xc4, 0x77, 0x8b,
-	0x67, 0xf5, 0xc5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x67, 0x44, 0xb1, 0x3c, 0x04, 0x00,
+	0x9d, 0x21, 0x0a, 0x82, 0x22, 0x88, 0x69, 0x51, 0x72, 0x0a, 0xe4, 0x22, 0xf5, 0xb2, 0xcc, 0x4e,
+	0x5e, 0xd7, 0xa5, 0x3b, 0xf3, 0x6e, 0x3b, 0x33, 0xa9, 0x3d, 0xfb, 0x05, 0xfc, 0x4c, 0x9e, 0x7a,
+	0xec, 0x51, 0x3c, 0x14, 0x49, 0xbe, 0x88, 0xcc, 0xfe, 0x49, 0xb3, 0xa9, 0x48, 0xa1, 0x78, 0x49,
+	0x32, 0xf3, 0xce, 0xf3, 0xcc, 0xfb, 0xbc, 0xbf, 0xec, 0xd2, 0x57, 0x68, 0x14, 0x9a, 0xd4, 0x70,
+	0x89, 0x46, 0x9d, 0x08, 0xa3, 0x72, 0xc4, 0x8c, 0x4f, 0x7a, 0x31, 0x58, 0xd1, 0xe3, 0x0a, 0xc7,
+	0x90, 0xf9, 0x4f, 0x97, 0x41, 0x74, 0xe4, 0xe0, 0xf8, 0x34, 0x52, 0x26, 0x61, 0xf9, 0x31, 0x5a,
+	0x0c, 0x9e, 0x56, 0x52, 0xb6, 0x28, 0x65, 0x95, 0x74, 0xe3, 0x71, 0x82, 0x09, 0x16, 0x07, 0xb9,
+	0xff, 0x55, 0x6a, 0x36, 0x42, 0x59, 0x88, 0x78, 0x2c, 0x0c, 0xcc, 0x6f, 0x91, 0x98, 0xea, 0xb2,
+	0xde, 0xfd, 0x41, 0xe8, 0xda, 0x9e, 0xc8, 0xe4, 0xd0, 0xd9, 0x77, 0xca, 0x7e, 0x48, 0x27, 0xa0,
+	0x07, 0x3a, 0x78, 0x4d, 0xdb, 0x16, 0x0f, 0x41, 0x47, 0xa9, 0xee, 0x90, 0x2d, 0xb2, 0x73, 0xef,
+	0xf9, 0x3a, 0x2b, 0x8d, 0x98, 0x37, 0xaa, 0xef, 0x64, 0x7b, 0x98, 0xea, 0xfe, 0x9d, 0xb3, 0x8b,
+	0xcd, 0xd6, 0x68, 0xa5, 0x10, 0x0c, 0x74, 0xb0, 0x4d, 0x1f, 0x95, 0x5a, 0x74, 0x36, 0x1a, 0x83,
+	0x46, 0xd5, 0xb9, 0xb5, 0x45, 0x76, 0x56, 0x47, 0x0f, 0x8a, 0xed, 0xa1, 0xb3, 0xfb, 0x7e, 0x33,
+	0x18, 0xd0, 0xb6, 0x39, 0x11, 0x79, 0xf4, 0x19, 0xa0, 0x73, 0xdb, 0x1f, 0xe8, 0x33, 0x6f, 0xf4,
+	0xeb, 0x62, 0x73, 0x3b, 0x49, 0xed, 0x17, 0x17, 0x33, 0x89, 0x8a, 0x57, 0xed, 0x97, 0x5f, 0xbb,
+	0x66, 0x7c, 0xc8, 0xed, 0x69, 0x0e, 0x86, 0xed, 0x83, 0x1c, 0xad, 0x78, 0xfd, 0x7b, 0x80, 0xee,
+	0x37, 0x42, 0x3b, 0x57, 0x42, 0x8c, 0xe0, 0xc8, 0x81, 0xb1, 0x41, 0x42, 0x9f, 0x48, 0x91, 0xc9,
+	0xa2, 0x1d, 0xa1, 0x6c, 0x94, 0xf8, 0xf2, 0x65, 0x30, 0xce, 0xfe, 0x35, 0x55, 0x76, 0xc5, 0xb6,
+	0x8a, 0xbb, 0x26, 0x97, 0x0b, 0xdd, 0x03, 0xba, 0xfe, 0x97, 0x26, 0x4c, 0x8e, 0xda, 0x40, 0xf0,
+	0x86, 0xae, 0xce, 0xa7, 0x72, 0xdd, 0x91, 0xb6, 0xeb, 0x81, 0xcd, 0x29, 0x0d, 0x74, 0x6d, 0x3d,
+	0x74, 0xf6, 0x66, 0x9e, 0xc1, 0x33, 0xfa, 0xb0, 0x66, 0xdc, 0xc0, 0x74, 0xbf, 0x02, 0xf9, 0xdf,
+	0x28, 0x35, 0x42, 0x2c, 0x53, 0x4a, 0xf5, 0x02, 0xa4, 0xcb, 0x5c, 0xd7, 0xa0, 0xd4, 0xb0, 0x5d,
+	0xa4, 0xd4, 0x28, 0x74, 0x3f, 0x96, 0x94, 0x96, 0x9a, 0xa8, 0x28, 0xdd, 0xe0, 0x7f, 0xdf, 0x3f,
+	0x38, 0x9b, 0x86, 0xe4, 0x7c, 0x1a, 0x92, 0xdf, 0xd3, 0x90, 0x7c, 0x9f, 0x85, 0xad, 0xf3, 0x59,
+	0xd8, 0xfa, 0x39, 0x0b, 0x5b, 0x9f, 0xde, 0x2e, 0x4c, 0xaa, 0x8a, 0xb1, 0x9b, 0x89, 0xd8, 0xd4,
+	0x0b, 0x3e, 0xe9, 0xbd, 0xe4, 0x5f, 0x9b, 0x2f, 0x84, 0x7a, 0xc1, 0x95, 0x49, 0xe2, 0xbb, 0xc5,
+	0xb3, 0xfa, 0xe2, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x58, 0x25, 0xeb, 0x3c, 0x04, 0x00,
 	0x00,
 }
 
diff --git a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
index d62b778d1db..710e36f6b4e 100644
--- a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go
@@ -346,7 +346,7 @@ var fileDescriptor_e3b9879c5388a3a5 = []byte{
 	// 560 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x41, 0x6b, 0x13, 0x41,
 	0x14, 0xce, 0xc6, 0xda, 0xa6, 0xa3, 0xad, 0xcd, 0x18, 0x65, 0x5b, 0x64, 0x1b, 0x83, 0x94, 0x5e,
-	0x3a, 0x63, 0x14, 0x41, 0x44, 0x10, 0x63, 0x15, 0x72, 0x08, 0x81, 0x14, 0x44, 0x05, 0x59, 0x36,
+	0x3a, 0x63, 0x14, 0x44, 0x44, 0x10, 0x63, 0x15, 0x72, 0x08, 0x81, 0x14, 0x44, 0x05, 0x59, 0x36,
 	0xbb, 0xd3, 0x75, 0x69, 0x66, 0xde, 0xd2, 0x99, 0x6d, 0x22, 0x7a, 0xf2, 0xe0, 0xd9, 0xdf, 0xa3,
 	0x7f, 0xa0, 0xc7, 0x1e, 0xc5, 0x43, 0x91, 0xe4, 0x8f, 0xc8, 0xee, 0xcc, 0x26, 0x6d, 0x43, 0xc4,
 	0xd6, 0x5e, 0x76, 0x77, 0xe6, 0xbd, 0xef, 0x7d, 0xef, 0x7d, 0xfb, 0xcd, 0xa0, 0xc7, 0x20, 0x39,
@@ -378,7 +378,7 @@ var fileDescriptor_e3b9879c5388a3a5 = []byte{
 	0x70, 0xe8, 0x58, 0x47, 0x43, 0xc7, 0xfa, 0x3d, 0x74, 0xac, 0x6f, 0x23, 0xa7, 0x70, 0x34, 0x72,
 	0x0a, 0x3f, 0x47, 0x4e, 0xe1, 0xdd, 0xb3, 0x13, 0x05, 0xcd, 0xb0, 0x5b, 0x3d, 0xaf, 0x2b, 0xf3,
 	0x05, 0x3d, 0xa8, 0x3f, 0xa2, 0x83, 0xd3, 0x37, 0x69, 0xbe, 0xa0, 0x5c, 0x86, 0xdd, 0xf9, 0xec,
-	0x96, 0x7b, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xda, 0xe8, 0x49, 0x48, 0x75, 0x05, 0x00, 0x00,
+	0x96, 0x7b, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0xba, 0xd7, 0x28, 0x12, 0x75, 0x05, 0x00, 0x00,
 }
 
 func (m *SwapExactAmountIn) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
index f22bc5a78e1..7dcdd6b7552 100644
--- a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go
@@ -497,7 +497,7 @@ var fileDescriptor_3251d17e76ef0dc1 = []byte{
 	// 544 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x6e, 0xd3, 0x4c,
 	0x10, 0xc7, 0xe3, 0xaf, 0x9f, 0x00, 0x4f, 0x4a, 0x69, 0xad, 0x82, 0xda, 0x8a, 0xba, 0xc5, 0x12,
-	0x10, 0x90, 0xea, 0x55, 0x8b, 0x10, 0x12, 0x17, 0x44, 0x5a, 0xa8, 0x90, 0x8a, 0xd4, 0x24, 0x5c,
+	0x10, 0x90, 0xea, 0x55, 0x8b, 0x04, 0x12, 0x17, 0x44, 0x5a, 0xa8, 0x90, 0x8a, 0xd4, 0x24, 0x5c,
 	0xca, 0xc5, 0xda, 0x38, 0xcb, 0xc6, 0xc2, 0xce, 0x38, 0x99, 0x4d, 0x43, 0x78, 0x03, 0x6e, 0x3c,
 	0x56, 0x8f, 0x3d, 0x22, 0x0e, 0x15, 0x4a, 0x5e, 0x04, 0xad, 0xe3, 0x6c, 0x12, 0xa5, 0xe4, 0xd0,
 	0x53, 0xb2, 0xb3, 0xf3, 0xdf, 0xdf, 0xfc, 0x67, 0xd6, 0x0b, 0xaf, 0x90, 0x12, 0xa4, 0x88, 0x58,
@@ -528,7 +528,7 @@ var fileDescriptor_3251d17e76ef0dc1 = []byte{
 	0xc0, 0xb5, 0x2e, 0x07, 0xae, 0xf5, 0x67, 0xe0, 0x5a, 0x3f, 0x87, 0x6e, 0xe1, 0x72, 0xe8, 0x16,
 	0x7e, 0x0d, 0xdd, 0xc2, 0xe7, 0x37, 0x53, 0x5f, 0x47, 0x5e, 0xe9, 0x5e, 0xcc, 0xeb, 0x34, 0x5e,
 	0xb0, 0xf3, 0xfd, 0x97, 0xec, 0xdb, 0xec, 0x4b, 0x33, 0x5e, 0xb0, 0x84, 0x64, 0xfd, 0x56, 0xf6,
-	0x0c, 0xbc, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x16, 0x74, 0x5e, 0x95, 0x04, 0x00, 0x00,
+	0x0c, 0xbc, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x29, 0x15, 0x04, 0x95, 0x04, 0x00, 0x00,
 }
 
 func (m *GetSwapFeeQueryMsg) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
index 78047a05915..2d43f396e84 100644
--- a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
+++ b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go
@@ -242,7 +242,7 @@ var fileDescriptor_361e9d7404cffed5 = []byte{
 	// 303 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0x41, 0x4b, 0xf3, 0x40,
 	0x10, 0x86, 0x13, 0xf8, 0xf8, 0xd0, 0x28, 0x1e, 0x8a, 0x07, 0x0d, 0x65, 0x95, 0x9c, 0x44, 0x70,
-	0x97, 0x28, 0x82, 0xe7, 0x42, 0x2e, 0x85, 0x82, 0xf4, 0xe8, 0xa5, 0x24, 0xe9, 0xb2, 0x6e, 0xc8,
+	0x97, 0x28, 0x88, 0xe7, 0x42, 0x2e, 0x85, 0x82, 0xf4, 0xe8, 0xa5, 0x24, 0xe9, 0xb2, 0x6e, 0xc8,
 	0x66, 0x62, 0x66, 0x53, 0xe3, 0xbf, 0xf0, 0x67, 0xf5, 0xd8, 0xa3, 0x27, 0x91, 0xe4, 0x8f, 0x48,
 	0x92, 0xad, 0x44, 0xa8, 0x5e, 0xbc, 0xed, 0x30, 0xfb, 0xce, 0xf3, 0xc0, 0xeb, 0xdc, 0x01, 0x2a,
 	0x40, 0x89, 0x2c, 0x06, 0x54, 0xcf, 0x21, 0xaa, 0x1c, 0x20, 0x65, 0x2b, 0x3f, 0xe2, 0x3a, 0xf4,
@@ -258,7 +258,7 @@ var fileDescriptor_361e9d7404cffed5 = []byte{
 	0x35, 0xb1, 0x3f, 0x6a, 0x62, 0xbf, 0x36, 0xc4, 0xda, 0x34, 0xc4, 0x7a, 0x6b, 0x88, 0xf5, 0x30,
 	0x15, 0x52, 0x3f, 0x96, 0x11, 0x8d, 0x41, 0x31, 0x43, 0xbf, 0x4a, 0xc3, 0x08, 0xb7, 0x03, 0x5b,
 	0xf9, 0xb7, 0xac, 0xfa, 0xde, 0xf4, 0x76, 0x60, 0x0a, 0xc5, 0xa0, 0xe8, 0xe8, 0x7f, 0x57, 0xc8,
-	0xcd, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xe4, 0x00, 0x58, 0x20, 0x02, 0x00, 0x00,
+	0xcd, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xd1, 0xd2, 0x1e, 0x20, 0x02, 0x00, 0x00,
 }
 
 func (m *EmptyRequest) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go
index 4da050271c3..6bf7b219a9b 100644
--- a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go
+++ b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	incentivetypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	tokenfactorytypes "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	incentivetypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	tokenfactorytypes "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 const (
diff --git a/x/cosmwasmpool/keeper.go b/x/cosmwasmpool/keeper.go
index 20e80b73615..fc211d4ab29 100644
--- a/x/cosmwasmpool/keeper.go
+++ b/x/cosmwasmpool/keeper.go
@@ -4,8 +4,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
diff --git a/x/cosmwasmpool/model/codec.go b/x/cosmwasmpool/model/codec.go
index 9ef91d1b5d4..d64b01cfcbc 100644
--- a/x/cosmwasmpool/model/codec.go
+++ b/x/cosmwasmpool/model/codec.go
@@ -8,8 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func RegisterCodec(cdc *codec.LegacyAmino) {
diff --git a/x/cosmwasmpool/model/msgs.go b/x/cosmwasmpool/model/msgs.go
index f1900a3360f..6749b2fec27 100644
--- a/x/cosmwasmpool/model/msgs.go
+++ b/x/cosmwasmpool/model/msgs.go
@@ -7,8 +7,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // constants.
diff --git a/x/cosmwasmpool/model/pool.go b/x/cosmwasmpool/model/pool.go
index 5b160551484..d6b849f8e2f 100644
--- a/x/cosmwasmpool/model/pool.go
+++ b/x/cosmwasmpool/model/pool.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	cosmwasmutils "github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
 )
diff --git a/x/cosmwasmpool/model/pool.pb.go b/x/cosmwasmpool/model/pool.pb.go
index 7a123512e8a..66e0854e365 100644
--- a/x/cosmwasmpool/model/pool.pb.go
+++ b/x/cosmwasmpool/model/pool.pb.go
@@ -76,7 +76,7 @@ var fileDescriptor_a0cb64564a744af1 = []byte{
 	// 350 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0x4f, 0x4a, 0xc3, 0x40,
 	0x14, 0xc6, 0x33, 0x5a, 0x2b, 0x86, 0x62, 0x35, 0x88, 0xad, 0x55, 0x92, 0x92, 0x55, 0x37, 0xcd,
-	0x50, 0x44, 0x90, 0xee, 0x6c, 0x41, 0xe8, 0x42, 0x90, 0x6c, 0x04, 0x37, 0x61, 0xf2, 0xc7, 0x18,
+	0x50, 0x04, 0x91, 0xee, 0x6c, 0x41, 0xe8, 0x42, 0x90, 0x6c, 0x04, 0x37, 0x61, 0xf2, 0xc7, 0x18,
 	0xc8, 0xf4, 0x95, 0xbe, 0x69, 0xd5, 0x1b, 0xb8, 0x74, 0xe9, 0xb2, 0x87, 0xf0, 0x10, 0xe2, 0xaa,
 	0x4b, 0x57, 0xa5, 0xb4, 0x37, 0xe8, 0x09, 0x64, 0x32, 0x29, 0xd4, 0xee, 0xf2, 0xfd, 0xbe, 0x5f,
 	0x98, 0x99, 0xf7, 0xf4, 0x26, 0x20, 0x07, 0x4c, 0x90, 0x06, 0x80, 0xfc, 0x85, 0x21, 0x1f, 0x00,
@@ -95,7 +95,7 @@ var fileDescriptor_a0cb64564a744af1 = []byte{
 	0x4c, 0x17, 0x26, 0x99, 0x2f, 0x4c, 0xf2, 0xb1, 0x34, 0xb5, 0xe9, 0xd2, 0xd4, 0x7e, 0x97, 0xa6,
 	0xf6, 0x78, 0x1d, 0x27, 0xe2, 0x79, 0xe4, 0x3b, 0x01, 0x70, 0x9a, 0xcf, 0xbd, 0x99, 0x32, 0x1f,
 	0xd7, 0x81, 0x8e, 0x5b, 0x57, 0xf4, 0xf5, 0xff, 0xe6, 0xb2, 0x8d, 0xf9, 0xc5, 0x6c, 0x7a, 0x97,
-	0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0x0f, 0xd2, 0x50, 0xde, 0x01, 0x00, 0x00,
+	0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x51, 0x2a, 0x73, 0x14, 0xde, 0x01, 0x00, 0x00,
 }
 
 func (m *CosmWasmPool) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/model/pool_test.go b/x/cosmwasmpool/model/pool_test.go
index dfce36aab3e..7ef3742ef45 100644
--- a/x/cosmwasmpool/model/pool_test.go
+++ b/x/cosmwasmpool/model/pool_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 )
 
 type CosmWasmPoolSuite struct {
diff --git a/x/cosmwasmpool/model/store_model.go b/x/cosmwasmpool/model/store_model.go
index a4684376127..c1acdc96177 100644
--- a/x/cosmwasmpool/model/store_model.go
+++ b/x/cosmwasmpool/model/store_model.go
@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/cosmwasmpool/model/tx.pb.go b/x/cosmwasmpool/model/tx.pb.go
index 083641a63e3..7d139c6f3d1 100644
--- a/x/cosmwasmpool/model/tx.pb.go
+++ b/x/cosmwasmpool/model/tx.pb.go
@@ -148,7 +148,7 @@ var fileDescriptor_2ff1ac8555d314d1 = []byte{
 	// 380 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8a, 0xd3, 0x50,
 	0x14, 0xc6, 0x7b, 0x55, 0x52, 0xbc, 0x68, 0xc5, 0x8b, 0x4a, 0x09, 0x9a, 0x94, 0xb8, 0xa9, 0x14,
-	0x73, 0xa9, 0x45, 0x10, 0xdd, 0xa5, 0xdd, 0x74, 0x51, 0x90, 0x6c, 0x04, 0x37, 0xe5, 0x26, 0xb9,
+	0x73, 0xa9, 0x05, 0x11, 0xdd, 0xa5, 0xdd, 0x74, 0x51, 0x90, 0x6c, 0x04, 0x37, 0xe5, 0x26, 0xb9,
 	0xc4, 0x40, 0x6e, 0x4e, 0xc9, 0xb9, 0xd6, 0xfa, 0x02, 0xae, 0xdd, 0xf8, 0x26, 0x3e, 0xc4, 0x2c,
 	0xbb, 0x9c, 0x55, 0x18, 0xd2, 0x37, 0xe8, 0x13, 0x0c, 0xf9, 0xd3, 0x99, 0xce, 0x50, 0x66, 0x31,
 	0xbb, 0x93, 0x73, 0x7e, 0xdf, 0xc9, 0xc7, 0x77, 0x0f, 0x1d, 0x01, 0x2a, 0xc0, 0x04, 0x79, 0x08,
@@ -169,7 +169,7 @@ var fileDescriptor_2ff1ac8555d314d1 = []byte{
 	0x8b, 0xd2, 0x22, 0x7f, 0x77, 0x56, 0x67, 0xbb, 0xb3, 0x3a, 0xe7, 0x3b, 0xab, 0xf3, 0xfd, 0x53,
 	0x9c, 0xe8, 0x1f, 0x3f, 0x03, 0x37, 0x04, 0xc5, 0xdb, 0x1f, 0xbc, 0x4f, 0x45, 0x80, 0x87, 0x0f,
 	0xbe, 0x1e, 0x7f, 0xe4, 0x9b, 0x9b, 0xd7, 0x54, 0x5f, 0x51, 0x60, 0xd4, 0xef, 0x3d, 0xb9, 0x0c,
-	0x00, 0x00, 0xff, 0xff, 0x02, 0x25, 0xec, 0x43, 0x72, 0x02, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x1a, 0x00, 0x4d, 0x07, 0x72, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/cosmwasmpool/module/module.go b/x/cosmwasmpool/module/module.go
index 868c3cd0e5a..10104127f13 100644
--- a/x/cosmwasmpool/module/module.go
+++ b/x/cosmwasmpool/module/module.go
@@ -15,13 +15,13 @@ import (
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	cosmwasmpool "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool"
-	moduleclient "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	cosmwasmpool "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool"
+	moduleclient "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 )
 
 var (
diff --git a/x/cosmwasmpool/msg_server.go b/x/cosmwasmpool/msg_server.go
index c71687c96a4..777e02f402a 100644
--- a/x/cosmwasmpool/msg_server.go
+++ b/x/cosmwasmpool/msg_server.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 )
 
 type msgServer struct {
diff --git a/x/cosmwasmpool/pool_module.go b/x/cosmwasmpool/pool_module.go
index b36e286ec26..edac3570b33 100644
--- a/x/cosmwasmpool/pool_module.go
+++ b/x/cosmwasmpool/pool_module.go
@@ -5,10 +5,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/cosmwasm/msg"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/cosmwasm/msg"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/cosmwasm"
 )
diff --git a/x/cosmwasmpool/pool_module_test.go b/x/cosmwasmpool/pool_module_test.go
index 25933c29466..f4ea5bf7728 100644
--- a/x/cosmwasmpool/pool_module_test.go
+++ b/x/cosmwasmpool/pool_module_test.go
@@ -7,11 +7,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/cosmwasmpool/store.go b/x/cosmwasmpool/store.go
index 870c466652d..f33eb23ed73 100644
--- a/x/cosmwasmpool/store.go
+++ b/x/cosmwasmpool/store.go
@@ -4,8 +4,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/types"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/types"
 )
 
 // SetPool stores the given pool in state.
diff --git a/x/cosmwasmpool/types/expected_keepers.go b/x/cosmwasmpool/types/expected_keepers.go
index bbf5e035902..8a99b778d1b 100644
--- a/x/cosmwasmpool/types/expected_keepers.go
+++ b/x/cosmwasmpool/types/expected_keepers.go
@@ -3,7 +3,7 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // AccountKeeper defines the contract needed for AccountKeeper related APIs.
diff --git a/x/cosmwasmpool/types/genesis.pb.go b/x/cosmwasmpool/types/genesis.pb.go
index f76c463d123..87b5901c0a9 100644
--- a/x/cosmwasmpool/types/genesis.pb.go
+++ b/x/cosmwasmpool/types/genesis.pb.go
@@ -123,7 +123,7 @@ var fileDescriptor_8fd7fc7fdf8fd2f4 = []byte{
 	// 266 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4b, 0xf5, 0x30,
 	0x14, 0x86, 0x5b, 0xf8, 0x28, 0x1f, 0xd5, 0xe9, 0xe2, 0xa0, 0x17, 0x89, 0x72, 0x71, 0x10, 0xc1,
-	0x1c, 0xaa, 0x08, 0xce, 0x5d, 0x5c, 0xa5, 0x6e, 0x2e, 0x92, 0xd4, 0x18, 0x0b, 0x4d, 0x4f, 0xe9,
+	0x1c, 0xaa, 0x20, 0xce, 0x5d, 0x5c, 0xa5, 0x6e, 0x2e, 0x92, 0xd4, 0x18, 0x0b, 0x4d, 0x4f, 0xe9,
 	0x49, 0xaf, 0xde, 0x7f, 0xe1, 0xcf, 0xba, 0xe3, 0x1d, 0x9d, 0x44, 0xda, 0x3f, 0x22, 0x26, 0xa9,
 	0xa8, 0x83, 0x5b, 0x0e, 0xcf, 0xf3, 0xbe, 0x9c, 0x93, 0xf4, 0x04, 0xc9, 0x20, 0x55, 0x04, 0x25,
 	0x92, 0x79, 0x12, 0x64, 0x5a, 0xc4, 0x1a, 0x96, 0x99, 0x54, 0x56, 0x64, 0xa0, 0x55, 0xa3, 0xa8,
@@ -137,7 +137,7 @@ var fileDescriptor_8fd7fc7fdf8fd2f4 = []byte{
 	0x16, 0xbf, 0x0f, 0x2c, 0x7e, 0x19, 0x59, 0xb4, 0x19, 0x59, 0xf4, 0x3a, 0xb2, 0xe8, 0xf6, 0x52,
 	0x57, 0xf6, 0xb1, 0x97, 0xbc, 0x44, 0x03, 0xa1, 0xf7, 0xb4, 0x16, 0x92, 0xa6, 0x01, 0x96, 0xd9,
 	0x05, 0x3c, 0xff, 0xfc, 0x6b, 0xbb, 0x6a, 0x15, 0xc9, 0xc4, 0x2d, 0x7e, 0xfe, 0x11, 0x00, 0x00,
-	0xff, 0xff, 0x2a, 0xff, 0xde, 0x88, 0x90, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x32, 0xda, 0x7f, 0xcc, 0x90, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/cosmwasmpool/types/pool.go b/x/cosmwasmpool/types/pool.go
index 29cd83a24ef..e151b5af207 100644
--- a/x/cosmwasmpool/types/pool.go
+++ b/x/cosmwasmpool/types/pool.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // CosmWasmExtension
diff --git a/x/cosmwasmpool/types/tx.pb.go b/x/cosmwasmpool/types/tx.pb.go
index 90fa2b27992..44044d40c31 100644
--- a/x/cosmwasmpool/types/tx.pb.go
+++ b/x/cosmwasmpool/types/tx.pb.go
@@ -40,8 +40,8 @@ var fileDescriptor_93020a1fe95e1be8 = []byte{
 	0xa7, 0x3b, 0x05, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c,
 	0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a,
 	0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x7e, 0xdd, 0x9c, 0xc4, 0xa4,
-	0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x54, 0xbf, 0x02, 0xd5, 0xe5, 0x25, 0x95, 0x05, 0xa9, 0xc5,
-	0x49, 0x6c, 0x60, 0x1b, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xc4, 0x73, 0x71, 0xde,
+	0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x4c, 0xbf, 0x02, 0xd5, 0xe5, 0x25, 0x95, 0x05, 0xa9, 0xc5,
+	0x49, 0x6c, 0x60, 0x1b, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x46, 0xe1, 0xd2, 0x35, 0xde,
 	0x00, 0x00, 0x00,
 }
 
diff --git a/x/downtime-detector/abci.go b/x/downtime-detector/abci.go
index 98e89b7e9c9..2107d1b26ff 100644
--- a/x/downtime-detector/abci.go
+++ b/x/downtime-detector/abci.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func (k *Keeper) BeginBlock(ctx sdk.Context) {
diff --git a/x/downtime-detector/client/cli/query.go b/x/downtime-detector/client/cli/query.go
index f6cc65832bf..3725e19aabb 100644
--- a/x/downtime-detector/client/cli/query.go
+++ b/x/downtime-detector/client/cli/query.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func GetQueryCmd() *cobra.Command {
diff --git a/x/downtime-detector/client/cli/query_test.go b/x/downtime-detector/client/cli/query_test.go
index 77b62680453..08625fd1cc5 100644
--- a/x/downtime-detector/client/cli/query_test.go
+++ b/x/downtime-detector/client/cli/query_test.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 // We test the custom duration parser via this
diff --git a/x/downtime-detector/client/grpc/grpc_query.go b/x/downtime-detector/client/grpc/grpc_query.go
index 8e22159fab9..0dfcf8e265e 100644
--- a/x/downtime-detector/client/grpc/grpc_query.go
+++ b/x/downtime-detector/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/downtime-detector/client/query_proto_wrap.go b/x/downtime-detector/client/query_proto_wrap.go
index 3c76cacc378..a2f95ce33cc 100644
--- a/x/downtime-detector/client/query_proto_wrap.go
+++ b/x/downtime-detector/client/query_proto_wrap.go
@@ -3,8 +3,8 @@ package client
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	downtimedetector "github.com/osmosis-labs/osmosis/v15/x/downtime-detector"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
+	downtimedetector "github.com/osmosis-labs/osmosis/v16/x/downtime-detector"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/downtime-detector/client/queryproto/query.pb.go b/x/downtime-detector/client/queryproto/query.pb.go
index d63ae6cb431..a9b5a097b0c 100644
--- a/x/downtime-detector/client/queryproto/query.pb.go
+++ b/x/downtime-detector/client/queryproto/query.pb.go
@@ -15,7 +15,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -151,34 +151,34 @@ var fileDescriptor_b748b3d07fa8b8cb = []byte{
 	// 483 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4f, 0x8b, 0xd3, 0x40,
 	0x14, 0x6f, 0x0a, 0xca, 0x12, 0x41, 0x21, 0xae, 0xd0, 0x2d, 0x92, 0x94, 0xa0, 0xb2, 0x2c, 0x74,
-	0x86, 0x76, 0xf1, 0xa0, 0x37, 0xeb, 0x82, 0x2e, 0x08, 0x62, 0xbc, 0x29, 0x52, 0x26, 0xd3, 0xd7,
-	0xec, 0x40, 0x32, 0x93, 0xcd, 0x4c, 0xaa, 0xb9, 0x7a, 0xf2, 0x28, 0x78, 0xf1, 0x23, 0xed, 0x71,
-	0xc1, 0x8b, 0xa7, 0xaa, 0xad, 0x9f, 0x60, 0x3f, 0x80, 0x48, 0x32, 0x99, 0x50, 0x8a, 0x6c, 0x16,
-	0x3c, 0x25, 0xc3, 0xef, 0xcf, 0x7b, 0xbf, 0xf7, 0x66, 0xec, 0xa1, 0x90, 0x89, 0x90, 0x4c, 0xe2,
-	0x99, 0x78, 0xcf, 0x15, 0x4b, 0x60, 0x38, 0x03, 0x05, 0x54, 0x89, 0x0c, 0x2f, 0x46, 0x21, 0x28,
-	0x32, 0xc2, 0xa7, 0x39, 0x64, 0x05, 0x4a, 0x33, 0xa1, 0x84, 0x33, 0xa8, 0xe9, 0xc8, 0xd0, 0x0d,
-	0x1b, 0xd5, 0xec, 0xfe, 0x6e, 0x24, 0x22, 0x51, 0x91, 0x71, 0xf9, 0xa7, 0x75, 0x7d, 0xdc, 0x5e,
-	0x26, 0x02, 0x0e, 0xa5, 0xb3, 0x16, 0x3c, 0x6a, 0x17, 0x18, 0x64, 0x3a, 0xcb, 0x33, 0xa2, 0x98,
-	0xe0, 0xb5, 0xd4, 0xa5, 0x95, 0x16, 0x87, 0x44, 0x42, 0x43, 0xa6, 0x82, 0x19, 0xfc, 0x60, 0x13,
-	0xaf, 0xc2, 0x35, 0xac, 0x94, 0x44, 0x8c, 0x6f, 0x7a, 0xdd, 0x8d, 0x84, 0x88, 0x62, 0xc0, 0x24,
-	0x65, 0x98, 0x70, 0x2e, 0x54, 0x05, 0x9a, 0x26, 0xf7, 0x6a, 0xb4, 0x3a, 0x85, 0xf9, 0x1c, 0x13,
-	0x5e, 0x18, 0x48, 0x17, 0x99, 0xea, 0x49, 0xe8, 0x83, 0xe9, 0x6f, 0x5b, 0xb5, 0xd5, 0xbf, 0xb7,
-	0x8d, 0x97, 0x21, 0xa5, 0x22, 0x49, 0xaa, 0x09, 0xfe, 0x2f, 0xcb, 0xbe, 0x1f, 0x00, 0x15, 0x0b,
-	0xc8, 0x60, 0xf6, 0x9a, 0x71, 0x0a, 0x47, 0xf5, 0x28, 0x5e, 0xce, 0x5f, 0x00, 0x8f, 0xd4, 0x49,
-	0x00, 0xa7, 0x39, 0x48, 0xe5, 0xbc, 0xb5, 0x77, 0xcc, 0x94, 0x7a, 0xd6, 0xc0, 0xda, 0xbf, 0x39,
-	0x3e, 0x40, 0x6d, 0x1b, 0x44, 0xc6, 0x6c, 0x72, 0xfb, 0x62, 0xe9, 0xdd, 0x2a, 0x48, 0x12, 0x3f,
-	0xf6, 0x0d, 0xd9, 0x0f, 0x1a, 0xc3, 0xd2, 0x3c, 0xd3, 0x5d, 0x14, 0xbd, 0xee, 0xc0, 0xda, 0xbf,
-	0x31, 0xde, 0x43, 0xba, 0x75, 0x64, 0x5a, 0x47, 0x47, 0x75, 0xb4, 0xc9, 0xbd, 0xb3, 0xa5, 0xd7,
-	0xb9, 0x58, 0x7a, 0x3d, 0xed, 0x67, 0x84, 0xcd, 0xee, 0xfc, 0xaf, 0x3f, 0x3c, 0x2b, 0x68, 0x0c,
-	0xfd, 0x77, 0xf6, 0x83, 0xb6, 0x88, 0x32, 0x15, 0x5c, 0x82, 0x73, 0x68, 0xdf, 0x91, 0x39, 0xa5,
-	0x20, 0xe7, 0x79, 0x1c, 0x17, 0xd3, 0xcc, 0xa8, 0xaa, 0xc0, 0x3b, 0xc1, 0xee, 0x06, 0xd8, 0x38,
-	0x8e, 0x3f, 0x75, 0xed, 0x6b, 0xaf, 0xca, 0xd5, 0x3b, 0x7f, 0x2c, 0xdb, 0xbd, 0xbc, 0x92, 0xf3,
-	0xac, 0x7d, 0x66, 0x57, 0x5a, 0x47, 0xff, 0xf9, 0xff, 0x1b, 0xe9, 0xd0, 0xfe, 0xf1, 0xc7, 0x6f,
-	0xbf, 0xbf, 0x74, 0x9f, 0x3a, 0x4f, 0xae, 0xf0, 0xb0, 0x2e, 0xb7, 0x9c, 0xd0, 0xb3, 0x95, 0x6b,
-	0x9d, 0xaf, 0x5c, 0xeb, 0xe7, 0xca, 0xb5, 0x3e, 0xaf, 0xdd, 0xce, 0xf9, 0xda, 0xed, 0x7c, 0x5f,
-	0xbb, 0x9d, 0x37, 0xc7, 0x11, 0x53, 0x27, 0x79, 0x88, 0xa8, 0x48, 0x4c, 0x99, 0x61, 0x4c, 0x42,
-	0xd9, 0xd4, 0x5c, 0x8c, 0x1e, 0xe2, 0x0f, 0xff, 0xa8, 0x4c, 0x63, 0x06, 0x5c, 0xe9, 0xb7, 0xa5,
-	0xaf, 0xc2, 0xf5, 0xea, 0x73, 0xf8, 0x37, 0x00, 0x00, 0xff, 0xff, 0x37, 0x7b, 0xdc, 0x99, 0x6f,
+	0x86, 0x76, 0x41, 0xd0, 0x9b, 0x75, 0x41, 0x17, 0x04, 0x31, 0xde, 0x14, 0x29, 0x93, 0xe9, 0x6b,
+	0x76, 0x20, 0x99, 0xc9, 0x66, 0x26, 0xd5, 0x5c, 0x3d, 0x79, 0x14, 0xbc, 0xf8, 0x91, 0xf6, 0xb8,
+	0xe0, 0xc5, 0x53, 0xd5, 0xd6, 0x4f, 0xb0, 0x1f, 0x40, 0x24, 0x99, 0x4c, 0x28, 0x45, 0x36, 0x0b,
+	0x9e, 0x92, 0xe1, 0xf7, 0xe7, 0xbd, 0xdf, 0x7b, 0x33, 0xf6, 0x50, 0xc8, 0x44, 0x48, 0x26, 0xf1,
+	0x4c, 0xbc, 0xe7, 0x8a, 0x25, 0x30, 0x9c, 0x81, 0x02, 0xaa, 0x44, 0x86, 0x17, 0xa3, 0x10, 0x14,
+	0x19, 0xe1, 0xd3, 0x1c, 0xb2, 0x02, 0xa5, 0x99, 0x50, 0xc2, 0x19, 0xd4, 0x74, 0x64, 0xe8, 0x86,
+	0x8d, 0x6a, 0x76, 0x7f, 0x37, 0x12, 0x91, 0xa8, 0xc8, 0xb8, 0xfc, 0xd3, 0xba, 0x3e, 0x6e, 0x2f,
+	0x13, 0x01, 0x87, 0xd2, 0x59, 0x0b, 0x1e, 0xb5, 0x0b, 0x0c, 0x32, 0x9d, 0xe5, 0x19, 0x51, 0x4c,
+	0xf0, 0x5a, 0xea, 0xd2, 0x4a, 0x8b, 0x43, 0x22, 0xa1, 0x21, 0x53, 0xc1, 0x0c, 0x7e, 0xb0, 0x89,
+	0x57, 0xe1, 0x1a, 0x56, 0x4a, 0x22, 0xc6, 0x37, 0xbd, 0xee, 0x46, 0x42, 0x44, 0x31, 0x60, 0x92,
+	0x32, 0x4c, 0x38, 0x17, 0xaa, 0x02, 0x4d, 0x93, 0x7b, 0x35, 0x5a, 0x9d, 0xc2, 0x7c, 0x8e, 0x09,
+	0x2f, 0x0c, 0xa4, 0x8b, 0x4c, 0xf5, 0x24, 0xf4, 0xc1, 0xf4, 0xb7, 0xad, 0xda, 0xea, 0xdf, 0xdb,
+	0xc6, 0xcb, 0x90, 0x52, 0x91, 0x24, 0xd5, 0x04, 0xff, 0x97, 0x65, 0xdf, 0x0f, 0x80, 0x8a, 0x05,
+	0x64, 0x30, 0x7b, 0xcd, 0x38, 0x85, 0xa3, 0x7a, 0x14, 0x2f, 0xe7, 0x2f, 0x80, 0x47, 0xea, 0x24,
+	0x80, 0xd3, 0x1c, 0xa4, 0x72, 0xde, 0xda, 0x3b, 0x66, 0x4a, 0x3d, 0x6b, 0x60, 0xed, 0xdf, 0x1c,
+	0x1f, 0xa0, 0xb6, 0x0d, 0x22, 0x63, 0x36, 0xb9, 0x7d, 0xb1, 0xf4, 0x6e, 0x15, 0x24, 0x89, 0x1f,
+	0xfb, 0x86, 0xec, 0x07, 0x8d, 0x61, 0x69, 0x9e, 0xe9, 0x2e, 0x8a, 0x5e, 0x77, 0x60, 0xed, 0xdf,
+	0x18, 0xef, 0x21, 0xdd, 0x3a, 0x32, 0xad, 0xa3, 0xa3, 0x3a, 0xda, 0xe4, 0xde, 0xd9, 0xd2, 0xeb,
+	0x5c, 0x2c, 0xbd, 0x9e, 0xf6, 0x33, 0xc2, 0x66, 0x77, 0xfe, 0xd7, 0x1f, 0x9e, 0x15, 0x34, 0x86,
+	0xfe, 0x3b, 0xfb, 0x41, 0x5b, 0x44, 0x99, 0x0a, 0x2e, 0xc1, 0x39, 0xb4, 0xef, 0xc8, 0x9c, 0x52,
+	0x90, 0xf3, 0x3c, 0x8e, 0x8b, 0x69, 0x66, 0x54, 0x55, 0xe0, 0x9d, 0x60, 0x77, 0x03, 0x6c, 0x1c,
+	0xc7, 0x9f, 0xba, 0xf6, 0xb5, 0x57, 0xe5, 0xea, 0x9d, 0x3f, 0x96, 0xed, 0x5e, 0x5e, 0xc9, 0x79,
+	0xd6, 0x3e, 0xb3, 0x2b, 0xad, 0xa3, 0xff, 0xfc, 0xff, 0x8d, 0x74, 0x68, 0xff, 0xf8, 0xe3, 0xb7,
+	0xdf, 0x5f, 0xba, 0x4f, 0x9d, 0x27, 0x57, 0x78, 0x58, 0x97, 0x5b, 0x4e, 0xe8, 0xd9, 0xca, 0xb5,
+	0xce, 0x57, 0xae, 0xf5, 0x73, 0xe5, 0x5a, 0x9f, 0xd7, 0x6e, 0xe7, 0x7c, 0xed, 0x76, 0xbe, 0xaf,
+	0xdd, 0xce, 0x9b, 0xe3, 0x88, 0xa9, 0x93, 0x3c, 0x44, 0x54, 0x24, 0xa6, 0xcc, 0x30, 0x26, 0xa1,
+	0x6c, 0x6a, 0x2e, 0x46, 0x0f, 0xf1, 0x87, 0x7f, 0x54, 0xa6, 0x31, 0x03, 0xae, 0xf4, 0xdb, 0xd2,
+	0x57, 0xe1, 0x7a, 0xf5, 0x39, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x98, 0x66, 0x57, 0x22, 0x6f,
 	0x04, 0x00, 0x00,
 }
 
diff --git a/x/downtime-detector/genesis.go b/x/downtime-detector/genesis.go
index ffe035bb470..6c4e8f2bf3e 100644
--- a/x/downtime-detector/genesis.go
+++ b/x/downtime-detector/genesis.go
@@ -3,7 +3,7 @@ package downtimedetector
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func (k *Keeper) InitGenesis(ctx sdk.Context, gen *types.GenesisState) {
diff --git a/x/downtime-detector/genesis_test.go b/x/downtime-detector/genesis_test.go
index 110c2e87d1a..192881b0faa 100644
--- a/x/downtime-detector/genesis_test.go
+++ b/x/downtime-detector/genesis_test.go
@@ -3,7 +3,7 @@ package downtimedetector_test
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func (s *KeeperTestSuite) TestImportExport() {
diff --git a/x/downtime-detector/keeper_test.go b/x/downtime-detector/keeper_test.go
index 20a46d1cb9a..7b6dd4c55f5 100644
--- a/x/downtime-detector/keeper_test.go
+++ b/x/downtime-detector/keeper_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 var (
diff --git a/x/downtime-detector/module/module.go b/x/downtime-detector/module/module.go
index 2179ce12fcc..b1d0ac10b0c 100644
--- a/x/downtime-detector/module/module.go
+++ b/x/downtime-detector/module/module.go
@@ -16,12 +16,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	downtimedetector "github.com/osmosis-labs/osmosis/v15/x/downtime-detector"
-	downtimeclient "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client"
-	downtimecli "github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	downtimedetector "github.com/osmosis-labs/osmosis/v16/x/downtime-detector"
+	downtimeclient "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client"
+	downtimecli "github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 var (
diff --git a/x/downtime-detector/query.go b/x/downtime-detector/query.go
index a3dc33e26dc..9a6425ce495 100644
--- a/x/downtime-detector/query.go
+++ b/x/downtime-detector/query.go
@@ -6,7 +6,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func (k *Keeper) RecoveredSinceDowntimeOfLength(ctx sdk.Context, downtime types.Downtime, recoveryDuration time.Duration) (bool, error) {
diff --git a/x/downtime-detector/store.go b/x/downtime-detector/store.go
index 397295789e5..b0bdaf5c3ba 100644
--- a/x/downtime-detector/store.go
+++ b/x/downtime-detector/store.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/downtime-detector/types"
+	"github.com/osmosis-labs/osmosis/v16/x/downtime-detector/types"
 )
 
 func (k *Keeper) GetLastBlockTime(ctx sdk.Context) (time.Time, error) {
diff --git a/x/downtime-detector/types/downtime_duration.pb.go b/x/downtime-detector/types/downtime_duration.pb.go
index af47df12570..faafdcf46bc 100644
--- a/x/downtime-detector/types/downtime_duration.pb.go
+++ b/x/downtime-detector/types/downtime_duration.pb.go
@@ -127,30 +127,30 @@ func init() {
 }
 
 var fileDescriptor_21a1969f22fb2a7e = []byte{
-	// 386 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x3d, 0x6f, 0xe2, 0x40,
-	0x10, 0x86, 0xed, 0xe3, 0x8e, 0xe3, 0x0c, 0x1c, 0x83, 0x8f, 0xfb, 0xa2, 0xf0, 0x5d, 0x1d, 0x09,
-	0xaf, 0x6d, 0x30, 0x82, 0x22, 0x45, 0x22, 0x8a, 0x4d, 0xb1, 0x89, 0x94, 0x0f, 0x45, 0x4a, 0x63,
-	0xd9, 0xe0, 0x38, 0x96, 0x30, 0x8b, 0xf0, 0x42, 0xc2, 0xbf, 0xc8, 0x6f, 0x4a, 0x95, 0x92, 0x32,
-	0x65, 0x04, 0x7f, 0x24, 0xc2, 0x1f, 0x44, 0x83, 0xd2, 0x79, 0x9e, 0x99, 0xd7, 0xfb, 0xbe, 0xa3,
-	0x51, 0xfa, 0x3c, 0x8e, 0x78, 0x1c, 0xc6, 0x64, 0xc4, 0xef, 0x27, 0x22, 0x8c, 0xfc, 0xd6, 0xc8,
-	0x17, 0xfe, 0x50, 0xf0, 0x19, 0x59, 0x98, 0x9e, 0x2f, 0x5c, 0x73, 0xd7, 0x71, 0x46, 0xf3, 0x99,
-	0x2b, 0x42, 0x3e, 0xd1, 0xa7, 0x33, 0x2e, 0xb8, 0xfa, 0x3f, 0x93, 0xea, 0xf9, 0x40, 0xae, 0xd4,
-	0x33, 0x65, 0xb3, 0x11, 0xf0, 0x80, 0x27, 0xc3, 0x64, 0xfb, 0x95, 0xea, 0x9a, 0x7f, 0x03, 0xce,
-	0x83, 0xb1, 0x4f, 0x92, 0xca, 0x9b, 0xdf, 0x12, 0x77, 0xb2, 0xcc, 0x5b, 0xc3, 0xe4, 0x9f, 0x4e,
-	0xaa, 0x49, 0x8b, 0xac, 0xa5, 0xed, 0xab, 0xb0, 0x9b, 0xe6, 0xbf, 0xfd, 0xfe, 0xd6, 0x51, 0x2c,
-	0xdc, 0x68, 0x9a, 0x0e, 0x1c, 0x3c, 0x15, 0x94, 0xd2, 0x20, 0x73, 0xaa, 0x82, 0x52, 0x19, 0x5c,
-	0x9d, 0x1f, 0x5d, 0x9e, 0x9c, 0x9d, 0x3a, 0x6d, 0xe3, 0x02, 0x24, 0xb5, 0xa6, 0x94, 0x77, 0xc4,
-	0x64, 0x20, 0x23, 0x60, 0x31, 0xf8, 0x84, 0x40, 0x9b, 0x41, 0x01, 0x81, 0x0e, 0x83, 0xcf, 0x08,
-	0xd8, 0x0c, 0xbe, 0xa0, 0x67, 0x4c, 0x83, 0x41, 0x11, 0x11, 0xcb, 0x60, 0xf0, 0x75, 0xcf, 0x0a,
-	0x83, 0x12, 0x22, 0x1d, 0x83, 0xc1, 0x37, 0x44, 0x6c, 0x83, 0x81, 0x82, 0xed, 0x52, 0x28, 0xab,
-	0x75, 0xa5, 0xfa, 0x0e, 0x1c, 0x9b, 0x42, 0x05, 0x27, 0xa0, 0x50, 0x45, 0x33, 0xd6, 0x76, 0xe6,
-	0x3b, 0x0e, 0x45, 0xa1, 0x86, 0x43, 0x51, 0x00, 0x1c, 0x8a, 0x42, 0x1d, 0x81, 0x2e, 0x05, 0x15,
-	0x81, 0x3e, 0x85, 0x1f, 0x38, 0xb6, 0x45, 0xa1, 0x81, 0x49, 0x8f, 0xc2, 0x4f, 0xbc, 0x88, 0x0e,
-	0x85, 0x5f, 0x78, 0x11, 0x5d, 0x0a, 0xbf, 0xf1, 0x22, 0x7a, 0x14, 0xfe, 0x1c, 0x5f, 0x3f, 0xaf,
-	0x35, 0x79, 0xb5, 0xd6, 0xe4, 0xd7, 0xb5, 0x26, 0x3f, 0x6e, 0x34, 0x69, 0xb5, 0xd1, 0xa4, 0x97,
-	0x8d, 0x26, 0xdd, 0x1c, 0x06, 0xa1, 0xb8, 0x9b, 0x7b, 0xfa, 0x90, 0x47, 0x24, 0x3b, 0xcc, 0xd6,
-	0xd8, 0xf5, 0xe2, 0xbc, 0x20, 0x0b, 0xd3, 0x26, 0x0f, 0x1f, 0x9c, 0xb9, 0x58, 0x4e, 0xfd, 0xd8,
-	0x2b, 0x26, 0x47, 0xd2, 0x7e, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x51, 0xea, 0x63, 0x10, 0x03,
-	0x00, 0x00,
+	// 387 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x4d, 0x4f, 0xe2, 0x50,
+	0x14, 0x86, 0xdb, 0x61, 0x86, 0x61, 0x0a, 0x0c, 0x87, 0x0e, 0x33, 0xa3, 0x2c, 0xaa, 0x6b, 0x13,
+	0x7a, 0xdb, 0xf2, 0x11, 0x58, 0xb8, 0xd0, 0xb0, 0xb8, 0x2e, 0xae, 0x26, 0x7e, 0xc4, 0xc4, 0x4d,
+	0xd3, 0x42, 0xad, 0x4d, 0x28, 0x97, 0xd0, 0x0b, 0xca, 0xbf, 0xf0, 0x37, 0xb9, 0x72, 0xc9, 0xd2,
+	0xa5, 0x81, 0x3f, 0x62, 0xe8, 0x07, 0xe6, 0x10, 0x77, 0x3d, 0xcf, 0x39, 0x6f, 0xef, 0xfb, 0x9e,
+	0x1c, 0xa5, 0xc7, 0xa3, 0x90, 0x47, 0x41, 0x44, 0x86, 0xfc, 0x71, 0x2c, 0x82, 0xd0, 0x6b, 0x0c,
+	0x3d, 0xe1, 0x0d, 0x04, 0x9f, 0x92, 0xb9, 0xe9, 0x7a, 0xc2, 0x31, 0xb7, 0x1d, 0x7b, 0x38, 0x9b,
+	0x3a, 0x22, 0xe0, 0x63, 0x7d, 0x32, 0xe5, 0x82, 0xab, 0x87, 0xa9, 0x54, 0xcf, 0x06, 0x32, 0xa5,
+	0x9e, 0x2a, 0xeb, 0x35, 0x9f, 0xfb, 0x3c, 0x1e, 0x26, 0x9b, 0xaf, 0x44, 0x57, 0xdf, 0xf7, 0x39,
+	0xf7, 0x47, 0x1e, 0x89, 0x2b, 0x77, 0x76, 0x4f, 0x9c, 0xf1, 0x22, 0x6b, 0x0d, 0xe2, 0x7f, 0xda,
+	0x89, 0x26, 0x29, 0xd2, 0x96, 0xb6, 0xab, 0xc2, 0x6e, 0xea, 0x07, 0xbb, 0xfd, 0x8d, 0xa3, 0x48,
+	0x38, 0xe1, 0x24, 0x19, 0x38, 0x7a, 0xc9, 0x29, 0x85, 0x7e, 0xea, 0x54, 0x05, 0xa5, 0xd4, 0xbf,
+	0xb9, 0x3c, 0xb9, 0x3e, 0xbb, 0x38, 0xb7, 0x9b, 0xc6, 0x15, 0x48, 0x6a, 0x45, 0x29, 0x6e, 0x89,
+	0xc9, 0x40, 0x46, 0xc0, 0x62, 0xf0, 0x0d, 0x81, 0x26, 0x83, 0x1c, 0x02, 0x2d, 0x06, 0xdf, 0x11,
+	0x68, 0x33, 0xf8, 0x81, 0x9e, 0x31, 0x0d, 0x06, 0x79, 0x44, 0x2c, 0x83, 0xc1, 0xcf, 0x1d, 0x2b,
+	0x0c, 0x0a, 0x88, 0xb4, 0x0c, 0x06, 0xbf, 0x10, 0x69, 0x1b, 0x0c, 0x14, 0x6c, 0x97, 0x42, 0x51,
+	0xad, 0x2a, 0xe5, 0x4f, 0x60, 0xb7, 0x29, 0x94, 0x70, 0x02, 0x0a, 0x65, 0x34, 0x63, 0x6d, 0x66,
+	0x7e, 0xe3, 0x50, 0x14, 0x2a, 0x38, 0x14, 0x05, 0xc0, 0xa1, 0x28, 0x54, 0x11, 0xe8, 0x50, 0x50,
+	0x11, 0xe8, 0x51, 0xf8, 0x83, 0x63, 0x5b, 0x14, 0x6a, 0x98, 0x74, 0x29, 0xfc, 0xc5, 0x8b, 0x68,
+	0x51, 0xf8, 0x87, 0x17, 0xd1, 0xa1, 0xf0, 0x1f, 0x2f, 0xa2, 0x4b, 0x61, 0xef, 0xf4, 0xf6, 0x75,
+	0xa5, 0xc9, 0xcb, 0x95, 0x26, 0xbf, 0xaf, 0x34, 0xf9, 0x79, 0xad, 0x49, 0xcb, 0xb5, 0x26, 0xbd,
+	0xad, 0x35, 0xe9, 0xee, 0xd8, 0x0f, 0xc4, 0xc3, 0xcc, 0xd5, 0x07, 0x3c, 0x24, 0xe9, 0x61, 0x36,
+	0x46, 0x8e, 0x1b, 0x65, 0x05, 0x99, 0x9b, 0x1d, 0xf2, 0xf4, 0xc5, 0x99, 0x8b, 0xc5, 0xc4, 0x8b,
+	0xdc, 0x7c, 0x7c, 0x24, 0xcd, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x22, 0x6f, 0x39, 0xe8, 0x10,
+	0x03, 0x00, 0x00,
 }
diff --git a/x/downtime-detector/types/genesis.pb.go b/x/downtime-detector/types/genesis.pb.go
index 51b033c8ce5..7686711e7bc 100644
--- a/x/downtime-detector/types/genesis.pb.go
+++ b/x/downtime-detector/types/genesis.pb.go
@@ -144,33 +144,33 @@ func init() {
 }
 
 var fileDescriptor_4581e137a44782af = []byte{
-	// 405 bytes of a gzipped FileDescriptorProto
+	// 404 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6a, 0xe2, 0x40,
 	0x1c, 0xc6, 0x33, 0xbb, 0xcb, 0xb2, 0x1b, 0xdd, 0x15, 0xb2, 0xb2, 0x58, 0x0f, 0x49, 0xc8, 0x49,
-	0x0a, 0xce, 0xa0, 0xa5, 0x85, 0x16, 0x7a, 0x09, 0x2d, 0xbd, 0xdb, 0x42, 0xc1, 0x1e, 0xc2, 0x24,
-	0x8e, 0x69, 0x68, 0x92, 0x91, 0xcc, 0x68, 0x9b, 0xb7, 0xf0, 0xb1, 0x3c, 0x4a, 0x0f, 0xa5, 0x27,
-	0x5b, 0xf4, 0x0d, 0x7c, 0x82, 0x92, 0x64, 0x46, 0xab, 0x08, 0xf6, 0x96, 0xcc, 0xff, 0xfb, 0x3e,
-	0xbe, 0xdf, 0x9f, 0xbf, 0x8a, 0x28, 0x8b, 0x28, 0x0b, 0x18, 0xea, 0xd1, 0xc7, 0x98, 0x07, 0x11,
-	0x69, 0xf6, 0x08, 0x27, 0x1e, 0xa7, 0x09, 0x1a, 0xb5, 0x5c, 0xc2, 0x71, 0x0b, 0xf9, 0x24, 0x26,
-	0x2c, 0x60, 0x70, 0x90, 0x50, 0x4e, 0x35, 0x53, 0x18, 0xa0, 0x34, 0x48, 0x3d, 0x14, 0xfa, 0x7a,
-	0xd5, 0xa7, 0x3e, 0xcd, 0xc5, 0x28, 0xfb, 0x2a, 0x7c, 0xf5, 0x03, 0x9f, 0x52, 0x3f, 0x24, 0x28,
-	0xff, 0x73, 0x87, 0x7d, 0x84, 0xe3, 0x54, 0x8e, 0xbc, 0x3c, 0xd3, 0x29, 0x3c, 0xc5, 0x8f, 0x18,
-	0xe9, 0xdb, 0xae, 0xde, 0x30, 0xc1, 0x3c, 0xa0, 0xb1, 0x98, 0x1b, 0xdb, 0xf3, 0xac, 0x11, 0xe3,
-	0x38, 0x1a, 0x08, 0xc1, 0xe9, 0x7e, 0x3e, 0x39, 0x71, 0x36, 0xb3, 0xad, 0x17, 0xa0, 0x56, 0xaf,
-	0x0a, 0xf6, 0x0b, 0x21, 0xb9, 0x8c, 0x79, 0x92, 0x6a, 0x77, 0xea, 0x2f, 0x29, 0xad, 0x01, 0x13,
-	0x34, 0xfe, 0xb6, 0x0f, 0xe1, 0xbe, 0xad, 0x40, 0x19, 0x61, 0xff, 0x5b, 0xce, 0x8c, 0x4a, 0x8a,
-	0xa3, 0xf0, 0xcc, 0x92, 0x29, 0x56, 0x67, 0x15, 0xa8, 0x61, 0xf5, 0x4f, 0x88, 0x19, 0x77, 0x64,
-	0x50, 0xed, 0x9b, 0x09, 0x1a, 0xa5, 0x76, 0x1d, 0x16, 0xa4, 0x50, 0x92, 0xc2, 0x1b, 0x49, 0x6a,
-	0x9b, 0x93, 0x99, 0xa1, 0x2c, 0x67, 0x46, 0xb5, 0x48, 0xdd, 0xb0, 0x5b, 0xe3, 0x37, 0x03, 0x74,
-	0xca, 0xd9, 0x9b, 0x6c, 0x60, 0x3d, 0x03, 0xb5, 0x2c, 0xc0, 0xae, 0x39, 0xe6, 0x44, 0xeb, 0xaa,
-	0xbf, 0xa5, 0x9e, 0xd5, 0x80, 0xf9, 0xbd, 0x51, 0x6a, 0x9f, 0xec, 0x27, 0xda, 0xb5, 0x1b, 0xfb,
-	0x47, 0xd6, 0xa5, 0xb3, 0x8e, 0xd3, 0xfa, 0x6a, 0x25, 0x2f, 0xe4, 0x86, 0xd4, 0x7b, 0x70, 0xbe,
-	0x48, 0x64, 0x09, 0xa2, 0xff, 0x9f, 0x88, 0xd6, 0x01, 0x05, 0x53, 0xbe, 0x26, 0x3b, 0x7b, 0xcc,
-	0x7c, 0xf6, 0xed, 0x64, 0xae, 0x83, 0xe9, 0x5c, 0x07, 0xef, 0x73, 0x1d, 0x8c, 0x17, 0xba, 0x32,
-	0x5d, 0xe8, 0xca, 0xeb, 0x42, 0x57, 0xba, 0xe7, 0x7e, 0xc0, 0xef, 0x87, 0x2e, 0xf4, 0x68, 0x24,
-	0xaf, 0xbd, 0x19, 0x62, 0x97, 0xad, 0x4e, 0x7f, 0xd4, 0x3a, 0x46, 0x4f, 0x3b, 0x0e, 0x84, 0xa7,
-	0x03, 0xc2, 0xdc, 0x9f, 0x79, 0xbf, 0xa3, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xc9, 0xdc,
-	0x63, 0x2a, 0x03, 0x00, 0x00,
+	0x0a, 0xce, 0xa0, 0x05, 0xa1, 0x85, 0x5e, 0x42, 0x4b, 0xef, 0xb6, 0x50, 0xb0, 0x87, 0x30, 0x89,
+	0x63, 0x1a, 0x9a, 0x64, 0x24, 0x33, 0xda, 0xe6, 0x2d, 0x7c, 0x2c, 0x8f, 0xd2, 0x43, 0xe9, 0xc9,
+	0x16, 0x7d, 0x03, 0x9f, 0xa0, 0x24, 0x99, 0xd1, 0x2a, 0x82, 0xbd, 0x25, 0xf3, 0xff, 0xbe, 0x8f,
+	0xef, 0xf7, 0xe7, 0xaf, 0x22, 0xca, 0x22, 0xca, 0x02, 0x86, 0xfa, 0xf4, 0x31, 0xe6, 0x41, 0x44,
+	0x9a, 0x7d, 0xc2, 0x89, 0xc7, 0x69, 0x82, 0xc6, 0x2d, 0x97, 0x70, 0xdc, 0x42, 0x3e, 0x89, 0x09,
+	0x0b, 0x18, 0x1c, 0x26, 0x94, 0x53, 0xcd, 0x14, 0x06, 0x28, 0x0d, 0x52, 0x0f, 0x85, 0xbe, 0x5e,
+	0xf5, 0xa9, 0x4f, 0x73, 0x31, 0xca, 0xbe, 0x0a, 0x5f, 0xfd, 0xc8, 0xa7, 0xd4, 0x0f, 0x09, 0xca,
+	0xff, 0xdc, 0xd1, 0x00, 0xe1, 0x38, 0x95, 0x23, 0x2f, 0xcf, 0x74, 0x0a, 0x4f, 0xf1, 0x23, 0x46,
+	0xfa, 0xae, 0xab, 0x3f, 0x4a, 0x30, 0x0f, 0x68, 0x2c, 0xe6, 0xc6, 0xee, 0x3c, 0x6b, 0xc4, 0x38,
+	0x8e, 0x86, 0x42, 0x70, 0x7a, 0x98, 0x4f, 0x4e, 0x9c, 0xed, 0x6c, 0xeb, 0x05, 0xa8, 0xd5, 0xab,
+	0x82, 0xfd, 0x42, 0x48, 0x2e, 0x63, 0x9e, 0xa4, 0xda, 0x9d, 0xfa, 0x4b, 0x4a, 0x6b, 0xc0, 0x04,
+	0x8d, 0xbf, 0xed, 0x63, 0x78, 0x68, 0x2b, 0x50, 0x46, 0xd8, 0xff, 0x56, 0x73, 0xa3, 0x92, 0xe2,
+	0x28, 0x3c, 0xb3, 0x64, 0x8a, 0xd5, 0x5d, 0x07, 0x6a, 0x58, 0xfd, 0x13, 0x62, 0xc6, 0x1d, 0x19,
+	0x54, 0xfb, 0x66, 0x82, 0x46, 0xa9, 0x5d, 0x87, 0x05, 0x29, 0x94, 0xa4, 0xf0, 0x46, 0x92, 0xda,
+	0xe6, 0x74, 0x6e, 0x28, 0xab, 0xb9, 0x51, 0x2d, 0x52, 0xb7, 0xec, 0xd6, 0xe4, 0xcd, 0x00, 0xdd,
+	0x72, 0xf6, 0x26, 0x1b, 0x58, 0xcf, 0x40, 0x2d, 0x0b, 0xb0, 0x6b, 0x8e, 0x39, 0xd1, 0x7a, 0xea,
+	0x6f, 0xa9, 0x67, 0x35, 0x60, 0x7e, 0x6f, 0x94, 0xda, 0x9d, 0xc3, 0x44, 0xfb, 0x76, 0x63, 0xff,
+	0xc8, 0xba, 0x74, 0x37, 0x71, 0xda, 0x40, 0xad, 0xe4, 0x85, 0xdc, 0x90, 0x7a, 0x0f, 0xce, 0x17,
+	0x89, 0x2c, 0x41, 0xf4, 0xff, 0x13, 0xd1, 0x26, 0xa0, 0x60, 0xca, 0xd7, 0x64, 0x67, 0x8f, 0x99,
+	0xcf, 0xbe, 0x9d, 0x2e, 0x74, 0x30, 0x5b, 0xe8, 0xe0, 0x7d, 0xa1, 0x83, 0xc9, 0x52, 0x57, 0x66,
+	0x4b, 0x5d, 0x79, 0x5d, 0xea, 0x4a, 0xef, 0xdc, 0x0f, 0xf8, 0xfd, 0xc8, 0x85, 0x1e, 0x8d, 0xe4,
+	0xb5, 0x37, 0x43, 0xec, 0xb2, 0xf5, 0xe9, 0x8f, 0x5b, 0x1d, 0xf4, 0xb4, 0xe7, 0x40, 0x78, 0x3a,
+	0x24, 0xcc, 0xfd, 0x99, 0xf7, 0x3b, 0xf9, 0x08, 0x00, 0x00, 0xff, 0xff, 0x82, 0xf7, 0x0f, 0xe8,
+	0x2a, 0x03, 0x00, 0x00,
 }
 
 func (m *GenesisDowntimeEntry) Marshal() (dAtA []byte, err error) {
diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go
index ff51494c132..77d41dc7129 100644
--- a/x/gamm/client/cli/cli_test.go
+++ b/x/gamm/client/cli/cli_test.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go
index 43d1fbaa66b..08e712dcf54 100644
--- a/x/gamm/client/cli/query.go
+++ b/x/gamm/client/cli/query.go
@@ -16,8 +16,8 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/gamm/client/cli/query_test.go b/x/gamm/client/cli/query_test.go
index c93df11ff2a..328d7b80c57 100644
--- a/x/gamm/client/cli/query_test.go
+++ b/x/gamm/client/cli/query_test.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/gamm/client/cli/tx.go b/x/gamm/client/cli/tx.go
index a97cb15761a..9bff956d001 100644
--- a/x/gamm/client/cli/tx.go
+++ b/x/gamm/client/cli/tx.go
@@ -11,10 +11,10 @@ import (
 	flag "github.com/spf13/pflag"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
diff --git a/x/gamm/client/cli/tx_test.go b/x/gamm/client/cli/tx_test.go
index 293496408aa..da0959c3101 100644
--- a/x/gamm/client/cli/tx_test.go
+++ b/x/gamm/client/cli/tx_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/client/cli"
 )
 
 func TestParseCoinsNoSort(t *testing.T) {
diff --git a/x/gamm/client/proposal_handler.go b/x/gamm/client/proposal_handler.go
index 5f0ec209921..9abee4b4999 100644
--- a/x/gamm/client/proposal_handler.go
+++ b/x/gamm/client/proposal_handler.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/client/rest"
 
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
diff --git a/x/gamm/handler.go b/x/gamm/handler.go
index d2cf8f3b755..f8e663eec32 100644
--- a/x/gamm/handler.go
+++ b/x/gamm/handler.go
@@ -7,8 +7,8 @@ import (
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // NewMigrationRecordHandler is a handler for governance proposals on new migration records.
diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go
index 04b4e914840..b8082a8517e 100644
--- a/x/gamm/keeper/export_test.go
+++ b/x/gamm/keeper/export_test.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // SetParams sets the total set of params.
diff --git a/x/gamm/keeper/gas_test.go b/x/gamm/keeper/gas_test.go
index a8f1124e684..21b6360987c 100644
--- a/x/gamm/keeper/gas_test.go
+++ b/x/gamm/keeper/gas_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/gamm/keeper/genesis.go b/x/gamm/keeper/genesis.go
index e088f69f368..8ca9cd06b4e 100644
--- a/x/gamm/keeper/genesis.go
+++ b/x/gamm/keeper/genesis.go
@@ -4,7 +4,7 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // InitGenesis initializes the x/gamm module's state from a provided genesis
diff --git a/x/gamm/keeper/genesis_test.go b/x/gamm/keeper/genesis_test.go
index 25ffb2a70a1..ba22ea00899 100644
--- a/x/gamm/keeper/genesis_test.go
+++ b/x/gamm/keeper/genesis_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	osmoapp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	osmoapp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 var DefaultMigrationRecords = types.MigrationRecords{BalancerToConcentratedPoolLinks: []types.BalancerToConcentratedPoolLink{
diff --git a/x/gamm/keeper/gov.go b/x/gamm/keeper/gov.go
index 9df28de248d..7e8cf68d73d 100644
--- a/x/gamm/keeper/gov.go
+++ b/x/gamm/keeper/gov.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func (k Keeper) HandleReplaceMigrationRecordsProposal(ctx sdk.Context, p *types.ReplaceMigrationRecordsProposal) error {
diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go
index bf81cfba6f5..869e2b4f917 100644
--- a/x/gamm/keeper/grpc_query.go
+++ b/x/gamm/keeper/grpc_query.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types/query"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/v2types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go
index 3286b8b1cba..29376391eda 100644
--- a/x/gamm/keeper/grpc_query_test.go
+++ b/x/gamm/keeper/grpc_query_test.go
@@ -8,11 +8,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/v2types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (s *KeeperTestSuite) TestCalcExitPoolCoinsFromShares() {
diff --git a/x/gamm/keeper/invariants.go b/x/gamm/keeper/invariants.go
index 7b9cbcbdcbe..3d6099c6eee 100644
--- a/x/gamm/keeper/invariants.go
+++ b/x/gamm/keeper/invariants.go
@@ -7,7 +7,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 const poolBalanceInvariantName = "pool-account-balance-equals-expected"
diff --git a/x/gamm/keeper/keeper.go b/x/gamm/keeper/keeper.go
index a31826571e6..4e14990ce13 100644
--- a/x/gamm/keeper/keeper.go
+++ b/x/gamm/keeper/keeper.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/gamm/keeper/keeper_test.go b/x/gamm/keeper/keeper_test.go
index 42804663683..a715fa0ff59 100644
--- a/x/gamm/keeper/keeper_test.go
+++ b/x/gamm/keeper/keeper_test.go
@@ -7,10 +7,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/gamm/keeper/migrate.go b/x/gamm/keeper/migrate.go
index 0805ab7d6af..b15abd3f8e0 100644
--- a/x/gamm/keeper/migrate.go
+++ b/x/gamm/keeper/migrate.go
@@ -5,9 +5,9 @@ import (
 	"sort"
 	"time"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/gamm/keeper/migrate_test.go b/x/gamm/keeper/migrate_test.go
index f44f4ed8786..fd09ba34dd4 100644
--- a/x/gamm/keeper/migrate_test.go
+++ b/x/gamm/keeper/migrate_test.go
@@ -8,7 +8,7 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func (s *KeeperTestSuite) TestMigrate() {
diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go
index eb5660f4f2a..7cb194d6344 100644
--- a/x/gamm/keeper/msg_server.go
+++ b/x/gamm/keeper/msg_server.go
@@ -5,10 +5,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type msgServer struct {
diff --git a/x/gamm/keeper/msg_server_test.go b/x/gamm/keeper/msg_server_test.go
index df6fdabd141..1fa559d63de 100644
--- a/x/gamm/keeper/msg_server_test.go
+++ b/x/gamm/keeper/msg_server_test.go
@@ -3,9 +3,9 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go
index 7faa5353e8f..025a388f691 100644
--- a/x/gamm/keeper/pool.go
+++ b/x/gamm/keeper/pool.go
@@ -10,10 +10,10 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (k Keeper) MarshalPool(pool poolmanagertypes.PoolI) ([]byte, error) {
diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go
index 6c5cadd0f24..462e767d44a 100644
--- a/x/gamm/keeper/pool_service.go
+++ b/x/gamm/keeper/pool_service.go
@@ -9,8 +9,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // CalculateSpotPrice returns the spot price of the quote asset in terms of the base asset,
diff --git a/x/gamm/keeper/pool_service_test.go b/x/gamm/keeper/pool_service_test.go
index 103b36dc8cb..7ba6f1cf4b1 100644
--- a/x/gamm/keeper/pool_service_test.go
+++ b/x/gamm/keeper/pool_service_test.go
@@ -10,10 +10,10 @@ import (
 
 	_ "github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go
index 90f06e5340e..e565bb377cc 100644
--- a/x/gamm/keeper/pool_test.go
+++ b/x/gamm/keeper/pool_test.go
@@ -7,12 +7,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/golang/mock/gomock"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/mocks"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/tests/mocks"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
@@ -30,7 +30,7 @@ var (
 // 	"github.com/cosmos/cosmos-sdk/simapp"
 // 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-// 	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+// 	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 // )
 
 // func (s *KeeperTestSuite) TestCleanupPool() {
diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go
index 3da0276eb9f..728cf1f5ad2 100644
--- a/x/gamm/keeper/share.go
+++ b/x/gamm/keeper/share.go
@@ -3,9 +3,9 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/events"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/events"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (k Keeper) applyJoinPoolStateChange(ctx sdk.Context, pool poolmanagertypes.PoolI, joiner sdk.AccAddress, numShares sdk.Int, joinCoins sdk.Coins) error {
diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go
index 46ccedb8831..e8b399ebd03 100644
--- a/x/gamm/keeper/swap.go
+++ b/x/gamm/keeper/swap.go
@@ -7,9 +7,9 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/events"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/events"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // swapExactAmountIn is an internal method for swapping an exact amount of tokens
diff --git a/x/gamm/keeper/swap_test.go b/x/gamm/keeper/swap_test.go
index d81433c714b..f29ccda694b 100644
--- a/x/gamm/keeper/swap_test.go
+++ b/x/gamm/keeper/swap_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/tests/mocks"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/tests/mocks"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var _ = suite.TestingSuite(nil)
diff --git a/x/gamm/keeper/total_liquidity.go b/x/gamm/keeper/total_liquidity.go
index a78aafc2ef9..d166b863ea0 100644
--- a/x/gamm/keeper/total_liquidity.go
+++ b/x/gamm/keeper/total_liquidity.go
@@ -4,7 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func (k Keeper) GetTotalLiquidity(ctx sdk.Context) sdk.Coins {
diff --git a/x/gamm/module.go b/x/gamm/module.go
index 4f12da8cad7..a1a7e8fe613 100644
--- a/x/gamm/module.go
+++ b/x/gamm/module.go
@@ -25,14 +25,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	simulation "github.com/osmosis-labs/osmosis/v15/x/gamm/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/v2types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	simulation "github.com/osmosis-labs/osmosis/v16/x/gamm/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/v2types"
 )
 
 var (
diff --git a/x/gamm/pool-models/balancer/amm.go b/x/gamm/pool-models/balancer/amm.go
index 7c7201a1c24..390150bacaa 100644
--- a/x/gamm/pool-models/balancer/amm.go
+++ b/x/gamm/pool-models/balancer/amm.go
@@ -8,7 +8,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // subPoolAssetWeights subtracts the weights of two different pool asset slices.
diff --git a/x/gamm/pool-models/balancer/amm_test.go b/x/gamm/pool-models/balancer/amm_test.go
index 7db021a4094..3235d22cb9e 100644
--- a/x/gamm/pool-models/balancer/amm_test.go
+++ b/x/gamm/pool-models/balancer/amm_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/test_helpers"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/test_helpers"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 type BalancerTestSuite struct {
diff --git a/x/gamm/pool-models/balancer/balancerPool.pb.go b/x/gamm/pool-models/balancer/balancerPool.pb.go
index 00379b289a4..b179c15af4a 100644
--- a/x/gamm/pool-models/balancer/balancerPool.pb.go
+++ b/x/gamm/pool-models/balancer/balancerPool.pb.go
@@ -305,58 +305,58 @@ var fileDescriptor_7e991f749f68c2a4 = []byte{
 	// 867 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x8f, 0xdb, 0x44,
 	0x14, 0x8f, 0x37, 0xd9, 0x4d, 0x77, 0x52, 0x8a, 0x76, 0x9a, 0x83, 0x93, 0x15, 0x99, 0xd5, 0x80,
-	0x50, 0x55, 0x35, 0xb6, 0x52, 0xe0, 0xb2, 0x97, 0xaa, 0x6e, 0x0b, 0xea, 0xad, 0xb8, 0x48, 0xa5,
-	0xa8, 0x92, 0x35, 0x49, 0x26, 0xb6, 0x55, 0xdb, 0x63, 0x79, 0x26, 0x69, 0xf7, 0x1b, 0xa0, 0x9e,
-	0x7a, 0x2c, 0xb7, 0xde, 0xb9, 0x70, 0xe0, 0x43, 0xac, 0xe0, 0x52, 0x89, 0x0b, 0xe2, 0x60, 0xd0,
-	0xee, 0x01, 0x89, 0x63, 0x3e, 0x01, 0x9a, 0x3f, 0xce, 0x9f, 0x25, 0x11, 0xad, 0x7a, 0x49, 0x66,
-	0xde, 0xbc, 0xf7, 0x7b, 0xbf, 0xf7, 0xde, 0x6f, 0xc6, 0xe0, 0x73, 0xc6, 0x53, 0xc6, 0x63, 0xee,
-	0x86, 0x24, 0x4d, 0xdd, 0x9c, 0xb1, 0xa4, 0x9f, 0xb2, 0x31, 0x4d, 0xb8, 0x3b, 0x24, 0x09, 0xc9,
-	0x46, 0xb4, 0x58, 0x2c, 0x1e, 0x30, 0x96, 0x38, 0x79, 0xc1, 0x04, 0x83, 0x6d, 0x13, 0xe5, 0xc8,
-	0x28, 0x67, 0x36, 0x18, 0x52, 0x41, 0x06, 0xdd, 0xce, 0x48, 0x99, 0x03, 0xe5, 0xe3, 0xea, 0x8d,
-	0x0e, 0xe8, 0xb6, 0x43, 0x16, 0x32, 0x6d, 0x97, 0x2b, 0x63, 0x3d, 0x20, 0x69, 0x9c, 0x31, 0x57,
-	0xfd, 0x1a, 0x53, 0x2f, 0x64, 0x2c, 0x4c, 0xa8, 0xab, 0x76, 0xc3, 0xe9, 0xc4, 0x1d, 0x4f, 0x0b,
-	0x22, 0x62, 0x96, 0x99, 0x73, 0x74, 0xf1, 0x5c, 0xc4, 0x29, 0xe5, 0x82, 0xa4, 0x79, 0x05, 0xa0,
-	0xf3, 0xba, 0x64, 0x2a, 0x22, 0xd7, 0x30, 0x53, 0x9b, 0x0b, 0xe7, 0x43, 0xc2, 0xe9, 0xe2, 0x7c,
-	0xc4, 0x62, 0x93, 0x00, 0xff, 0x5a, 0x07, 0xf6, 0xc3, 0x94, 0x31, 0x11, 0x3d, 0xa2, 0x71, 0x18,
-	0x89, 0x3b, 0x11, 0xc9, 0x42, 0xfa, 0x80, 0x14, 0x24, 0xe5, 0xf0, 0x5b, 0x00, 0xb8, 0x20, 0x85,
-	0x08, 0x64, 0x56, 0xdb, 0x3a, 0xb2, 0xae, 0xb5, 0x6e, 0x76, 0x1d, 0x4d, 0xc9, 0xa9, 0x28, 0x39,
-	0xdf, 0x54, 0x94, 0xbc, 0x8f, 0x4e, 0x4b, 0x54, 0x9b, 0x97, 0xe8, 0xe0, 0x84, 0xa4, 0xc9, 0x31,
-	0x5e, 0xc6, 0xe2, 0x97, 0x7f, 0x22, 0xcb, 0xdf, 0x57, 0x06, 0xe9, 0x0e, 0x23, 0x70, 0xa9, 0xaa,
-	0xd4, 0xde, 0x51, 0xb8, 0x9d, 0xff, 0xe0, 0xde, 0x35, 0x0e, 0xde, 0x40, 0xc2, 0xfe, 0x53, 0x22,
-	0x58, 0x85, 0xdc, 0x60, 0x69, 0x2c, 0x68, 0x9a, 0x8b, 0x93, 0x79, 0x89, 0x3e, 0xd4, 0xc9, 0xaa,
-	0x33, 0xfc, 0x4a, 0xa6, 0x5a, 0xa0, 0xc3, 0x19, 0x68, 0xc7, 0x59, 0x2c, 0x62, 0x92, 0x04, 0x72,
-	0xdc, 0xc1, 0x33, 0x55, 0x26, 0xb7, 0xeb, 0x47, 0xf5, 0x6b, 0xad, 0x9b, 0xc8, 0xd9, 0x34, 0x5a,
-	0x47, 0xce, 0xfe, 0x36, 0xe7, 0x54, 0x78, 0x1f, 0x9b, 0x92, 0x0e, 0x75, 0x96, 0x4d, 0x50, 0xd8,
-	0x87, 0xc6, 0x2c, 0xc3, 0x74, 0x1b, 0x39, 0xe4, 0xe0, 0xaa, 0x20, 0x45, 0x48, 0xc5, 0x7a, 0xda,
-	0xc6, 0xdb, 0xa5, 0xc5, 0x26, 0x6d, 0x57, 0xa7, 0xdd, 0x80, 0x84, 0xfd, 0x03, 0x6d, 0x5d, 0x49,
-	0x8a, 0x5f, 0xd4, 0x01, 0x90, 0x7b, 0x33, 0xbf, 0x27, 0xe0, 0x12, 0x7f, 0x46, 0xf2, 0x60, 0x42,
-	0xf5, 0xf4, 0xf6, 0xbd, 0xdb, 0x12, 0xf7, 0x8f, 0x12, 0x7d, 0x1a, 0xc6, 0x22, 0x9a, 0x0e, 0x9d,
-	0x11, 0x4b, 0x8d, 0x72, 0xcd, 0x5f, 0x9f, 0x8f, 0x9f, 0xba, 0xe2, 0x24, 0xa7, 0xdc, 0xb9, 0x4b,
-	0x47, 0xcb, 0xf6, 0x56, 0x38, 0xd8, 0x6f, 0xca, 0xe5, 0x97, 0x94, 0x4a, 0x74, 0xfa, 0x3c, 0x16,
-	0x0a, 0x7d, 0xe7, 0xfd, 0xd0, 0x2b, 0x1c, 0xec, 0x37, 0xe5, 0x52, 0xa2, 0xff, 0x60, 0x81, 0x43,
-	0xae, 0x84, 0x69, 0x2a, 0x0e, 0x46, 0x4a, 0x9a, 0x41, 0xae, 0x6a, 0xb3, 0xeb, 0x4a, 0x35, 0xce,
-	0xe6, 0x46, 0x6e, 0x53, 0xb4, 0x77, 0xfd, 0xb4, 0x44, 0xd6, 0xbc, 0x44, 0xd8, 0x54, 0xb5, 0x3d,
-	0x01, 0xf6, 0x6d, 0xbe, 0x05, 0xe5, 0xf8, 0x93, 0x17, 0x7f, 0xff, 0x74, 0x1d, 0xad, 0x3d, 0x25,
-	0xde, 0xca, 0xab, 0xa1, 0xbd, 0xf0, 0x8f, 0x16, 0xd8, 0x5f, 0x4c, 0x14, 0xde, 0x03, 0xbb, 0x82,
-	0x3d, 0xa5, 0x99, 0xb9, 0x46, 0x1d, 0xc7, 0x3c, 0x18, 0xf2, 0x62, 0x2e, 0x78, 0xdf, 0x61, 0x71,
-	0xe6, 0xb5, 0xcd, 0xec, 0x2f, 0x9b, 0xd9, 0xcb, 0x28, 0xec, 0xeb, 0x68, 0xf8, 0x08, 0xec, 0x69,
-	0xb6, 0xa6, 0xe5, 0xb7, 0xde, 0xa1, 0xe5, 0xf7, 0x33, 0x31, 0x2f, 0xd1, 0x07, 0x1a, 0x56, 0xa3,
-	0x60, 0xdf, 0xc0, 0xe1, 0xdf, 0x1a, 0xa0, 0x21, 0xd9, 0xc2, 0x1b, 0xa0, 0x49, 0xc6, 0xe3, 0x82,
-	0x72, 0x6e, 0x34, 0x03, 0xe7, 0x25, 0xba, 0xa2, 0x83, 0xcc, 0x01, 0xf6, 0x2b, 0x17, 0x78, 0x05,
-	0xec, 0xc4, 0x63, 0xc5, 0xa5, 0xe1, 0xef, 0xc4, 0x63, 0x38, 0x01, 0x2d, 0xa5, 0xd2, 0xb5, 0x29,
-	0x1d, 0x6d, 0x97, 0xbb, 0x99, 0xcb, 0x85, 0x6b, 0x56, 0xbd, 0xc1, 0xc1, 0x0a, 0x16, 0xf6, 0x41,
-	0xbe, 0x94, 0xf6, 0xd7, 0xa0, 0x3d, 0x99, 0x8a, 0x69, 0x41, 0xb5, 0x4b, 0xc8, 0x66, 0xb4, 0xc8,
-	0x58, 0x61, 0x37, 0x14, 0x65, 0xb4, 0x84, 0xda, 0xe4, 0x85, 0x7d, 0xa8, 0xcd, 0x92, 0xc1, 0x57,
-	0xc6, 0x08, 0x1f, 0x83, 0xcb, 0x82, 0x09, 0x92, 0x04, 0x3c, 0x22, 0x05, 0xe5, 0xf6, 0xee, 0xff,
-	0x0d, 0xea, 0xd0, 0x90, 0xbe, 0x5a, 0x0d, 0x6a, 0x19, 0x8c, 0xfd, 0x96, 0xda, 0x3e, 0x54, 0x3b,
-	0xf8, 0xc4, 0x74, 0x85, 0x48, 0x29, 0x70, 0x7b, 0xef, 0xed, 0x1e, 0x81, 0xae, 0xc1, 0x87, 0x1a,
-	0x7f, 0x05, 0xc1, 0xf4, 0x42, 0xb9, 0x71, 0x18, 0x55, 0xc4, 0x8d, 0x32, 0x9a, 0xaa, 0x07, 0xf7,
-	0xde, 0x59, 0x19, 0x6b, 0x75, 0x54, 0xfa, 0xd0, 0x75, 0xe8, 0x4b, 0x70, 0xec, 0x7e, 0xff, 0x1a,
-	0xd5, 0x5e, 0xbd, 0x46, 0xb5, 0x5f, 0x7e, 0xee, 0xef, 0x4a, 0xa2, 0xf7, 0xe5, 0x4d, 0xe8, 0x6c,
-	0xbd, 0x09, 0xde, 0xe3, 0xd3, 0xb3, 0x9e, 0xf5, 0xe6, 0xac, 0x67, 0xfd, 0x75, 0xd6, 0xb3, 0x5e,
-	0x9e, 0xf7, 0x6a, 0x6f, 0xce, 0x7b, 0xb5, 0xdf, 0xcf, 0x7b, 0xb5, 0xef, 0x6e, 0xad, 0xd0, 0x32,
-	0xf1, 0xfd, 0x84, 0x0c, 0x79, 0xb5, 0x71, 0x67, 0x83, 0x2f, 0xdc, 0xe7, 0xdb, 0xbf, 0xd3, 0xc3,
-	0x3d, 0xf5, 0xa1, 0xf8, 0xec, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xe8, 0x89, 0xe3, 0xd3,
+	0x50, 0x55, 0x35, 0xb6, 0x52, 0x10, 0x87, 0xbd, 0x54, 0x75, 0x5b, 0x50, 0x6f, 0xc5, 0x45, 0x2a,
+	0x45, 0x95, 0xac, 0x49, 0x32, 0xb1, 0xad, 0xda, 0x1e, 0xcb, 0x33, 0x49, 0xbb, 0xdf, 0x00, 0xf5,
+	0xd4, 0x63, 0xb9, 0xf5, 0xce, 0x85, 0x03, 0x1f, 0x62, 0x05, 0x97, 0x4a, 0x5c, 0x10, 0x07, 0x83,
+	0x76, 0x0f, 0x48, 0x1c, 0xf3, 0x09, 0xd0, 0xfc, 0x71, 0xfe, 0x2c, 0x89, 0x68, 0xd5, 0x4b, 0x32,
+	0xf3, 0xe6, 0xbd, 0xdf, 0xfb, 0xbd, 0xf7, 0x7e, 0x33, 0x06, 0x9f, 0x33, 0x9e, 0x32, 0x1e, 0x73,
+	0x37, 0x24, 0x69, 0xea, 0xe6, 0x8c, 0x25, 0xfd, 0x94, 0x8d, 0x69, 0xc2, 0xdd, 0x21, 0x49, 0x48,
+	0x36, 0xa2, 0xc5, 0x62, 0xf1, 0x80, 0xb1, 0xc4, 0xc9, 0x0b, 0x26, 0x18, 0x6c, 0x9b, 0x28, 0x47,
+	0x46, 0x39, 0xb3, 0xc1, 0x90, 0x0a, 0x32, 0xe8, 0x76, 0x46, 0xca, 0x1c, 0x28, 0x1f, 0x57, 0x6f,
+	0x74, 0x40, 0xb7, 0x1d, 0xb2, 0x90, 0x69, 0xbb, 0x5c, 0x19, 0xeb, 0x01, 0x49, 0xe3, 0x8c, 0xb9,
+	0xea, 0xd7, 0x98, 0x7a, 0x21, 0x63, 0x61, 0x42, 0x5d, 0xb5, 0x1b, 0x4e, 0x27, 0xee, 0x78, 0x5a,
+	0x10, 0x11, 0xb3, 0xcc, 0x9c, 0xa3, 0x8b, 0xe7, 0x22, 0x4e, 0x29, 0x17, 0x24, 0xcd, 0x2b, 0x00,
+	0x9d, 0xd7, 0x25, 0x53, 0x11, 0xb9, 0x86, 0x99, 0xda, 0x5c, 0x38, 0x1f, 0x12, 0x4e, 0x17, 0xe7,
+	0x23, 0x16, 0x9b, 0x04, 0xf8, 0xd7, 0x3a, 0xb0, 0x1f, 0xa6, 0x8c, 0x89, 0xe8, 0x11, 0x8d, 0xc3,
+	0x48, 0xdc, 0x89, 0x48, 0x16, 0xd2, 0x07, 0xa4, 0x20, 0x29, 0x87, 0xdf, 0x02, 0xc0, 0x05, 0x29,
+	0x44, 0x20, 0xb3, 0xda, 0xd6, 0x91, 0x75, 0xad, 0x75, 0xb3, 0xeb, 0x68, 0x4a, 0x4e, 0x45, 0xc9,
+	0xf9, 0xa6, 0xa2, 0xe4, 0x7d, 0x74, 0x5a, 0xa2, 0xda, 0xbc, 0x44, 0x07, 0x27, 0x24, 0x4d, 0x8e,
+	0xf1, 0x32, 0x16, 0xbf, 0xfc, 0x13, 0x59, 0xfe, 0xbe, 0x32, 0x48, 0x77, 0x18, 0x81, 0x4b, 0x55,
+	0xa5, 0xf6, 0x8e, 0xc2, 0xed, 0xfc, 0x07, 0xf7, 0xae, 0x71, 0xf0, 0x06, 0x12, 0xf6, 0x9f, 0x12,
+	0xc1, 0x2a, 0xe4, 0x06, 0x4b, 0x63, 0x41, 0xd3, 0x5c, 0x9c, 0xcc, 0x4b, 0xf4, 0xa1, 0x4e, 0x56,
+	0x9d, 0xe1, 0x57, 0x32, 0xd5, 0x02, 0x1d, 0xce, 0x40, 0x3b, 0xce, 0x62, 0x11, 0x93, 0x24, 0x90,
+	0xe3, 0x0e, 0x9e, 0xa9, 0x32, 0xb9, 0x5d, 0x3f, 0xaa, 0x5f, 0x6b, 0xdd, 0x44, 0xce, 0xa6, 0xd1,
+	0x3a, 0x72, 0xf6, 0xb7, 0x39, 0xa7, 0xc2, 0xfb, 0xd8, 0x94, 0x74, 0xa8, 0xb3, 0x6c, 0x82, 0xc2,
+	0x3e, 0x34, 0x66, 0x19, 0xa6, 0xdb, 0xc8, 0x21, 0x07, 0x57, 0x05, 0x29, 0x42, 0x2a, 0xd6, 0xd3,
+	0x36, 0xde, 0x2e, 0x2d, 0x36, 0x69, 0xbb, 0x3a, 0xed, 0x06, 0x24, 0xec, 0x1f, 0x68, 0xeb, 0x4a,
+	0x52, 0xfc, 0xa2, 0x0e, 0x80, 0xdc, 0x9b, 0xf9, 0x3d, 0x01, 0x97, 0xf8, 0x33, 0x92, 0x07, 0x13,
+	0xaa, 0xa7, 0xb7, 0xef, 0xdd, 0x96, 0xb8, 0x7f, 0x94, 0xe8, 0xd3, 0x30, 0x16, 0xd1, 0x74, 0xe8,
+	0x8c, 0x58, 0x6a, 0x94, 0x6b, 0xfe, 0xfa, 0x7c, 0xfc, 0xd4, 0x15, 0x27, 0x39, 0xe5, 0xce, 0x5d,
+	0x3a, 0x5a, 0xb6, 0xb7, 0xc2, 0xc1, 0x7e, 0x53, 0x2e, 0xbf, 0xa4, 0x54, 0xa2, 0xd3, 0xe7, 0xb1,
+	0x50, 0xe8, 0x3b, 0xef, 0x87, 0x5e, 0xe1, 0x60, 0xbf, 0x29, 0x97, 0x12, 0xfd, 0x07, 0x0b, 0x1c,
+	0x72, 0x25, 0x4c, 0x53, 0x71, 0x30, 0x52, 0xd2, 0x0c, 0x72, 0x55, 0x9b, 0x5d, 0x57, 0xaa, 0x71,
+	0x36, 0x37, 0x72, 0x9b, 0xa2, 0xbd, 0xeb, 0xa7, 0x25, 0xb2, 0xe6, 0x25, 0xc2, 0xa6, 0xaa, 0xed,
+	0x09, 0xb0, 0x6f, 0xf3, 0x2d, 0x28, 0xc7, 0x9f, 0xbc, 0xf8, 0xfb, 0xa7, 0xeb, 0x68, 0xed, 0x29,
+	0xf1, 0x56, 0x5e, 0x0d, 0xed, 0x85, 0x7f, 0xb4, 0xc0, 0xfe, 0x62, 0xa2, 0xf0, 0x1e, 0xd8, 0x15,
+	0xec, 0x29, 0xcd, 0xcc, 0x35, 0xea, 0x38, 0xe6, 0xc1, 0x90, 0x17, 0x73, 0xc1, 0xfb, 0x0e, 0x8b,
+	0x33, 0xaf, 0x6d, 0x66, 0x7f, 0xd9, 0xcc, 0x5e, 0x46, 0x61, 0x5f, 0x47, 0xc3, 0x47, 0x60, 0x4f,
+	0xb3, 0x35, 0x2d, 0xbf, 0xf5, 0x0e, 0x2d, 0xbf, 0x9f, 0x89, 0x79, 0x89, 0x3e, 0xd0, 0xb0, 0x1a,
+	0x05, 0xfb, 0x06, 0x0e, 0xff, 0xd6, 0x00, 0x0d, 0xc9, 0x16, 0xde, 0x00, 0x4d, 0x32, 0x1e, 0x17,
+	0x94, 0x73, 0xa3, 0x19, 0x38, 0x2f, 0xd1, 0x15, 0x1d, 0x64, 0x0e, 0xb0, 0x5f, 0xb9, 0xc0, 0x2b,
+	0x60, 0x27, 0x1e, 0x2b, 0x2e, 0x0d, 0x7f, 0x27, 0x1e, 0xc3, 0x09, 0x68, 0x29, 0x95, 0xae, 0x4d,
+	0xe9, 0x68, 0xbb, 0xdc, 0xcd, 0x5c, 0x2e, 0x5c, 0xb3, 0xea, 0x0d, 0x0e, 0x56, 0xb0, 0xb0, 0x0f,
+	0xf2, 0xa5, 0xb4, 0xbf, 0x06, 0xed, 0xc9, 0x54, 0x4c, 0x0b, 0xaa, 0x5d, 0x42, 0x36, 0xa3, 0x45,
+	0xc6, 0x0a, 0xbb, 0xa1, 0x28, 0xa3, 0x25, 0xd4, 0x26, 0x2f, 0xec, 0x43, 0x6d, 0x96, 0x0c, 0xbe,
+	0x32, 0x46, 0xf8, 0x18, 0x5c, 0x16, 0x4c, 0x90, 0x24, 0xe0, 0x11, 0x29, 0x28, 0xb7, 0x77, 0xff,
+	0x6f, 0x50, 0x87, 0x86, 0xf4, 0xd5, 0x6a, 0x50, 0xcb, 0x60, 0xec, 0xb7, 0xd4, 0xf6, 0xa1, 0xda,
+	0xc1, 0x27, 0xa6, 0x2b, 0x44, 0x4a, 0x81, 0xdb, 0x7b, 0x6f, 0xf7, 0x08, 0x74, 0x0d, 0x3e, 0xd4,
+	0xf8, 0x2b, 0x08, 0xa6, 0x17, 0xca, 0x8d, 0xc3, 0xa8, 0x22, 0x6e, 0x94, 0xd1, 0x54, 0x3d, 0xb8,
+	0xf7, 0xce, 0xca, 0x58, 0xab, 0xa3, 0xd2, 0x87, 0xae, 0x43, 0x5f, 0x82, 0x63, 0xf7, 0xfb, 0xd7,
+	0xa8, 0xf6, 0xea, 0x35, 0xaa, 0xfd, 0xf2, 0x73, 0x7f, 0x57, 0x12, 0xbd, 0x2f, 0x6f, 0x42, 0x67,
+	0xeb, 0x4d, 0xf0, 0x1e, 0x9f, 0x9e, 0xf5, 0xac, 0x37, 0x67, 0x3d, 0xeb, 0xaf, 0xb3, 0x9e, 0xf5,
+	0xf2, 0xbc, 0x57, 0x7b, 0x73, 0xde, 0xab, 0xfd, 0x7e, 0xde, 0xab, 0x7d, 0x77, 0x6b, 0x85, 0x96,
+	0x89, 0xef, 0x27, 0x64, 0xc8, 0xab, 0x8d, 0x3b, 0x1b, 0x7c, 0xe1, 0x3e, 0xdf, 0xfe, 0x9d, 0x1e,
+	0xee, 0xa9, 0x0f, 0xc5, 0x67, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xd7, 0xe8, 0xb9, 0xd3,
 	0x07, 0x00, 0x00,
 }
 
diff --git a/x/gamm/pool-models/balancer/codec.go b/x/gamm/pool-models/balancer/codec.go
index b95d8004558..6d588f35c9f 100644
--- a/x/gamm/pool-models/balancer/codec.go
+++ b/x/gamm/pool-models/balancer/codec.go
@@ -1,8 +1,8 @@
 package balancer
 
 import (
-	types "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/gamm/pool-models/balancer/marshal_test.go b/x/gamm/pool-models/balancer/marshal_test.go
index 13a67fc0c40..1fb677b3652 100644
--- a/x/gamm/pool-models/balancer/marshal_test.go
+++ b/x/gamm/pool-models/balancer/marshal_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/gamm/pool-models/balancer/msgs.go b/x/gamm/pool-models/balancer/msgs.go
index 75069a9b951..ce58262a1d0 100644
--- a/x/gamm/pool-models/balancer/msgs.go
+++ b/x/gamm/pool-models/balancer/msgs.go
@@ -5,8 +5,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/gamm/pool-models/balancer/msgs_test.go b/x/gamm/pool-models/balancer/msgs_test.go
index 55a5f232699..e8a5be55052 100644
--- a/x/gamm/pool-models/balancer/msgs_test.go
+++ b/x/gamm/pool-models/balancer/msgs_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	balancer "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	balancer "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func TestMsgCreateBalancerPool_ValidateBasic(t *testing.T) {
diff --git a/x/gamm/pool-models/balancer/pool.go b/x/gamm/pool-models/balancer/pool.go
index 78d52635e1e..3a9b57d1fdf 100644
--- a/x/gamm/pool-models/balancer/pool.go
+++ b/x/gamm/pool-models/balancer/pool.go
@@ -10,9 +10,9 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 //nolint:deadcode
diff --git a/x/gamm/pool-models/balancer/pool_asset.go b/x/gamm/pool-models/balancer/pool_asset.go
index 88e5fce5e29..f7feaa63c5a 100644
--- a/x/gamm/pool-models/balancer/pool_asset.go
+++ b/x/gamm/pool-models/balancer/pool_asset.go
@@ -7,7 +7,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/gamm/pool-models/balancer/pool_params.go b/x/gamm/pool-models/balancer/pool_params.go
index f2bbbd2e84d..81ed715f137 100644
--- a/x/gamm/pool-models/balancer/pool_params.go
+++ b/x/gamm/pool-models/balancer/pool_params.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func NewPoolParams(spreadFactor, exitFee sdk.Dec, params *SmoothWeightChangeParams) PoolParams {
diff --git a/x/gamm/pool-models/balancer/pool_suite_test.go b/x/gamm/pool-models/balancer/pool_suite_test.go
index c2dde1500a3..875169f534c 100644
--- a/x/gamm/pool-models/balancer/pool_suite_test.go
+++ b/x/gamm/pool-models/balancer/pool_suite_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	v10 "github.com/osmosis-labs/osmosis/v15/app/upgrades/v10"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	v10 "github.com/osmosis-labs/osmosis/v16/app/upgrades/v10"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 const (
diff --git a/x/gamm/pool-models/balancer/pool_test.go b/x/gamm/pool-models/balancer/pool_test.go
index 447349f4b00..a5fade76570 100644
--- a/x/gamm/pool-models/balancer/pool_test.go
+++ b/x/gamm/pool-models/balancer/pool_test.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/test_helpers"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/test_helpers"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/gamm/pool-models/balancer/tx.pb.go b/x/gamm/pool-models/balancer/tx.pb.go
index f9a4ddc2f7f..d6c8a2bc2a0 100644
--- a/x/gamm/pool-models/balancer/tx.pb.go
+++ b/x/gamm/pool-models/balancer/tx.pb.go
@@ -158,35 +158,35 @@ var fileDescriptor_0647ee155de97433 = []byte{
 	// 492 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0x9b, 0xb5, 0x2a, 0xc2, 0x15, 0x87, 0x59, 0x03, 0x55, 0x45, 0x24, 0x25, 0x48, 0xa8,
-	0x20, 0xd5, 0x56, 0x0b, 0x5c, 0x76, 0x99, 0x08, 0x13, 0xd3, 0x0e, 0x93, 0x46, 0x6e, 0xe3, 0x32,
-	0x39, 0xa9, 0x17, 0x22, 0xc5, 0x79, 0x51, 0xec, 0x56, 0xe5, 0x2b, 0x70, 0xe2, 0x13, 0x70, 0xe4,
-	0xcc, 0xc7, 0xd8, 0x71, 0x47, 0x4e, 0xd1, 0xd4, 0x1e, 0xb8, 0xf7, 0x13, 0x20, 0x3b, 0x0e, 0xda,
-	0xa4, 0x4e, 0x20, 0x71, 0x89, 0xec, 0xe7, 0xdf, 0xfb, 0xbf, 0xbf, 0xdf, 0x73, 0xd0, 0x18, 0xa4,
-	0x00, 0x99, 0x4a, 0x9a, 0x30, 0x21, 0x68, 0x01, 0x90, 0x8d, 0x05, 0xcc, 0x78, 0x26, 0x69, 0xc4,
-	0x32, 0x96, 0xc7, 0xbc, 0xa4, 0x6a, 0x49, 0xd5, 0x92, 0x14, 0x25, 0x28, 0xc0, 0x23, 0x8b, 0x13,
-	0x8d, 0x13, 0x8d, 0xd7, 0x34, 0x69, 0x68, 0xb2, 0x98, 0x44, 0x5c, 0xb1, 0xc9, 0x60, 0x2f, 0x81,
-	0x04, 0x4c, 0x12, 0xd5, 0xab, 0x3a, 0x7f, 0xb0, 0xcb, 0x44, 0x9a, 0x03, 0x35, 0x5f, 0x1b, 0x7a,
-	0xfd, 0x77, 0x07, 0xcd, 0xe2, 0x14, 0x20, 0xb3, 0x59, 0x6e, 0x6c, 0xd2, 0x68, 0xc4, 0x24, 0xa7,
-	0xb6, 0x26, 0x8d, 0x21, 0xcd, 0xed, 0xb9, 0x97, 0x00, 0x24, 0x19, 0xa7, 0x66, 0x17, 0xcd, 0x2f,
-	0xa8, 0x4a, 0x05, 0x97, 0x8a, 0x89, 0xa2, 0x06, 0xfc, 0xeb, 0x1d, 0xf4, 0xf0, 0x44, 0x26, 0xef,
-	0x4a, 0xce, 0x14, 0x0f, 0x6e, 0x14, 0xc0, 0x2f, 0x50, 0x57, 0xf2, 0x7c, 0xc6, 0xcb, 0xbe, 0x33,
-	0x74, 0x46, 0xf7, 0x83, 0xdd, 0x4d, 0xe5, 0x3d, 0xf8, 0xcc, 0x44, 0xb6, 0xef, 0xd7, 0x71, 0x3f,
-	0xb4, 0x00, 0x3e, 0x43, 0x3d, 0x6d, 0xf8, 0xbc, 0x60, 0x25, 0x13, 0xb2, 0xbf, 0x33, 0x74, 0x46,
-	0xbd, 0xe9, 0x90, 0xdc, 0x6a, 0x92, 0x35, 0x47, 0xb4, 0xf6, 0xa9, 0xe1, 0x82, 0x47, 0x9b, 0xca,
-	0xc3, 0xb5, 0xe2, 0x8d, 0x74, 0x3f, 0x44, 0xc5, 0x1f, 0x06, 0xbf, 0xb7, 0xd2, 0x4c, 0x4a, 0xae,
-	0x64, 0xbf, 0x3d, 0x6c, 0x8f, 0x7a, 0x53, 0xef, 0x6e, 0xe9, 0xb7, 0x9a, 0x0b, 0x3a, 0x97, 0x95,
-	0xd7, 0xaa, 0x75, 0x4c, 0x40, 0xe2, 0x0f, 0x68, 0xef, 0x62, 0xae, 0xe6, 0x25, 0x3f, 0x37, 0x72,
-	0x09, 0x2c, 0x78, 0x99, 0x43, 0xd9, 0xef, 0x98, 0xbb, 0x79, 0x9b, 0xca, 0x7b, 0x5c, 0x3b, 0xd9,
-	0x46, 0xf9, 0x21, 0xae, 0xc3, 0xba, 0xc2, 0x91, 0x0d, 0xee, 0x3f, 0xff, 0xf2, 0xeb, 0xc7, 0xcb,
-	0xa7, 0xb7, 0xc6, 0x16, 0x9b, 0x36, 0x8e, 0x9b, 0x41, 0x8d, 0xb5, 0x8a, 0x7f, 0x88, 0x9e, 0x6c,
-	0xed, 0x70, 0xc8, 0x65, 0x01, 0xb9, 0xe4, 0xf8, 0x19, 0xba, 0x67, 0xca, 0xa5, 0x33, 0xd3, 0xea,
-	0x4e, 0x80, 0x56, 0x95, 0xd7, 0xd5, 0xc8, 0xf1, 0x61, 0xd8, 0xd5, 0x47, 0xc7, 0xb3, 0xe9, 0x77,
-	0x07, 0xb5, 0x4f, 0x64, 0x82, 0xbf, 0x39, 0x08, 0x6f, 0x99, 0xd6, 0x01, 0xf9, 0xd7, 0x27, 0x49,
-	0xb6, 0x9a, 0x19, 0x1c, 0xfd, 0xa7, 0x40, 0x73, 0x9b, 0xe0, 0xec, 0x72, 0xe5, 0x3a, 0x57, 0x2b,
-	0xd7, 0xb9, 0x5e, 0xb9, 0xce, 0xd7, 0xb5, 0xdb, 0xba, 0x5a, 0xbb, 0xad, 0x9f, 0x6b, 0xb7, 0xf5,
-	0xf1, 0x20, 0x49, 0xd5, 0xa7, 0x79, 0x44, 0x62, 0x10, 0xd4, 0x16, 0x1b, 0x67, 0x2c, 0x92, 0xcd,
-	0x86, 0x2e, 0x26, 0x6f, 0xe8, 0xf2, 0xee, 0x1f, 0x20, 0xea, 0x9a, 0x37, 0xfb, 0xea, 0x77, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x3a, 0xab, 0x35, 0x0a, 0xae, 0x03, 0x00, 0x00,
+	0x20, 0xd5, 0x56, 0x0b, 0xe2, 0xb0, 0xcb, 0x44, 0x98, 0x98, 0x76, 0x98, 0x34, 0x72, 0x1b, 0x97,
+	0xc9, 0x49, 0xbd, 0x10, 0x29, 0xce, 0x8b, 0x62, 0xb7, 0x2a, 0x5f, 0x81, 0x13, 0x9f, 0x80, 0x23,
+	0x67, 0x3e, 0xc6, 0x8e, 0x3b, 0x72, 0x8a, 0xa6, 0xf6, 0xc0, 0xbd, 0x9f, 0x00, 0xd9, 0x71, 0xd0,
+	0x26, 0x75, 0x02, 0x89, 0x4b, 0x64, 0x3f, 0xff, 0xde, 0xff, 0xfd, 0xfd, 0x9e, 0x83, 0xc6, 0x20,
+	0x05, 0xc8, 0x54, 0xd2, 0x84, 0x09, 0x41, 0x0b, 0x80, 0x6c, 0x2c, 0x60, 0xc6, 0x33, 0x49, 0x23,
+	0x96, 0xb1, 0x3c, 0xe6, 0x25, 0x55, 0x4b, 0xaa, 0x96, 0xa4, 0x28, 0x41, 0x01, 0x1e, 0x59, 0x9c,
+	0x68, 0x9c, 0x68, 0xbc, 0xa6, 0x49, 0x43, 0x93, 0xc5, 0x24, 0xe2, 0x8a, 0x4d, 0x06, 0x7b, 0x09,
+	0x24, 0x60, 0x92, 0xa8, 0x5e, 0xd5, 0xf9, 0x83, 0x5d, 0x26, 0xd2, 0x1c, 0xa8, 0xf9, 0xda, 0xd0,
+	0xeb, 0xbf, 0x3b, 0x68, 0x16, 0xa7, 0x00, 0x99, 0xcd, 0x72, 0x63, 0x93, 0x46, 0x23, 0x26, 0x39,
+	0xb5, 0x35, 0x69, 0x0c, 0x69, 0x6e, 0xcf, 0xbd, 0x04, 0x20, 0xc9, 0x38, 0x35, 0xbb, 0x68, 0x7e,
+	0x41, 0x55, 0x2a, 0xb8, 0x54, 0x4c, 0x14, 0x35, 0xe0, 0x5f, 0xef, 0xa0, 0x87, 0x27, 0x32, 0x79,
+	0x57, 0x72, 0xa6, 0x78, 0x70, 0xa3, 0x00, 0x7e, 0x81, 0xba, 0x92, 0xe7, 0x33, 0x5e, 0xf6, 0x9d,
+	0xa1, 0x33, 0xba, 0x1f, 0xec, 0x6e, 0x2a, 0xef, 0xc1, 0x67, 0x26, 0xb2, 0x7d, 0xbf, 0x8e, 0xfb,
+	0xa1, 0x05, 0xf0, 0x19, 0xea, 0x69, 0xc3, 0xe7, 0x05, 0x2b, 0x99, 0x90, 0xfd, 0x9d, 0xa1, 0x33,
+	0xea, 0x4d, 0x87, 0xe4, 0x56, 0x93, 0xac, 0x39, 0xa2, 0xb5, 0x4f, 0x0d, 0x17, 0x3c, 0xda, 0x54,
+	0x1e, 0xae, 0x15, 0x6f, 0xa4, 0xfb, 0x21, 0x2a, 0xfe, 0x30, 0xf8, 0xbd, 0x95, 0x66, 0x52, 0x72,
+	0x25, 0xfb, 0xed, 0x61, 0x7b, 0xd4, 0x9b, 0x7a, 0x77, 0x4b, 0xbf, 0xd5, 0x5c, 0xd0, 0xb9, 0xac,
+	0xbc, 0x56, 0xad, 0x63, 0x02, 0x12, 0x7f, 0x40, 0x7b, 0x17, 0x73, 0x35, 0x2f, 0xf9, 0xb9, 0x91,
+	0x4b, 0x60, 0xc1, 0xcb, 0x1c, 0xca, 0x7e, 0xc7, 0xdc, 0xcd, 0xdb, 0x54, 0xde, 0xe3, 0xda, 0xc9,
+	0x36, 0xca, 0x0f, 0x71, 0x1d, 0xd6, 0x15, 0x8e, 0x6c, 0x70, 0xff, 0xf9, 0x97, 0x5f, 0x3f, 0x5e,
+	0x3e, 0xbd, 0x35, 0xb6, 0xd8, 0xb4, 0x71, 0xdc, 0x0c, 0x6a, 0xac, 0x55, 0xfc, 0x43, 0xf4, 0x64,
+	0x6b, 0x87, 0x43, 0x2e, 0x0b, 0xc8, 0x25, 0xc7, 0xcf, 0xd0, 0x3d, 0x53, 0x2e, 0x9d, 0x99, 0x56,
+	0x77, 0x02, 0xb4, 0xaa, 0xbc, 0xae, 0x46, 0x8e, 0x0f, 0xc3, 0xae, 0x3e, 0x3a, 0x9e, 0x4d, 0xbf,
+	0x3b, 0xa8, 0x7d, 0x22, 0x13, 0xfc, 0xcd, 0x41, 0x78, 0xcb, 0xb4, 0x0e, 0xc8, 0xbf, 0x3e, 0x49,
+	0xb2, 0xd5, 0xcc, 0xe0, 0xe8, 0x3f, 0x05, 0x9a, 0xdb, 0x04, 0x67, 0x97, 0x2b, 0xd7, 0xb9, 0x5a,
+	0xb9, 0xce, 0xf5, 0xca, 0x75, 0xbe, 0xae, 0xdd, 0xd6, 0xd5, 0xda, 0x6d, 0xfd, 0x5c, 0xbb, 0xad,
+	0x8f, 0x07, 0x49, 0xaa, 0x3e, 0xcd, 0x23, 0x12, 0x83, 0xa0, 0xb6, 0xd8, 0x38, 0x63, 0x91, 0x6c,
+	0x36, 0x74, 0x31, 0x79, 0x43, 0x97, 0x77, 0xff, 0x00, 0x51, 0xd7, 0xbc, 0xd9, 0x57, 0xbf, 0x03,
+	0x00, 0x00, 0xff, 0xff, 0x5a, 0x94, 0x54, 0x50, 0xae, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/gamm/pool-models/balancer/util_test.go b/x/gamm/pool-models/balancer/util_test.go
index b21ddb6b948..94ba3c7c158 100644
--- a/x/gamm/pool-models/balancer/util_test.go
+++ b/x/gamm/pool-models/balancer/util_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
 )
 
 func createTestPool(t *testing.T, spreadFactor, exitFee sdk.Dec, poolAssets ...balancer.PoolAsset) *balancer.Pool {
diff --git a/x/gamm/pool-models/internal/cfmm_common/lp.go b/x/gamm/pool-models/internal/cfmm_common/lp.go
index 6c1ad71d3a1..5e2db2289f1 100644
--- a/x/gamm/pool-models/internal/cfmm_common/lp.go
+++ b/x/gamm/pool-models/internal/cfmm_common/lp.go
@@ -8,7 +8,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 const errMsgFormatSharesLargerThanMax = "cannot exit all shares in a pool. Attempted to exit %s shares, max allowed is %s"
diff --git a/x/gamm/pool-models/internal/cfmm_common/lp_test.go b/x/gamm/pool-models/internal/cfmm_common/lp_test.go
index 007b92dc613..38b57152e30 100644
--- a/x/gamm/pool-models/internal/cfmm_common/lp_test.go
+++ b/x/gamm/pool-models/internal/cfmm_common/lp_test.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/gamm/pool-models/internal/test_helpers/test_helpers.go b/x/gamm/pool-models/internal/test_helpers/test_helpers.go
index d9e7c83b183..a4a4f331170 100644
--- a/x/gamm/pool-models/internal/test_helpers/test_helpers.go
+++ b/x/gamm/pool-models/internal/test_helpers/test_helpers.go
@@ -13,8 +13,8 @@ import (
 	dbm "github.com/tendermint/tm-db"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // CfmmCommonTestSuite is the common test suite struct of Constant Function Market Maker,
diff --git a/x/gamm/pool-models/stableswap/amm.go b/x/gamm/pool-models/stableswap/amm.go
index cd9f69a6cdf..58905d3a8f5 100644
--- a/x/gamm/pool-models/stableswap/amm.go
+++ b/x/gamm/pool-models/stableswap/amm.go
@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	types "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	types "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // Simplified multi-asset CFMM is xy(x^2 + y^2 + w) = k,
diff --git a/x/gamm/pool-models/stableswap/amm_test.go b/x/gamm/pool-models/stableswap/amm_test.go
index 294d0fd4dea..59f54a2ff72 100644
--- a/x/gamm/pool-models/stableswap/amm_test.go
+++ b/x/gamm/pool-models/stableswap/amm_test.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/test_helpers"
-	types "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/test_helpers"
+	types "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 var (
diff --git a/x/gamm/pool-models/stableswap/codec.go b/x/gamm/pool-models/stableswap/codec.go
index ca29dbfa09b..97990d6c1c0 100644
--- a/x/gamm/pool-models/stableswap/codec.go
+++ b/x/gamm/pool-models/stableswap/codec.go
@@ -8,8 +8,8 @@ import (
 
 	authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec"
 
-	types "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // RegisterLegacyAminoCodec registers the necessary x/gamm interfaces and concrete types
diff --git a/x/gamm/pool-models/stableswap/integration_test.go b/x/gamm/pool-models/stableswap/integration_test.go
index b3a7a565649..eb787bcf2fa 100644
--- a/x/gamm/pool-models/stableswap/integration_test.go
+++ b/x/gamm/pool-models/stableswap/integration_test.go
@@ -11,8 +11,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
 )
 
 type TestSuite struct {
diff --git a/x/gamm/pool-models/stableswap/msgs.go b/x/gamm/pool-models/stableswap/msgs.go
index 64a166ecc44..380ddeb9fdc 100644
--- a/x/gamm/pool-models/stableswap/msgs.go
+++ b/x/gamm/pool-models/stableswap/msgs.go
@@ -5,8 +5,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/gamm/pool-models/stableswap/msgs_test.go b/x/gamm/pool-models/stableswap/msgs_test.go
index 3afeec3732e..44addecdf15 100644
--- a/x/gamm/pool-models/stableswap/msgs_test.go
+++ b/x/gamm/pool-models/stableswap/msgs_test.go
@@ -7,9 +7,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	stableswap "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	stableswap "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func baseCreatePoolMsgGen(sender sdk.AccAddress) *stableswap.MsgCreateStableswapPool {
diff --git a/x/gamm/pool-models/stableswap/pool.go b/x/gamm/pool-models/stableswap/pool.go
index 8d47b9c9c8d..522e5e95796 100644
--- a/x/gamm/pool-models/stableswap/pool.go
+++ b/x/gamm/pool-models/stableswap/pool.go
@@ -10,9 +10,9 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/gamm/pool-models/stableswap/pool_params.go b/x/gamm/pool-models/stableswap/pool_params.go
index 48478a19eca..36a4989ec6e 100644
--- a/x/gamm/pool-models/stableswap/pool_params.go
+++ b/x/gamm/pool-models/stableswap/pool_params.go
@@ -3,7 +3,7 @@ package stableswap
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func (params PoolParams) Validate() error {
diff --git a/x/gamm/pool-models/stableswap/pool_test.go b/x/gamm/pool-models/stableswap/pool_test.go
index 02131aa333d..b2d6e43b9f4 100644
--- a/x/gamm/pool-models/stableswap/pool_test.go
+++ b/x/gamm/pool-models/stableswap/pool_test.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/internal/cfmm_common"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/internal/cfmm_common"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
index 58d43cf2c70..0ae89fbc734 100644
--- a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
+++ b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go
@@ -141,48 +141,48 @@ func init() {
 
 var fileDescriptor_ae0f054436f9999a = []byte{
 	// 676 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xbf, 0x6f, 0xd3, 0x4c,
-	0x18, 0x8e, 0xdb, 0xb4, 0xe9, 0x77, 0xfd, 0xbe, 0x54, 0x9f, 0xa9, 0x84, 0xdb, 0x0a, 0x5f, 0x6a,
-	0xd1, 0x2a, 0xaa, 0x88, 0x4d, 0x40, 0x20, 0xd1, 0xad, 0x29, 0x2a, 0x42, 0x42, 0xa8, 0xb8, 0x13,
-	0x3f, 0xa4, 0x70, 0xb6, 0x2f, 0xee, 0x09, 0x3b, 0x67, 0x7c, 0xe7, 0xd2, 0x2e, 0xcc, 0x88, 0x89,
-	0x91, 0xb1, 0x33, 0x13, 0x03, 0x7f, 0x44, 0x05, 0x4b, 0x47, 0xc4, 0x60, 0x50, 0x3b, 0xb0, 0xa2,
-	0xfc, 0x05, 0xe8, 0xce, 0x97, 0xa4, 0x29, 0x50, 0x55, 0x62, 0x49, 0xee, 0x7d, 0xdf, 0xe7, 0x7d,
-	0xde, 0x5f, 0x8f, 0x0c, 0x6e, 0x51, 0x16, 0x53, 0x46, 0x98, 0x13, 0xa2, 0x38, 0x76, 0x12, 0x4a,
-	0xa3, 0x46, 0x4c, 0x03, 0x1c, 0x31, 0x87, 0x71, 0xe4, 0x45, 0x98, 0xbd, 0x40, 0xc9, 0x89, 0x67,
-	0x5b, 0x20, 0xec, 0x24, 0xa5, 0x9c, 0xea, 0x2b, 0x2a, 0xd5, 0x16, 0xa9, 0xb6, 0x08, 0x14, 0x99,
-	0xf6, 0x10, 0x6e, 0xef, 0x34, 0x3d, 0xcc, 0x51, 0x73, 0x7e, 0xce, 0x97, 0xe0, 0xb6, 0xcc, 0x74,
-	0x0a, 0xa3, 0xa0, 0x99, 0x9f, 0x0d, 0x69, 0x48, 0x0b, 0xbf, 0x78, 0x29, 0xef, 0xff, 0x28, 0x26,
-	0x5d, 0xea, 0xc8, 0x5f, 0xe5, 0x32, 0x43, 0x4a, 0xc3, 0x08, 0x3b, 0xd2, 0xf2, 0xb2, 0x8e, 0x13,
-	0x64, 0x29, 0xe2, 0x84, 0x76, 0x55, 0x1c, 0x9e, 0x8e, 0x73, 0x12, 0x63, 0xc6, 0x51, 0x9c, 0xf4,
-	0x09, 0x8a, 0xba, 0x0e, 0xca, 0xf8, 0xb6, 0xa3, 0x3a, 0x93, 0xc6, 0xa9, 0xb8, 0x87, 0x18, 0x1e,
-	0xc4, 0x7d, 0x4a, 0x54, 0x01, 0xeb, 0x87, 0x06, 0xc0, 0x26, 0xa5, 0xd1, 0x26, 0x4a, 0x51, 0xcc,
-	0xf4, 0x27, 0x60, 0x4a, 0xae, 0xa4, 0x83, 0xb1, 0xa1, 0xd5, 0xb4, 0xfa, 0x3f, 0xad, 0xb5, 0x83,
-	0x1c, 0x96, 0xbe, 0xe4, 0x70, 0x39, 0x24, 0x7c, 0x3b, 0xf3, 0x6c, 0x9f, 0xc6, 0x6a, 0x56, 0xf5,
-	0xd7, 0x60, 0xc1, 0x33, 0x87, 0xef, 0x25, 0x98, 0xd9, 0xb7, 0xb1, 0xdf, 0xcb, 0xe1, 0xcc, 0x1e,
-	0x8a, 0xa3, 0x55, 0xab, 0xcf, 0x63, 0xb9, 0x15, 0xf1, 0xdc, 0xc0, 0x58, 0xb0, 0xe3, 0x5d, 0xc2,
-	0x25, 0xfb, 0xd8, 0xdf, 0xb1, 0xf7, 0x79, 0x2c, 0xb7, 0x22, 0x9e, 0x1b, 0x18, 0xaf, 0x2e, 0xbf,
-	0xfe, 0xfe, 0x7e, 0x65, 0x71, 0xe4, 0xf6, 0x5b, 0x83, 0xab, 0x0d, 0x67, 0xb4, 0x3e, 0x4d, 0x80,
-	0xb2, 0x30, 0xf5, 0x2b, 0xa0, 0x82, 0x82, 0x20, 0xc5, 0x8c, 0xa9, 0x59, 0xf5, 0x5e, 0x0e, 0xab,
-	0x05, 0xbf, 0x0a, 0x58, 0x6e, 0x1f, 0xa2, 0x57, 0xc1, 0x18, 0x09, 0x64, 0xdb, 0x65, 0x77, 0x8c,
-	0x04, 0xfa, 0x4b, 0x30, 0x2d, 0xf4, 0xd1, 0x4e, 0x24, 0xab, 0x31, 0x5e, 0xd3, 0xea, 0xd3, 0xd7,
-	0x6e, 0xda, 0xe7, 0x17, 0x90, 0x3d, 0xec, 0xa9, 0xb5, 0x24, 0xf6, 0xd0, 0xcb, 0xe1, 0x25, 0xb5,
-	0xbb, 0x51, 0x71, 0xaa, 0x1a, 0x96, 0x0b, 0x92, 0xe1, 0xa9, 0x1e, 0x80, 0xd9, 0x4e, 0xc6, 0xb3,
-	0x14, 0x17, 0x90, 0x90, 0xee, 0xe0, 0xb4, 0x4b, 0x53, 0xa3, 0x2c, 0x47, 0x81, 0xbd, 0x1c, 0x2e,
-	0x14, 0x64, 0xbf, 0x43, 0x59, 0xae, 0x5e, 0xb8, 0x45, 0x0f, 0x77, 0x94, 0x53, 0x7f, 0x08, 0xfe,
-	0xe5, 0x94, 0xa3, 0xa8, 0xcd, 0xb6, 0x51, 0x8a, 0x99, 0x31, 0x21, 0x67, 0x9a, 0xb3, 0x95, 0xb6,
-	0x85, 0x86, 0x06, 0xcd, 0xaf, 0x53, 0xd2, 0x6d, 0x2d, 0xa8, 0xb6, 0x2f, 0x14, 0x95, 0x4e, 0x26,
-	0x5b, 0xee, 0xb4, 0x34, 0xb7, 0xa4, 0xa5, 0xa7, 0xa0, 0x2a, 0x1b, 0x88, 0xc8, 0xf3, 0x8c, 0x04,
-	0x84, 0xef, 0x19, 0x93, 0xb5, 0xf1, 0xb3, 0xc9, 0xaf, 0x0a, 0xf2, 0x77, 0x5f, 0x61, 0xfd, 0x1c,
-	0xda, 0x10, 0x09, 0xcc, 0xfd, 0x4f, 0x94, 0xb8, 0xd7, 0xaf, 0xa0, 0xdf, 0x07, 0x33, 0xcc, 0x47,
-	0x11, 0xe9, 0x86, 0xed, 0x0e, 0xf2, 0x39, 0x4d, 0x99, 0x51, 0xa9, 0x8d, 0xd7, 0xcb, 0xad, 0xa5,
-	0x5e, 0x0e, 0x17, 0x7f, 0xd9, 0xf4, 0x29, 0xac, 0xe5, 0x56, 0x95, 0x67, 0xa3, 0x70, 0xe8, 0x4f,
-	0xc1, 0xdc, 0x28, 0xa6, 0xed, 0xd3, 0x2e, 0x4f, 0x69, 0x14, 0xe1, 0xd4, 0x98, 0x92, 0x6b, 0xbf,
-	0xdc, 0xcb, 0x61, 0x4d, 0x31, 0xff, 0x09, 0x6a, 0xb9, 0x17, 0x47, 0x88, 0xd7, 0x07, 0x91, 0xd5,
-	0xe6, 0xab, 0x7d, 0x58, 0x7a, 0xbb, 0x0f, 0x4b, 0x1f, 0x3f, 0x34, 0x26, 0xc4, 0x69, 0xee, 0x0a,
-	0x4d, 0x2f, 0x9c, 0xa1, 0xe9, 0xd6, 0xe3, 0x83, 0x23, 0x53, 0x3b, 0x3c, 0x32, 0xb5, 0x6f, 0x47,
-	0xa6, 0xf6, 0xe6, 0xd8, 0x2c, 0x1d, 0x1e, 0x9b, 0xa5, 0xcf, 0xc7, 0x66, 0xe9, 0xd1, 0xda, 0x89,
-	0xbd, 0x29, 0x86, 0x46, 0x84, 0x3c, 0xd6, 0x37, 0x9c, 0x9d, 0xe6, 0x0d, 0x67, 0xf7, 0xac, 0x8f,
-	0xa4, 0x37, 0x29, 0x3f, 0x12, 0xd7, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x35, 0x9b, 0xa2, 0x3d,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x4f, 0xd4, 0x4c,
+	0x18, 0xde, 0xc2, 0xc2, 0xf2, 0x0d, 0xdf, 0xb7, 0xe4, 0xab, 0x24, 0x16, 0x88, 0x9d, 0xa5, 0x11,
+	0xb2, 0x21, 0x6e, 0xeb, 0x6a, 0x42, 0x22, 0x37, 0x16, 0x83, 0x31, 0x31, 0x06, 0xcb, 0xc9, 0x1f,
+	0xc9, 0x3a, 0x6d, 0x67, 0xcb, 0xc4, 0x76, 0xa7, 0x76, 0xa6, 0x08, 0x17, 0xcf, 0xc6, 0x93, 0x47,
+	0x8f, 0x9c, 0x3d, 0x79, 0xf0, 0x8f, 0x20, 0x7a, 0xe1, 0x68, 0x3c, 0x54, 0x03, 0x07, 0xaf, 0x66,
+	0xff, 0x02, 0x33, 0xd3, 0xd9, 0x5d, 0x16, 0x95, 0x90, 0x78, 0xd9, 0x9d, 0xf7, 0x7d, 0x9f, 0xf7,
+	0x79, 0x7f, 0x3d, 0x29, 0xb8, 0x45, 0x59, 0x4c, 0x19, 0x61, 0x4e, 0x88, 0xe2, 0xd8, 0x49, 0x28,
+	0x8d, 0x1a, 0x31, 0x0d, 0x70, 0xc4, 0x1c, 0xc6, 0x91, 0x17, 0x61, 0xf6, 0x02, 0x25, 0xa7, 0x9e,
+	0x6d, 0x81, 0xb0, 0x93, 0x94, 0x72, 0xaa, 0xaf, 0xa8, 0x54, 0x5b, 0xa4, 0xda, 0x22, 0x50, 0x64,
+	0xda, 0x43, 0xb8, 0xbd, 0xdb, 0xf4, 0x30, 0x47, 0xcd, 0xf9, 0x39, 0x5f, 0x82, 0xdb, 0x32, 0xd3,
+	0x29, 0x8c, 0x82, 0x66, 0x7e, 0x36, 0xa4, 0x21, 0x2d, 0xfc, 0xe2, 0xa5, 0xbc, 0xff, 0xa3, 0x98,
+	0x74, 0xa9, 0x23, 0x7f, 0x95, 0xcb, 0x0c, 0x29, 0x0d, 0x23, 0xec, 0x48, 0xcb, 0xcb, 0x3a, 0x4e,
+	0x90, 0xa5, 0x88, 0x13, 0xda, 0x55, 0x71, 0x78, 0x36, 0xce, 0x49, 0x8c, 0x19, 0x47, 0x71, 0xd2,
+	0x27, 0x28, 0xea, 0x3a, 0x28, 0xe3, 0x3b, 0x8e, 0xea, 0x4c, 0x1a, 0x67, 0xe2, 0x1e, 0x62, 0x78,
+	0x10, 0xf7, 0x29, 0x51, 0x05, 0xac, 0x1f, 0x1a, 0x00, 0x5b, 0x94, 0x46, 0x5b, 0x28, 0x45, 0x31,
+	0xd3, 0x9f, 0x80, 0x29, 0xb9, 0x92, 0x0e, 0xc6, 0x86, 0x56, 0xd3, 0xea, 0xff, 0xb4, 0xd6, 0x0f,
+	0x73, 0x58, 0xfa, 0x92, 0xc3, 0xe5, 0x90, 0xf0, 0x9d, 0xcc, 0xb3, 0x7d, 0x1a, 0xab, 0x59, 0xd5,
+	0x5f, 0x83, 0x05, 0xcf, 0x1c, 0xbe, 0x9f, 0x60, 0x66, 0xdf, 0xc6, 0x7e, 0x2f, 0x87, 0x33, 0xfb,
+	0x28, 0x8e, 0xd6, 0xac, 0x3e, 0x8f, 0xe5, 0x56, 0xc4, 0x73, 0x13, 0x63, 0xc1, 0x8e, 0xf7, 0x08,
+	0x97, 0xec, 0x63, 0x7f, 0xc7, 0xde, 0xe7, 0xb1, 0xdc, 0x8a, 0x78, 0x6e, 0x62, 0xbc, 0xb6, 0xfc,
+	0xfa, 0xfb, 0xfb, 0x95, 0xc5, 0x91, 0xdb, 0x6f, 0x0f, 0xae, 0x36, 0x9c, 0xd1, 0xfa, 0x34, 0x01,
+	0xca, 0xc2, 0xd4, 0xaf, 0x81, 0x0a, 0x0a, 0x82, 0x14, 0x33, 0xa6, 0x66, 0xd5, 0x7b, 0x39, 0xac,
+	0x16, 0xfc, 0x2a, 0x60, 0xb9, 0x7d, 0x88, 0x5e, 0x05, 0x63, 0x24, 0x90, 0x6d, 0x97, 0xdd, 0x31,
+	0x12, 0xe8, 0x2f, 0xc1, 0xb4, 0xd0, 0x47, 0x3b, 0x91, 0xac, 0xc6, 0x78, 0x4d, 0xab, 0x4f, 0xdf,
+	0x58, 0xb5, 0x2f, 0x2e, 0x20, 0x7b, 0xd8, 0x53, 0x6b, 0x49, 0xec, 0xa1, 0x97, 0xc3, 0x2b, 0x6a,
+	0x77, 0xa3, 0xe2, 0x54, 0x35, 0x2c, 0x17, 0x24, 0xc3, 0x53, 0x3d, 0x00, 0xb3, 0x9d, 0x8c, 0x67,
+	0x29, 0x2e, 0x20, 0x21, 0xdd, 0xc5, 0x69, 0x97, 0xa6, 0x46, 0x59, 0x8e, 0x02, 0x7b, 0x39, 0x5c,
+	0x28, 0xc8, 0x7e, 0x87, 0xb2, 0x5c, 0xbd, 0x70, 0x8b, 0x1e, 0xee, 0x28, 0xa7, 0xfe, 0x10, 0xfc,
+	0xcb, 0x29, 0x47, 0x51, 0x9b, 0xed, 0xa0, 0x14, 0x33, 0x63, 0x42, 0xce, 0x34, 0x67, 0x2b, 0x6d,
+	0x0b, 0x0d, 0x0d, 0x9a, 0xdf, 0xa0, 0xa4, 0xdb, 0x5a, 0x50, 0x6d, 0x5f, 0x2a, 0x2a, 0x9d, 0x4e,
+	0xb6, 0xdc, 0x69, 0x69, 0x6e, 0x4b, 0x4b, 0x4f, 0x41, 0x55, 0x36, 0x10, 0x91, 0xe7, 0x19, 0x09,
+	0x08, 0xdf, 0x37, 0x26, 0x6b, 0xe3, 0xe7, 0x93, 0x5f, 0x17, 0xe4, 0xef, 0xbe, 0xc2, 0xfa, 0x05,
+	0xb4, 0x21, 0x12, 0x98, 0xfb, 0x9f, 0x28, 0x71, 0xaf, 0x5f, 0x41, 0xbf, 0x0f, 0x66, 0x98, 0x8f,
+	0x22, 0xd2, 0x0d, 0xdb, 0x1d, 0xe4, 0x73, 0x9a, 0x32, 0xa3, 0x52, 0x1b, 0xaf, 0x97, 0x5b, 0x4b,
+	0xbd, 0x1c, 0x2e, 0xfe, 0xb2, 0xe9, 0x33, 0x58, 0xcb, 0xad, 0x2a, 0xcf, 0x66, 0xe1, 0xd0, 0x9f,
+	0x82, 0xb9, 0x51, 0x4c, 0xdb, 0xa7, 0x5d, 0x9e, 0xd2, 0x28, 0xc2, 0xa9, 0x31, 0x25, 0xd7, 0x7e,
+	0xb5, 0x97, 0xc3, 0x9a, 0x62, 0xfe, 0x13, 0xd4, 0x72, 0x2f, 0x8f, 0x10, 0x6f, 0x0c, 0x22, 0x6b,
+	0xcd, 0x57, 0x07, 0xb0, 0xf4, 0xf6, 0x00, 0x96, 0x3e, 0x7e, 0x68, 0x4c, 0x88, 0xd3, 0xdc, 0x15,
+	0x9a, 0x5e, 0x38, 0x47, 0xd3, 0xad, 0xc7, 0x87, 0xc7, 0xa6, 0x76, 0x74, 0x6c, 0x6a, 0xdf, 0x8e,
+	0x4d, 0xed, 0xcd, 0x89, 0x59, 0x3a, 0x3a, 0x31, 0x4b, 0x9f, 0x4f, 0xcc, 0xd2, 0xa3, 0xf5, 0x53,
+	0x7b, 0x53, 0x0c, 0x8d, 0x08, 0x79, 0xac, 0x6f, 0x38, 0xbb, 0xcd, 0x55, 0x67, 0xef, 0xbc, 0x8f,
+	0xa4, 0x37, 0x29, 0x3f, 0x12, 0x37, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0xce, 0x87, 0x39, 0xee,
 	0x52, 0x05, 0x00, 0x00,
 }
 
diff --git a/x/gamm/pool-models/stableswap/tx.pb.go b/x/gamm/pool-models/stableswap/tx.pb.go
index f17f47c6b5b..fafb3e38ff1 100644
--- a/x/gamm/pool-models/stableswap/tx.pb.go
+++ b/x/gamm/pool-models/stableswap/tx.pb.go
@@ -278,46 +278,46 @@ var fileDescriptor_46b7c8a0f24de97c = []byte{
 	// 669 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x6f, 0xd3, 0x40,
 	0x14, 0x8e, 0x9b, 0x10, 0xc4, 0x55, 0x80, 0x6a, 0x45, 0x6d, 0x1a, 0x24, 0x3b, 0xb8, 0x0c, 0x69,
-	0x21, 0x3e, 0xda, 0x0a, 0x24, 0xba, 0x35, 0x41, 0x45, 0x15, 0x44, 0x2a, 0xae, 0x58, 0x60, 0x08,
-	0x17, 0xfb, 0x6a, 0x0e, 0x6c, 0x9f, 0xf1, 0x5d, 0xfa, 0x63, 0x64, 0x65, 0xe2, 0xcf, 0x40, 0x4c,
-	0xfc, 0x15, 0xa8, 0x63, 0x47, 0xa6, 0x80, 0xd2, 0xa1, 0x7b, 0x16, 0xc4, 0x86, 0xee, 0x7c, 0xf9,
-	0x25, 0x35, 0xfd, 0x81, 0xba, 0x24, 0xe7, 0xe7, 0xef, 0x7d, 0xdf, 0x7b, 0xdf, 0x7b, 0x3e, 0xf0,
-	0x80, 0xb2, 0x90, 0x32, 0xc2, 0xa0, 0x8f, 0xc2, 0x10, 0xc6, 0x94, 0x06, 0xd5, 0x90, 0x7a, 0x38,
-	0x60, 0x90, 0x71, 0xd4, 0x0a, 0x30, 0xdb, 0x43, 0x31, 0xe4, 0xfb, 0x76, 0x9c, 0x50, 0x4e, 0xf5,
-	0x25, 0x85, 0xb6, 0x05, 0xda, 0x16, 0xe8, 0x14, 0x6c, 0x0f, 0xc1, 0xf6, 0xee, 0x72, 0x0b, 0x73,
-	0xb4, 0x5c, 0x32, 0x5c, 0x09, 0x86, 0x2d, 0xc4, 0x30, 0x54, 0x41, 0xe8, 0x52, 0x12, 0xa5, 0x5c,
-	0xa5, 0x82, 0x4f, 0x7d, 0x2a, 0x8f, 0x50, 0x9c, 0x54, 0x74, 0x06, 0x85, 0x24, 0xa2, 0x50, 0xfe,
-	0xaa, 0xd0, 0x93, 0x8b, 0x94, 0x38, 0x3c, 0x36, 0x05, 0x22, 0x4d, 0xb5, 0x4e, 0x72, 0x60, 0xae,
-	0xc1, 0xfc, 0x7a, 0x82, 0x11, 0xc7, 0xdb, 0x03, 0xc8, 0x16, 0xa5, 0x81, 0xbe, 0x08, 0xf2, 0x0c,
-	0x47, 0x1e, 0x4e, 0x8a, 0x5a, 0x59, 0xab, 0xdc, 0xa8, 0xcd, 0xf4, 0x3a, 0xe6, 0xcd, 0x03, 0x14,
-	0x06, 0x6b, 0x56, 0x1a, 0xb7, 0x1c, 0x05, 0xd0, 0x29, 0x98, 0x16, 0xa4, 0xcd, 0x18, 0x25, 0x28,
-	0x64, 0xc5, 0xa9, 0xb2, 0x56, 0x99, 0x5e, 0x79, 0x6c, 0x5f, 0xdc, 0x0c, 0x5b, 0x28, 0x6e, 0xc9,
-	0xec, 0xda, 0x6c, 0xaf, 0x63, 0xea, 0xa9, 0xce, 0x08, 0xa9, 0xe5, 0x80, 0x78, 0x80, 0xd1, 0x3f,
-	0x69, 0x60, 0x96, 0x44, 0x84, 0x13, 0x14, 0xc8, 0x76, 0x9a, 0x01, 0xf9, 0xd8, 0x26, 0x1e, 0xe1,
-	0x07, 0xc5, 0x6c, 0x39, 0x5b, 0x99, 0x5e, 0x99, 0xb7, 0x53, 0x77, 0x6d, 0xe1, 0xee, 0x40, 0xa5,
-	0x4e, 0x49, 0x54, 0x7b, 0x78, 0xd8, 0x31, 0x33, 0xdf, 0x7e, 0x99, 0x15, 0x9f, 0xf0, 0x77, 0xed,
-	0x96, 0xed, 0xd2, 0x10, 0xaa, 0x51, 0xa4, 0x7f, 0x55, 0xe6, 0x7d, 0x80, 0xfc, 0x20, 0xc6, 0x4c,
-	0x26, 0x30, 0xa7, 0xa0, 0xa4, 0x44, 0x91, 0x2f, 0xfa, 0x42, 0x7a, 0x03, 0xdc, 0x66, 0x2e, 0x0a,
-	0x48, 0xe4, 0x37, 0x77, 0x90, 0xcb, 0x69, 0xc2, 0x8a, 0xb9, 0x72, 0xb6, 0x92, 0xab, 0xdd, 0xeb,
-	0x75, 0xcc, 0xb2, 0x32, 0x6a, 0xe8, 0xfa, 0x38, 0xd6, 0x72, 0x6e, 0xa9, 0xc0, 0x46, 0x9a, 0xab,
-	0xbf, 0x04, 0x85, 0x9d, 0x36, 0x6f, 0x27, 0x38, 0x6d, 0xc8, 0xa7, 0xbb, 0x38, 0x89, 0x68, 0x52,
-	0xbc, 0x26, 0xcd, 0x37, 0x7b, 0x1d, 0xf3, 0x4e, 0xca, 0x79, 0x1a, 0xca, 0x72, 0xf4, 0x34, 0x2c,
-	0x4a, 0x7c, 0xa6, 0x82, 0xfa, 0x5b, 0x30, 0x3f, 0xae, 0xda, 0x74, 0x69, 0xc4, 0x13, 0x1a, 0x04,
-	0x38, 0x29, 0xe6, 0x25, 0xef, 0x68, 0xad, 0x93, 0xa0, 0x96, 0x33, 0x37, 0x56, 0x6b, 0x7d, 0xf0,
-	0x66, 0xad, 0xf2, 0xf9, 0xe4, 0xfb, 0xd2, 0xc2, 0xd8, 0xfe, 0xb9, 0x72, 0x97, 0xaa, 0xc3, 0xce,
-	0xab, 0xa2, 0x52, 0x6b, 0x03, 0x98, 0x13, 0x16, 0xcd, 0xc1, 0x2c, 0xa6, 0x11, 0xc3, 0xfa, 0x02,
-	0xb8, 0x2e, 0x9b, 0x22, 0x9e, 0xdc, 0xb8, 0x5c, 0x0d, 0x74, 0x3b, 0x66, 0x5e, 0x40, 0x36, 0x9f,
-	0x3a, 0x79, 0xf1, 0x6a, 0xd3, 0xb3, 0xfe, 0x68, 0xe0, 0x6e, 0x83, 0xf9, 0x29, 0xc5, 0xf6, 0x1e,
-	0x8a, 0xd7, 0xbd, 0xf7, 0x6d, 0xc6, 0xb7, 0xc7, 0xcd, 0xbc, 0xc4, 0xee, 0x8e, 0xa8, 0x4e, 0x4d,
-	0x52, 0x3d, 0x6d, 0xd6, 0xd9, 0xff, 0x9f, 0xf5, 0xda, 0xaa, 0xb0, 0xcd, 0x1e, 0xb3, 0x6d, 0xc4,
-	0x2f, 0x24, 0x3b, 0xaa, 0xaa, 0x9c, 0xaa, 0x12, 0xb4, 0xee, 0x83, 0xc5, 0x73, 0x1b, 0xef, 0x7b,
-	0xb9, 0xf2, 0x77, 0x0a, 0x64, 0x1b, 0xcc, 0xd7, 0xbf, 0x6a, 0xa0, 0x70, 0xea, 0xd7, 0x5d, 0xbf,
-	0xcc, 0xd7, 0x39, 0x61, 0x72, 0xa5, 0xe7, 0x57, 0x40, 0x32, 0x18, 0xff, 0x0f, 0x0d, 0x18, 0xe7,
-	0x8c, 0xb5, 0x71, 0x49, 0xbd, 0xb3, 0xe9, 0x4a, 0xaf, 0xae, 0x94, 0xae, 0xdf, 0x48, 0xed, 0xcd,
-	0x61, 0xd7, 0xd0, 0x8e, 0xba, 0x86, 0xf6, 0xbb, 0x6b, 0x68, 0x5f, 0x8e, 0x8d, 0xcc, 0xd1, 0xb1,
-	0x91, 0xf9, 0x79, 0x6c, 0x64, 0x5e, 0xaf, 0x8f, 0x5c, 0x39, 0x4a, 0xba, 0x1a, 0xa0, 0x16, 0xeb,
-	0x3f, 0xc0, 0xdd, 0xe5, 0x47, 0x70, 0xff, 0xac, 0x7b, 0xbc, 0x95, 0x97, 0x17, 0xf7, 0xea, 0xbf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, 0xc7, 0x9f, 0xed, 0x98, 0x06, 0x00, 0x00,
+	0x21, 0x3e, 0xda, 0x4a, 0x95, 0xe8, 0xd6, 0x04, 0x15, 0x55, 0x10, 0xa9, 0xb8, 0x62, 0x81, 0x21,
+	0x5c, 0xec, 0xab, 0x39, 0xb0, 0x7d, 0xc6, 0x77, 0xe9, 0x8f, 0x91, 0x95, 0x89, 0x3f, 0x03, 0x31,
+	0xf1, 0x57, 0xa0, 0x8e, 0x1d, 0x99, 0x02, 0x4a, 0x87, 0xee, 0x59, 0x10, 0x1b, 0xba, 0xf3, 0xe5,
+	0x97, 0xd4, 0xf4, 0x07, 0xea, 0x92, 0x9c, 0x9f, 0xbf, 0xf7, 0x7d, 0xef, 0x7d, 0xef, 0xf9, 0xc0,
+	0x23, 0xca, 0x42, 0xca, 0x08, 0x83, 0x3e, 0x0a, 0x43, 0x18, 0x53, 0x1a, 0x54, 0x43, 0xea, 0xe1,
+	0x80, 0x41, 0xc6, 0x51, 0x2b, 0xc0, 0x6c, 0x1f, 0xc5, 0x90, 0x1f, 0xd8, 0x71, 0x42, 0x39, 0xd5,
+	0x97, 0x14, 0xda, 0x16, 0x68, 0x5b, 0xa0, 0x53, 0xb0, 0x3d, 0x04, 0xdb, 0x7b, 0xcb, 0x2d, 0xcc,
+	0xd1, 0x72, 0xc9, 0x70, 0x25, 0x18, 0xb6, 0x10, 0xc3, 0x50, 0x05, 0xa1, 0x4b, 0x49, 0x94, 0x72,
+	0x95, 0x0a, 0x3e, 0xf5, 0xa9, 0x3c, 0x42, 0x71, 0x52, 0xd1, 0x19, 0x14, 0x92, 0x88, 0x42, 0xf9,
+	0xab, 0x42, 0x4f, 0x2e, 0x53, 0xe2, 0xf0, 0xd8, 0x14, 0x88, 0x34, 0xd5, 0x3a, 0xcd, 0x81, 0xb9,
+	0x06, 0xf3, 0xeb, 0x09, 0x46, 0x1c, 0xef, 0x0c, 0x20, 0xdb, 0x94, 0x06, 0xfa, 0x22, 0xc8, 0x33,
+	0x1c, 0x79, 0x38, 0x29, 0x6a, 0x65, 0xad, 0x72, 0xab, 0x36, 0xd3, 0xeb, 0x98, 0xb7, 0x0f, 0x51,
+	0x18, 0xac, 0x5b, 0x69, 0xdc, 0x72, 0x14, 0x40, 0xa7, 0x60, 0x5a, 0x90, 0x36, 0x63, 0x94, 0xa0,
+	0x90, 0x15, 0xa7, 0xca, 0x5a, 0x65, 0x7a, 0x65, 0xcd, 0xbe, 0xbc, 0x19, 0xb6, 0x50, 0xdc, 0x96,
+	0xd9, 0xb5, 0xd9, 0x5e, 0xc7, 0xd4, 0x53, 0x9d, 0x11, 0x52, 0xcb, 0x01, 0xf1, 0x00, 0xa3, 0x7f,
+	0xd2, 0xc0, 0x2c, 0x89, 0x08, 0x27, 0x28, 0x90, 0xed, 0x34, 0x03, 0xf2, 0xb1, 0x4d, 0x3c, 0xc2,
+	0x0f, 0x8b, 0xd9, 0x72, 0xb6, 0x32, 0xbd, 0x32, 0x6f, 0xa7, 0xee, 0xda, 0xc2, 0xdd, 0x81, 0x4a,
+	0x9d, 0x92, 0xa8, 0xf6, 0xf8, 0xa8, 0x63, 0x66, 0xbe, 0xfd, 0x32, 0x2b, 0x3e, 0xe1, 0xef, 0xda,
+	0x2d, 0xdb, 0xa5, 0x21, 0x54, 0xa3, 0x48, 0xff, 0xaa, 0xcc, 0xfb, 0x00, 0xf9, 0x61, 0x8c, 0x99,
+	0x4c, 0x60, 0x4e, 0x41, 0x49, 0x89, 0x22, 0x5f, 0xf4, 0x85, 0xf4, 0x06, 0xb8, 0xcb, 0x5c, 0x14,
+	0x90, 0xc8, 0x6f, 0xee, 0x22, 0x97, 0xd3, 0x84, 0x15, 0x73, 0xe5, 0x6c, 0x25, 0x57, 0x7b, 0xd0,
+	0xeb, 0x98, 0x65, 0x65, 0xd4, 0xd0, 0xf5, 0x71, 0xac, 0xe5, 0xdc, 0x51, 0x81, 0xcd, 0x34, 0x57,
+	0x7f, 0x09, 0x0a, 0xbb, 0x6d, 0xde, 0x4e, 0x70, 0xda, 0x90, 0x4f, 0xf7, 0x70, 0x12, 0xd1, 0xa4,
+	0x78, 0x43, 0x9a, 0x6f, 0xf6, 0x3a, 0xe6, 0xbd, 0x94, 0xf3, 0x2c, 0x94, 0xe5, 0xe8, 0x69, 0x58,
+	0x94, 0xf8, 0x4c, 0x05, 0xf5, 0xb7, 0x60, 0x7e, 0x5c, 0xb5, 0xe9, 0xd2, 0x88, 0x27, 0x34, 0x08,
+	0x70, 0x52, 0xcc, 0x4b, 0xde, 0xd1, 0x5a, 0x27, 0x41, 0x2d, 0x67, 0x6e, 0xac, 0xd6, 0xfa, 0xe0,
+	0xcd, 0x7a, 0xe5, 0xf3, 0xe9, 0xf7, 0xa5, 0x85, 0xb1, 0xfd, 0x73, 0xe5, 0x2e, 0x55, 0x87, 0x9d,
+	0x57, 0x45, 0xa5, 0xd6, 0x26, 0x30, 0x27, 0x2c, 0x9a, 0x83, 0x59, 0x4c, 0x23, 0x86, 0xf5, 0x05,
+	0x70, 0x53, 0x36, 0x45, 0x3c, 0xb9, 0x71, 0xb9, 0x1a, 0xe8, 0x76, 0xcc, 0xbc, 0x80, 0x6c, 0x3d,
+	0x75, 0xf2, 0xe2, 0xd5, 0x96, 0x67, 0xfd, 0xd1, 0xc0, 0xfd, 0x06, 0xf3, 0x53, 0x8a, 0x9d, 0x7d,
+	0x14, 0x6f, 0x78, 0xef, 0xdb, 0x8c, 0xef, 0x8c, 0x9b, 0x79, 0x85, 0xdd, 0x1d, 0x51, 0x9d, 0x9a,
+	0xa4, 0x7a, 0xd6, 0xac, 0xb3, 0xff, 0x3f, 0xeb, 0xf5, 0x55, 0x61, 0x9b, 0x3d, 0x66, 0xdb, 0x88,
+	0x5f, 0x48, 0x76, 0x54, 0x55, 0x39, 0x55, 0x25, 0x68, 0x3d, 0x04, 0x8b, 0x17, 0x36, 0xde, 0xf7,
+	0x72, 0xe5, 0xef, 0x14, 0xc8, 0x36, 0x98, 0xaf, 0x7f, 0xd5, 0x40, 0xe1, 0xcc, 0xaf, 0xbb, 0x7e,
+	0x95, 0xaf, 0x73, 0xc2, 0xe4, 0x4a, 0xcf, 0xaf, 0x81, 0x64, 0x30, 0xfe, 0x1f, 0x1a, 0x30, 0x2e,
+	0x18, 0x6b, 0xe3, 0x8a, 0x7a, 0xe7, 0xd3, 0x95, 0x5e, 0x5d, 0x2b, 0x5d, 0xbf, 0x91, 0xda, 0x9b,
+	0xa3, 0xae, 0xa1, 0x1d, 0x77, 0x0d, 0xed, 0x77, 0xd7, 0xd0, 0xbe, 0x9c, 0x18, 0x99, 0xe3, 0x13,
+	0x23, 0xf3, 0xf3, 0xc4, 0xc8, 0xbc, 0xde, 0x18, 0xb9, 0x72, 0x94, 0x74, 0x35, 0x40, 0x2d, 0xd6,
+	0x7f, 0x80, 0x7b, 0xcb, 0x6b, 0xf0, 0xe0, 0xbc, 0x7b, 0xbc, 0x95, 0x97, 0x17, 0xf7, 0xea, 0xbf,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0xdb, 0x04, 0x3e, 0x98, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/gamm/pool-models/stableswap/util_test.go b/x/gamm/pool-models/stableswap/util_test.go
index 70b6216d1c3..fd35ed7bfc1 100644
--- a/x/gamm/pool-models/stableswap/util_test.go
+++ b/x/gamm/pool-models/stableswap/util_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func createTestPool(t *testing.T, poolLiquidity sdk.Coins, spreadFactor, exitFee sdk.Dec, scalingFactors []uint64) types.CFMMPoolI {
diff --git a/x/gamm/simulation/sim_msgs.go b/x/gamm/simulation/sim_msgs.go
index 6e355ba3d73..2e4dfc86015 100644
--- a/x/gamm/simulation/sim_msgs.go
+++ b/x/gamm/simulation/sim_msgs.go
@@ -9,11 +9,11 @@ import (
 	legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	balancertypes "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	balancertypes "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var PoolCreationFee = sdk.NewInt64Coin("stake", 10_000_000)
diff --git a/x/gamm/simulation/sim_setup.go b/x/gamm/simulation/sim_setup.go
index 81d4368ed2b..80b77eddd4f 100644
--- a/x/gamm/simulation/sim_setup.go
+++ b/x/gamm/simulation/sim_setup.go
@@ -1,8 +1,8 @@
 package gammsimulation
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
 )
 
 func DefaultActions(keeper keeper.Keeper) []simtypes.Action {
diff --git a/x/gamm/types/expected_keepers.go b/x/gamm/types/expected_keepers.go
index 2984d3cbedc..e7b0490a508 100644
--- a/x/gamm/types/expected_keepers.go
+++ b/x/gamm/types/expected_keepers.go
@@ -7,8 +7,8 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // AccountKeeper defines the account contract that must be fulfilled when
diff --git a/x/gamm/types/genesis.pb.go b/x/gamm/types/genesis.pb.go
index dac734dabe2..629398f37e4 100644
--- a/x/gamm/types/genesis.pb.go
+++ b/x/gamm/types/genesis.pb.go
@@ -258,41 +258,41 @@ func init() {
 }
 
 var fileDescriptor_5a324eb7f1dd793e = []byte{
-	// 536 bytes of a gzipped FileDescriptorProto
+	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x3f, 0x6f, 0xd3, 0x4e,
 	0x18, 0xc7, 0x73, 0x6d, 0x1a, 0xfd, 0x7e, 0x57, 0x04, 0xa9, 0x95, 0xc1, 0xad, 0x2a, 0x27, 0x32,
-	0x12, 0xca, 0x92, 0x33, 0x29, 0x74, 0xc9, 0x46, 0x22, 0x81, 0x40, 0x05, 0x55, 0x2e, 0x13, 0x8b,
-	0x75, 0x76, 0xae, 0xc6, 0x8a, 0x7d, 0x4f, 0xe4, 0xbb, 0x54, 0xcd, 0xc6, 0xc8, 0x88, 0xc4, 0x0c,
-	0x62, 0x66, 0xe6, 0x45, 0x54, 0x4c, 0x1d, 0x99, 0x0a, 0x4a, 0x16, 0x66, 0x5e, 0x01, 0xba, 0x3f,
-	0x8e, 0xaa, 0x12, 0x75, 0xb2, 0x9f, 0xe7, 0xf9, 0x3c, 0x5f, 0x3f, 0xcf, 0xf7, 0xce, 0xd8, 0x07,
-	0x51, 0x80, 0xc8, 0x44, 0x90, 0xd2, 0xa2, 0x08, 0xce, 0xfa, 0x31, 0x93, 0xb4, 0x1f, 0xa4, 0x8c,
-	0x33, 0x91, 0x09, 0x32, 0x2d, 0x41, 0x82, 0xd3, 0xb2, 0x0c, 0x51, 0x0c, 0xb1, 0xcc, 0x5e, 0x2b,
-	0x85, 0x14, 0x34, 0x10, 0xa8, 0x37, 0xc3, 0xee, 0xed, 0xa6, 0x00, 0x69, 0xce, 0x02, 0x1d, 0xc5,
-	0xb3, 0xd3, 0x80, 0xf2, 0x79, 0x55, 0x4a, 0xb4, 0x4e, 0x64, 0x7a, 0x4c, 0x60, 0x4b, 0x9e, 0x89,
-	0x82, 0x98, 0x0a, 0xb6, 0x1a, 0x22, 0x81, 0x8c, 0x9b, 0xba, 0xff, 0x19, 0xe1, 0xc6, 0x31, 0x2d,
-	0x69, 0x21, 0x9c, 0x8f, 0x08, 0xef, 0x4c, 0x01, 0xf2, 0x28, 0x29, 0x19, 0x95, 0x19, 0xf0, 0xe8,
-	0x94, 0x31, 0x17, 0x75, 0x36, 0xbb, 0xdb, 0x07, 0xbb, 0xc4, 0xaa, 0x2a, 0x9d, 0x6a, 0x50, 0x32,
-	0x82, 0x8c, 0x0f, 0x8f, 0x2e, 0xae, 0xda, 0xb5, 0x3f, 0x57, 0x6d, 0x77, 0x4e, 0x8b, 0x7c, 0xe0,
-	0xff, 0xa3, 0xe0, 0x7f, 0xfd, 0xd9, 0xee, 0xa6, 0x99, 0x7c, 0x3b, 0x8b, 0x49, 0x02, 0x85, 0x1d,
-	0xcf, 0x3e, 0x7a, 0x62, 0x3c, 0x09, 0xe4, 0x7c, 0xca, 0x84, 0x16, 0x13, 0xe1, 0x3d, 0xd5, 0x3f,
-	0xb2, 0xed, 0x4f, 0x19, 0xf3, 0xdf, 0x6d, 0xe0, 0x3b, 0xcf, 0x8c, 0x69, 0x27, 0x92, 0x4a, 0xe6,
-	0x1c, 0xe2, 0x2d, 0xc5, 0x08, 0x3b, 0x59, 0x8b, 0x18, 0x5f, 0x48, 0xe5, 0x0b, 0x79, 0xc2, 0xe7,
-	0xc3, 0xff, 0xbf, 0x7f, 0xeb, 0x6d, 0x1d, 0x03, 0xe4, 0xcf, 0x43, 0x43, 0x3b, 0x5d, 0xdc, 0xe4,
-	0xec, 0x5c, 0x46, 0x7a, 0x3e, 0x3e, 0x2b, 0x62, 0x56, 0xba, 0x1b, 0x1d, 0xd4, 0xad, 0x87, 0x77,
-	0x55, 0x5e, 0xb1, 0xaf, 0x74, 0xd6, 0x19, 0xe0, 0xc6, 0x54, 0x3b, 0xe2, 0x6e, 0x76, 0x50, 0x77,
-	0xfb, 0x60, 0x9f, 0xac, 0x3b, 0x25, 0x62, 0x5c, 0x1b, 0xd6, 0xd5, 0xfa, 0xa1, 0xed, 0x70, 0x4e,
-	0xf0, 0x4e, 0x91, 0xa5, 0xa5, 0x59, 0xbe, 0x64, 0x09, 0x94, 0x63, 0xe1, 0xd6, 0xb5, 0xcc, 0x83,
-	0xf5, 0x32, 0x2f, 0x2b, 0x3c, 0x34, 0x74, 0xd8, 0x2c, 0x6e, 0x64, 0xfc, 0x4f, 0x08, 0x37, 0x6f,
-	0x62, 0xce, 0x7b, 0x84, 0xef, 0xc7, 0x34, 0xa7, 0x3c, 0x61, 0x65, 0x24, 0x21, 0x4a, 0x80, 0x27,
-	0x8c, 0xcb, 0x92, 0x4a, 0x36, 0x36, 0x4b, 0xe6, 0x19, 0x9f, 0x54, 0x2e, 0x3d, 0x5e, 0xff, 0xf1,
-	0xa1, 0x15, 0x78, 0x0d, 0xa3, 0x6b, 0xed, 0xca, 0x8b, 0xa3, 0x8c, 0x4f, 0xec, 0x6e, 0xed, 0xf8,
-	0x56, 0x4a, 0xf8, 0x1c, 0x7b, 0xb7, 0x0b, 0x29, 0xf3, 0x57, 0xb3, 0xea, 0xd9, 0xb2, 0xb1, 0x8b,
-	0x8c, 0xf9, 0x55, 0x5e, 0x1f, 0xd6, 0xd8, 0xd9, 0xc7, 0x38, 0xc9, 0x57, 0x8c, 0x39, 0xa0, 0xff,
-	0x92, 0xdc, 0x54, 0x07, 0xf5, 0xdf, 0x5f, 0xda, 0x68, 0xf8, 0xe2, 0x62, 0xe1, 0xa1, 0xcb, 0x85,
-	0x87, 0x7e, 0x2d, 0x3c, 0xf4, 0x61, 0xe9, 0xd5, 0x2e, 0x97, 0x5e, 0xed, 0xc7, 0xd2, 0xab, 0xbd,
-	0x79, 0x78, 0xed, 0x9e, 0xd9, 0x85, 0x7b, 0x39, 0x8d, 0x45, 0x15, 0x04, 0x67, 0xfd, 0xc3, 0xe0,
-	0xdc, 0xfc, 0x91, 0xfa, 0xd6, 0xc5, 0x0d, 0x7d, 0x6d, 0x1e, 0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff,
-	0xe6, 0xf6, 0xdd, 0x82, 0xae, 0x03, 0x00, 0x00,
+	0x12, 0xca, 0x92, 0x33, 0x29, 0x7f, 0x86, 0x6c, 0x24, 0x12, 0x08, 0x54, 0x50, 0xe5, 0x32, 0xb1,
+	0x58, 0x67, 0xe7, 0x6a, 0xac, 0xd8, 0xf7, 0x44, 0xbe, 0x4b, 0xd5, 0x6c, 0x8c, 0x8c, 0x48, 0xcc,
+	0x20, 0x66, 0x66, 0x5e, 0x44, 0xc5, 0xd4, 0x91, 0xa9, 0xa0, 0x64, 0x61, 0xe6, 0x15, 0xa0, 0xfb,
+	0xe3, 0xa8, 0x2a, 0x51, 0x27, 0xfb, 0x79, 0x9e, 0xcf, 0xf3, 0xf5, 0xf3, 0x7c, 0xef, 0x8c, 0x7d,
+	0x10, 0x05, 0x88, 0x4c, 0x04, 0x29, 0x2d, 0x8a, 0xe0, 0xb4, 0x1f, 0x33, 0x49, 0xfb, 0x41, 0xca,
+	0x38, 0x13, 0x99, 0x20, 0xd3, 0x12, 0x24, 0x38, 0x2d, 0xcb, 0x10, 0xc5, 0x10, 0xcb, 0xec, 0xb5,
+	0x52, 0x48, 0x41, 0x03, 0x81, 0x7a, 0x33, 0xec, 0xde, 0x6e, 0x0a, 0x90, 0xe6, 0x2c, 0xd0, 0x51,
+	0x3c, 0x3b, 0x09, 0x28, 0x9f, 0x57, 0xa5, 0x44, 0xeb, 0x44, 0xa6, 0xc7, 0x04, 0xb6, 0xe4, 0x99,
+	0x28, 0x88, 0xa9, 0x60, 0xab, 0x21, 0x12, 0xc8, 0xb8, 0xa9, 0xfb, 0x9f, 0x11, 0x6e, 0x1c, 0xd1,
+	0x92, 0x16, 0xc2, 0xf9, 0x88, 0xf0, 0xce, 0x14, 0x20, 0x8f, 0x92, 0x92, 0x51, 0x99, 0x01, 0x8f,
+	0x4e, 0x18, 0x73, 0x51, 0x67, 0xb3, 0xbb, 0x7d, 0xb0, 0x4b, 0xac, 0xaa, 0xd2, 0xa9, 0x06, 0x25,
+	0x23, 0xc8, 0xf8, 0xf0, 0xf0, 0xfc, 0xb2, 0x5d, 0xfb, 0x73, 0xd9, 0x76, 0xe7, 0xb4, 0xc8, 0x07,
+	0xfe, 0x3f, 0x0a, 0xfe, 0xd7, 0x9f, 0xed, 0x6e, 0x9a, 0xc9, 0xb7, 0xb3, 0x98, 0x24, 0x50, 0xd8,
+	0xf1, 0xec, 0xa3, 0x27, 0xc6, 0x93, 0x40, 0xce, 0xa7, 0x4c, 0x68, 0x31, 0x11, 0xde, 0x51, 0xfd,
+	0x23, 0xdb, 0xfe, 0x94, 0x31, 0xff, 0xdd, 0x06, 0xbe, 0xf5, 0xcc, 0x98, 0x76, 0x2c, 0xa9, 0x64,
+	0xce, 0x23, 0xbc, 0xa5, 0x18, 0x61, 0x27, 0x6b, 0x11, 0xe3, 0x0b, 0xa9, 0x7c, 0x21, 0x4f, 0xf8,
+	0x7c, 0xf8, 0xff, 0xf7, 0x6f, 0xbd, 0xad, 0x23, 0x80, 0xfc, 0x79, 0x68, 0x68, 0xa7, 0x8b, 0x9b,
+	0x9c, 0x9d, 0xc9, 0x48, 0xcf, 0xc7, 0x67, 0x45, 0xcc, 0x4a, 0x77, 0xa3, 0x83, 0xba, 0xf5, 0xf0,
+	0xb6, 0xca, 0x2b, 0xf6, 0x95, 0xce, 0x3a, 0x03, 0xdc, 0x98, 0x6a, 0x47, 0xdc, 0xcd, 0x0e, 0xea,
+	0x6e, 0x1f, 0xec, 0x93, 0x75, 0xa7, 0x44, 0x8c, 0x6b, 0xc3, 0xba, 0x5a, 0x3f, 0xb4, 0x1d, 0xce,
+	0x31, 0xde, 0x29, 0xb2, 0xb4, 0x34, 0xcb, 0x97, 0x2c, 0x81, 0x72, 0x2c, 0xdc, 0xba, 0x96, 0xb9,
+	0xb7, 0x5e, 0xe6, 0x65, 0x85, 0x87, 0x86, 0x0e, 0x9b, 0xc5, 0xb5, 0x8c, 0xff, 0x09, 0xe1, 0xe6,
+	0x75, 0xcc, 0x79, 0x8f, 0xf0, 0xdd, 0x98, 0xe6, 0x94, 0x27, 0xac, 0x8c, 0x24, 0x44, 0x09, 0xf0,
+	0x84, 0x71, 0x59, 0x52, 0xc9, 0xc6, 0x66, 0xc9, 0x3c, 0xe3, 0x93, 0xca, 0xa5, 0x87, 0xeb, 0x3f,
+	0x3e, 0xb4, 0x02, 0xaf, 0x61, 0x74, 0xa5, 0x5d, 0x79, 0x71, 0x98, 0xf1, 0x89, 0xdd, 0xad, 0x1d,
+	0xdf, 0x48, 0x09, 0x9f, 0x63, 0xef, 0x66, 0x21, 0x65, 0xfe, 0x6a, 0x56, 0x3d, 0x5b, 0x36, 0x76,
+	0x91, 0x31, 0xbf, 0xca, 0xeb, 0xc3, 0x1a, 0x3b, 0xfb, 0x18, 0x27, 0xf9, 0x8a, 0x31, 0x07, 0xf4,
+	0x5f, 0x92, 0x9b, 0xea, 0xa0, 0xfe, 0xfb, 0x4b, 0x1b, 0x0d, 0x5f, 0x9c, 0x2f, 0x3c, 0x74, 0xb1,
+	0xf0, 0xd0, 0xaf, 0x85, 0x87, 0x3e, 0x2c, 0xbd, 0xda, 0xc5, 0xd2, 0xab, 0xfd, 0x58, 0x7a, 0xb5,
+	0x37, 0xf7, 0xaf, 0xdc, 0x33, 0xbb, 0x70, 0x2f, 0xa7, 0xb1, 0xa8, 0x82, 0xe0, 0xb4, 0xff, 0x38,
+	0x38, 0x33, 0x7f, 0xa4, 0xbe, 0x75, 0x71, 0x43, 0x5f, 0x9b, 0x07, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xa6, 0x5b, 0xa5, 0xbb, 0xae, 0x03, 0x00, 0x00,
 }
 
 func (this *BalancerToConcentratedPoolLink) Equal(that interface{}) bool {
diff --git a/x/gamm/types/gov.pb.go b/x/gamm/types/gov.pb.go
index 7d2efdff49e..d8c69ee38d8 100644
--- a/x/gamm/types/gov.pb.go
+++ b/x/gamm/types/gov.pb.go
@@ -144,9 +144,9 @@ var fileDescriptor_f31b9a6c0dbbdfa3 = []byte{
 	0x42, 0x0d, 0x16, 0x10, 0xf8, 0x3d, 0xe9, 0xe4, 0x75, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72,
 	0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7,
 	0x72, 0x0c, 0x51, 0x06, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50,
-	0xc3, 0x74, 0x73, 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x43, 0x53, 0xfd, 0x0a, 0x48, 0xda,
+	0xc3, 0x74, 0x73, 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x43, 0x33, 0xfd, 0x0a, 0x48, 0xda,
 	0x2c, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x27, 0x32, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x81, 0x4d, 0x42, 0x3f, 0x04, 0x03, 0x00, 0x00,
+	0xff, 0xc1, 0xe0, 0x3a, 0x06, 0x04, 0x03, 0x00, 0x00,
 }
 
 func (this *ReplaceMigrationRecordsProposal) Equal(that interface{}) bool {
diff --git a/x/gamm/types/gov_test.go b/x/gamm/types/gov_test.go
index 37d229da2a0..f0ccfd369d1 100644
--- a/x/gamm/types/gov_test.go
+++ b/x/gamm/types/gov_test.go
@@ -6,7 +6,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func TestUpdateMigrationRecordsProposalMarshalUnmarshal(t *testing.T) {
diff --git a/x/gamm/types/key_test.go b/x/gamm/types/key_test.go
index d8aeda00ed9..c13d21a20ae 100644
--- a/x/gamm/types/key_test.go
+++ b/x/gamm/types/key_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func TestGetPoolShareDenom(t *testing.T) {
diff --git a/x/gamm/types/msgs_test.go b/x/gamm/types/msgs_test.go
index af9290ab1b6..b68c2bf8da3 100644
--- a/x/gamm/types/msgs_test.go
+++ b/x/gamm/types/msgs_test.go
@@ -7,12 +7,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func TestMsgSwapExactAmountIn(t *testing.T) {
diff --git a/x/gamm/types/params.go b/x/gamm/types/params.go
index ae03111fecc..3167da99da2 100644
--- a/x/gamm/types/params.go
+++ b/x/gamm/types/params.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/gamm/types/pool.go b/x/gamm/types/pool.go
index 6c9fce10153..356175825d6 100644
--- a/x/gamm/types/pool.go
+++ b/x/gamm/types/pool.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // CFMMPoolI defines an interface for pools representing constant function
diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go
index ed1c5d9a4fd..58c4270bc29 100644
--- a/x/gamm/types/query.pb.go
+++ b/x/gamm/types/query.pb.go
@@ -14,7 +14,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	types2 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types2 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -1626,130 +1626,130 @@ func init() {
 func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) }
 
 var fileDescriptor_d9a717df9ca609ef = []byte{
-	// 1966 bytes of a gzipped FileDescriptorProto
+	// 1967 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4d, 0x6c, 0x1c, 0x49,
-	0x15, 0x4e, 0x4f, 0x1c, 0xaf, 0xfd, 0x92, 0xd8, 0x4e, 0xad, 0x93, 0x4c, 0xc6, 0xc9, 0x4c, 0x28,
-	0x76, 0xe3, 0x6c, 0x62, 0xf7, 0xd8, 0x89, 0x23, 0xc0, 0x90, 0xdd, 0xd8, 0x5e, 0x3b, 0x19, 0x2b,
-	0x89, 0xbd, 0x9d, 0x15, 0x08, 0x10, 0xb4, 0xda, 0xe3, 0xce, 0xb8, 0x37, 0xd3, 0x5d, 0x93, 0xe9,
-	0xea, 0x8d, 0xad, 0x55, 0xb4, 0xd2, 0x9e, 0x80, 0xcb, 0x22, 0x01, 0x8b, 0x40, 0x08, 0x2e, 0x2b,
-	0x84, 0xb8, 0x82, 0xc4, 0x89, 0x03, 0xe2, 0x12, 0x71, 0x8a, 0x04, 0x07, 0xc4, 0x61, 0x40, 0x09,
-	0xdc, 0x38, 0xf9, 0xb2, 0x57, 0x54, 0x55, 0xaf, 0x7f, 0xe6, 0xc7, 0x3d, 0x3f, 0x4b, 0xa4, 0xdd,
-	0xd3, 0x4c, 0x57, 0xbd, 0x9f, 0xef, 0xfd, 0xd4, 0xab, 0x57, 0x0f, 0xce, 0x33, 0xdf, 0x65, 0xbe,
-	0xe3, 0x17, 0x2b, 0x96, 0xeb, 0x16, 0xdf, 0x9d, 0xdf, 0xb2, 0xb9, 0x35, 0x5f, 0x7c, 0x18, 0xd8,
-	0xf5, 0x3d, 0xbd, 0x56, 0x67, 0x9c, 0x91, 0x49, 0xa4, 0xd0, 0x05, 0x85, 0x8e, 0x14, 0xb9, 0xc9,
-	0x0a, 0xab, 0x30, 0x49, 0x50, 0x14, 0xff, 0x14, 0x6d, 0xee, 0x5c, 0x47, 0x69, 0x7c, 0x17, 0xb7,
-	0x67, 0xc2, 0xed, 0x1a, 0x63, 0x55, 0xd7, 0xf2, 0xac, 0x8a, 0x5d, 0x8f, 0xa8, 0xfc, 0x47, 0x56,
-	0xcd, 0xac, 0xb3, 0x80, 0xdb, 0x48, 0x9d, 0x2f, 0x4b, 0xf2, 0xe2, 0x96, 0xe5, 0xdb, 0x11, 0x55,
-	0x99, 0x39, 0x1e, 0xee, 0x5f, 0x4a, 0xee, 0x4b, 0xc4, 0x11, 0x55, 0xcd, 0xaa, 0x38, 0x9e, 0xc5,
-	0x1d, 0x16, 0xd2, 0x9e, 0xad, 0x30, 0x56, 0xa9, 0xda, 0x45, 0xab, 0xe6, 0x14, 0x2d, 0xcf, 0x63,
-	0x5c, 0x6e, 0xfa, 0xb8, 0x7b, 0x06, 0x77, 0xe5, 0xd7, 0x56, 0x70, 0xbf, 0x68, 0x79, 0x7b, 0xe1,
-	0x96, 0x52, 0x62, 0x2a, 0x53, 0xd5, 0x87, 0xda, 0xa2, 0x2b, 0x30, 0xf1, 0x96, 0xd0, 0xba, 0xc9,
-	0x58, 0xd5, 0xb0, 0x1f, 0x06, 0xb6, 0xcf, 0xc9, 0x65, 0x78, 0x49, 0xd8, 0x66, 0x3a, 0xdb, 0x59,
-	0xed, 0xbc, 0x76, 0x71, 0x68, 0x99, 0xec, 0x37, 0x0a, 0x63, 0x7b, 0x96, 0x5b, 0x5d, 0xa4, 0xb8,
-	0x41, 0x8d, 0x61, 0xf1, 0xaf, 0xb4, 0xbd, 0x98, 0xc9, 0x6a, 0xf4, 0x36, 0x9c, 0x48, 0x08, 0xf1,
-	0x6b, 0xcc, 0xf3, 0x6d, 0x72, 0x15, 0x86, 0x04, 0x89, 0x14, 0x71, 0xf4, 0xca, 0xa4, 0xae, 0xe0,
-	0xe9, 0x21, 0x3c, 0x7d, 0xc9, 0xdb, 0x5b, 0x1e, 0xfd, 0xcb, 0xef, 0x67, 0x8f, 0x08, 0xae, 0x92,
-	0x21, 0x89, 0xa5, 0xb4, 0x6f, 0x27, 0xa4, 0xf9, 0x21, 0xa6, 0x35, 0x80, 0xd8, 0x1f, 0xd9, 0x8c,
-	0x94, 0x79, 0x41, 0x47, 0x53, 0x84, 0xf3, 0x74, 0x15, 0x6e, 0x74, 0x9e, 0xbe, 0x69, 0x55, 0x6c,
-	0xe4, 0x35, 0x12, 0x9c, 0xf4, 0xc7, 0x1a, 0x90, 0xa4, 0x74, 0x04, 0x7b, 0x0d, 0x8e, 0x08, 0xfd,
-	0x7e, 0x56, 0x3b, 0x7f, 0xb8, 0x17, 0xb4, 0x8a, 0x9a, 0xdc, 0xec, 0x80, 0x6a, 0xba, 0x2b, 0x2a,
-	0xa5, 0xb3, 0x09, 0x56, 0x0e, 0x26, 0x25, 0xaa, 0xbb, 0x81, 0x9b, 0x34, 0x5b, 0xfa, 0xe3, 0x2e,
-	0x9c, 0x6c, 0xd9, 0x43, 0xd0, 0xf3, 0x30, 0xea, 0x05, 0xae, 0x19, 0x02, 0x17, 0x91, 0x9a, 0xdc,
-	0x6f, 0x14, 0x26, 0x54, 0xa4, 0xa2, 0x2d, 0x6a, 0x8c, 0x78, 0xc8, 0x2a, 0xe5, 0xad, 0xa0, 0x2e,
-	0xb1, 0xf2, 0xf6, 0x5e, 0xcd, 0x1e, 0x24, 0xec, 0x74, 0x1d, 0x41, 0xc5, 0x42, 0x62, 0x50, 0x92,
-	0x98, 0xef, 0xd5, 0x6c, 0x29, 0x67, 0x34, 0x09, 0x2a, 0xda, 0xa2, 0xc6, 0x48, 0x0d, 0x59, 0xe9,
-	0x1f, 0x34, 0xc8, 0x4b, 0x61, 0x2b, 0x56, 0xb5, 0xbc, 0xce, 0x1c, 0x4f, 0x08, 0xbd, 0xb7, 0x63,
-	0xd5, 0x6d, 0x7f, 0x10, 0x6c, 0x64, 0x07, 0x46, 0x39, 0x7b, 0x60, 0x7b, 0xbe, 0xe9, 0x88, 0xa0,
-	0x88, 0x80, 0x9e, 0x69, 0x0a, 0x4a, 0x18, 0x8e, 0x15, 0xe6, 0x78, 0xcb, 0x73, 0x4f, 0x1a, 0x85,
-	0x43, 0xbf, 0xfd, 0x67, 0xe1, 0x62, 0xc5, 0xe1, 0x3b, 0xc1, 0x96, 0x5e, 0x66, 0x2e, 0x1e, 0x11,
-	0xfc, 0x99, 0xf5, 0xb7, 0x1f, 0x14, 0x05, 0x66, 0x5f, 0x32, 0xf8, 0xc6, 0x88, 0x92, 0x5e, 0xf2,
-	0xe8, 0x07, 0x19, 0x28, 0x1c, 0x88, 0x1c, 0x1d, 0xe2, 0xc3, 0x84, 0x2f, 0x56, 0x4c, 0x16, 0x70,
-	0xd3, 0x72, 0x59, 0xe0, 0x71, 0xf4, 0x4b, 0x49, 0x68, 0xfe, 0x47, 0xa3, 0x70, 0xa1, 0x07, 0xcd,
-	0x25, 0x8f, 0xef, 0x37, 0x0a, 0xa7, 0x95, 0xc5, 0xad, 0xf2, 0xa8, 0x31, 0x26, 0x97, 0x36, 0x02,
-	0xbe, 0x24, 0x17, 0xc8, 0x3b, 0x00, 0xe8, 0x02, 0x16, 0xf0, 0x17, 0xe1, 0x03, 0xf4, 0xf0, 0x46,
-	0xc0, 0xe9, 0xcf, 0x35, 0x98, 0x8e, 0x9c, 0xb0, 0xba, 0xeb, 0x70, 0xe1, 0x04, 0x49, 0xb5, 0x56,
-	0x67, 0x6e, 0x73, 0x1c, 0x4f, 0xb7, 0xc4, 0x31, 0x8a, 0xd9, 0xd7, 0x61, 0x5c, 0x59, 0xe5, 0x78,
-	0xa1, 0x93, 0x32, 0xd2, 0x49, 0x7a, 0x7f, 0x4e, 0x32, 0x8e, 0x4b, 0x31, 0x25, 0x4f, 0x39, 0x82,
-	0x7e, 0xa4, 0xc1, 0xc5, 0xee, 0xe0, 0x30, 0x54, 0xcd, 0x5e, 0xd3, 0x5e, 0xa8, 0xd7, 0x56, 0xe1,
-	0x54, 0x74, 0x80, 0x36, 0xad, 0xba, 0xe5, 0x0e, 0x94, 0xeb, 0xf4, 0x26, 0x9c, 0x6e, 0x13, 0x83,
-	0xd6, 0xcc, 0xc0, 0x70, 0x4d, 0xae, 0xa4, 0x95, 0x60, 0x03, 0x69, 0xe8, 0x5b, 0x78, 0x06, 0xdf,
-	0x66, 0xdc, 0xaa, 0x0a, 0x69, 0xb7, 0x9d, 0x87, 0x81, 0xb3, 0xed, 0xf0, 0xbd, 0x81, 0xaf, 0x85,
-	0x8f, 0x35, 0x3c, 0x1d, 0x9d, 0x64, 0x22, 0xc8, 0xc7, 0x30, 0x5a, 0x0d, 0x17, 0xbb, 0x7b, 0xfc,
-	0x4d, 0xe1, 0xf1, 0xb8, 0x9a, 0x44, 0x9c, 0xb4, 0xbf, 0x28, 0x44, 0x7c, 0x12, 0xe6, 0x1a, 0xba,
-	0x50, 0xa2, 0x1c, 0xbc, 0xec, 0xd0, 0x00, 0xb2, 0xed, 0x72, 0xd0, 0xcc, 0x6f, 0xc2, 0x31, 0x2e,
-	0x96, 0x4d, 0x99, 0x9d, 0x61, 0x44, 0x52, 0x2c, 0x9d, 0x42, 0x4b, 0x5f, 0x56, 0xca, 0x92, 0xcc,
-	0xd4, 0x38, 0xca, 0x63, 0x15, 0xf4, 0x8f, 0x1a, 0xbc, 0xd2, 0x56, 0x83, 0xee, 0xb2, 0x7b, 0x8f,
-	0xac, 0xda, 0xe7, 0xa2, 0x86, 0x7e, 0xa2, 0xc1, 0xab, 0x5d, 0xf0, 0xa3, 0x13, 0xdf, 0xef, 0xef,
-	0x78, 0xae, 0xa2, 0x0b, 0x4f, 0x84, 0x2e, 0x0c, 0x59, 0xe9, 0x80, 0x67, 0x96, 0xdc, 0x01, 0x50,
-	0x21, 0xc0, 0xaa, 0x3a, 0x48, 0x7d, 0x1a, 0x55, 0x12, 0x44, 0x09, 0xf8, 0xaf, 0x86, 0x97, 0xe8,
-	0xbd, 0x1a, 0xe3, 0x9b, 0x75, 0xa7, 0x3c, 0xd0, 0x55, 0x4c, 0x56, 0x61, 0x42, 0x18, 0x6f, 0x5a,
-	0xbe, 0x6f, 0x73, 0x73, 0xdb, 0xf6, 0x98, 0x8b, 0xd8, 0xa6, 0xe2, 0x2b, 0xa3, 0x95, 0x82, 0x1a,
-	0x63, 0x62, 0x69, 0x49, 0xac, 0xbc, 0x29, 0x16, 0xc8, 0x2d, 0x38, 0xf1, 0x30, 0x60, 0xbc, 0x59,
-	0xce, 0x61, 0x29, 0xe7, 0xec, 0x7e, 0xa3, 0x90, 0x55, 0x72, 0xda, 0x48, 0xa8, 0x31, 0x2e, 0xd7,
-	0x62, 0x49, 0xe2, 0x50, 0xad, 0x0f, 0x8d, 0x0c, 0x4d, 0x1c, 0x31, 0x8e, 0x3e, 0x72, 0xf8, 0x8e,
-	0x88, 0xe4, 0x9a, 0x6d, 0xd3, 0x3f, 0x69, 0x30, 0x15, 0xb7, 0x5e, 0xdf, 0x70, 0xf8, 0xce, 0x9a,
-	0x53, 0xe5, 0x76, 0x3d, 0x34, 0xfa, 0x3a, 0x1c, 0x77, 0x1d, 0xcf, 0x4c, 0x96, 0x03, 0xa1, 0x3c,
-	0xbb, 0xdf, 0x28, 0x4c, 0x2a, 0xe5, 0x4d, 0xdb, 0xd4, 0x38, 0xe6, 0x3a, 0x5e, 0x54, 0x51, 0xc8,
-	0x54, 0xb2, 0xf1, 0x90, 0xf6, 0xc7, 0x2d, 0x46, 0x4b, 0xfb, 0x78, 0x78, 0xe0, 0xf6, 0xf1, 0x97,
-	0x1a, 0x9c, 0xed, 0x6c, 0xc3, 0x67, 0xa4, 0x91, 0x34, 0xf0, 0x5a, 0x49, 0xa4, 0x14, 0x22, 0x5b,
-	0x00, 0xf0, 0x6b, 0x8c, 0x9b, 0x35, 0xb1, 0x8a, 0xbe, 0x3d, 0x19, 0x1f, 0x8f, 0x78, 0x8f, 0x1a,
-	0xa3, 0x7e, 0xc8, 0x2d, 0x0b, 0xe4, 0x0f, 0x32, 0x70, 0x4e, 0x09, 0x7d, 0x64, 0xd5, 0x56, 0x77,
-	0xad, 0x32, 0x76, 0x19, 0x25, 0x2f, 0x0c, 0xdd, 0x6b, 0x30, 0xec, 0xdb, 0xde, 0xb6, 0x5d, 0x47,
-	0xb9, 0x27, 0xf6, 0x1b, 0x85, 0xe3, 0x28, 0x57, 0xae, 0x53, 0x03, 0x09, 0x92, 0xa9, 0x9d, 0xe9,
-	0x9a, 0xda, 0x3a, 0xa8, 0x3a, 0x21, 0x8a, 0x90, 0x4a, 0xc5, 0x97, 0xf7, 0x1b, 0x85, 0xf1, 0xc4,
-	0x81, 0x36, 0x1d, 0x8f, 0x1a, 0x2f, 0xc9, 0xbf, 0x25, 0x8f, 0x7c, 0x07, 0x86, 0xe5, 0xe3, 0xcb,
-	0xcf, 0x0e, 0x49, 0xf7, 0xeb, 0x7a, 0xf8, 0xee, 0x4b, 0x3c, 0xd6, 0x22, 0x27, 0x0a, 0x73, 0x22,
-	0x4b, 0x04, 0xdb, 0xf2, 0x49, 0x2c, 0x19, 0x88, 0x5d, 0xc9, 0xa2, 0x06, 0x0a, 0x95, 0xce, 0xf8,
-	0x59, 0xd8, 0xac, 0x76, 0x70, 0x46, 0xdc, 0xf1, 0x29, 0x6c, 0xff, 0xbf, 0x8e, 0xaf, 0x55, 0x1e,
-	0x35, 0xc6, 0xe4, 0x52, 0xd4, 0xf1, 0x49, 0x6c, 0x1f, 0x66, 0x3a, 0x63, 0xdb, 0x08, 0xf8, 0x8b,
-	0x8e, 0xd4, 0x77, 0x23, 0xcf, 0x1f, 0x96, 0x9e, 0x2f, 0xf6, 0xe8, 0x79, 0x01, 0xad, 0x07, 0xd7,
-	0x8b, 0x67, 0x45, 0xe4, 0x83, 0xec, 0x50, 0xeb, 0xb3, 0x22, 0xda, 0xa2, 0x78, 0xb1, 0x6c, 0x04,
-	0xca, 0x23, 0x3f, 0x0d, 0x5b, 0x90, 0x4e, 0x1e, 0xc1, 0x70, 0xd5, 0x60, 0x3c, 0x4c, 0xa5, 0xe6,
-	0x68, 0xdd, 0xea, 0x3b, 0x5a, 0xa7, 0x9a, 0x33, 0x33, 0x0a, 0xd6, 0x71, 0x4c, 0xd0, 0x44, 0xac,
-	0xce, 0x42, 0x2e, 0xee, 0x16, 0x5a, 0x7b, 0x2d, 0xfa, 0x8b, 0xb0, 0x56, 0xb6, 0x6e, 0x7f, 0x26,
-	0xda, 0x26, 0x5a, 0x81, 0x4b, 0xea, 0xca, 0x66, 0x5e, 0xd9, 0xf6, 0x78, 0xdd, 0xe2, 0xf6, 0xb6,
-	0xac, 0x67, 0xdb, 0xb7, 0x1d, 0xef, 0x81, 0xe8, 0xac, 0x57, 0xd6, 0xee, 0xdc, 0x09, 0x73, 0xee,
-	0x2b, 0x70, 0xac, 0x7c, 0xdf, 0x55, 0xaf, 0xd1, 0xf8, 0x4a, 0x3b, 0x1d, 0x77, 0x37, 0xc9, 0x5d,
-	0x6a, 0x80, 0xf8, 0x54, 0xd2, 0xa8, 0x09, 0x97, 0x7b, 0x52, 0x84, 0x6e, 0x99, 0x83, 0xc9, 0x72,
-	0x82, 0xb2, 0x59, 0xa3, 0x41, 0xca, 0x6d, 0x52, 0xae, 0xfc, 0xee, 0x14, 0x1c, 0x91, 0x1a, 0xc8,
-	0xfb, 0x20, 0x4b, 0xb2, 0x4f, 0xa6, 0xf5, 0x4e, 0xc3, 0x22, 0xbd, 0x6d, 0x26, 0x91, 0xbb, 0xd8,
-	0x9d, 0x50, 0xe1, 0xa2, 0x5f, 0xfc, 0xe0, 0xaf, 0xff, 0xfe, 0x51, 0xe6, 0x1c, 0x99, 0x2a, 0x76,
-	0x9c, 0x2d, 0xa9, 0x3b, 0xe0, 0x43, 0x0d, 0x46, 0xc2, 0x37, 0x3e, 0xb9, 0x94, 0x22, 0xbb, 0x65,
-	0x48, 0x90, 0xbb, 0xdc, 0x13, 0x2d, 0x42, 0xb9, 0x24, 0xa1, 0x7c, 0x81, 0x14, 0x3a, 0x43, 0x89,
-	0xa6, 0x06, 0xdf, 0xcb, 0x68, 0xe4, 0x63, 0x0d, 0xc6, 0x9a, 0x13, 0x90, 0xcc, 0xa5, 0xe8, 0xea,
-	0x98, 0xca, 0xb9, 0xf9, 0x3e, 0x38, 0x10, 0xe3, 0xac, 0xc4, 0x38, 0x4d, 0x5e, 0xed, 0x8c, 0x51,
-	0x35, 0xc3, 0x51, 0x36, 0x92, 0x5f, 0x6b, 0x30, 0xde, 0x72, 0x1f, 0x93, 0xf9, 0x6e, 0xb1, 0x69,
-	0xeb, 0x3f, 0x72, 0x57, 0xfa, 0x61, 0x41, 0xa4, 0x33, 0x12, 0xe9, 0x05, 0xf2, 0x4a, 0x67, 0xa4,
-	0xf7, 0x25, 0x35, 0x26, 0xa2, 0x4f, 0xbe, 0xaf, 0xc1, 0x90, 0x90, 0x44, 0x2e, 0x74, 0x51, 0x15,
-	0x42, 0x9a, 0xee, 0x4a, 0x87, 0x38, 0xe6, 0xd2, 0x3d, 0x26, 0xd5, 0x17, 0xdf, 0xc3, 0xe3, 0xf0,
-	0x58, 0xc4, 0xf6, 0x23, 0x0d, 0x46, 0xc2, 0xe1, 0x4d, 0x6a, 0xb6, 0xb5, 0x8c, 0x89, 0x52, 0xb3,
-	0xad, 0x75, 0x1a, 0x44, 0xe7, 0x25, 0xae, 0xcb, 0xe4, 0xb5, 0x83, 0x71, 0xc9, 0x86, 0x2d, 0xc6,
-	0x46, 0x7e, 0xa2, 0x41, 0xf6, 0xa0, 0xa7, 0x00, 0x59, 0x4c, 0x51, 0xde, 0xe5, 0xfd, 0x93, 0xfb,
-	0xea, 0x40, 0xbc, 0x68, 0xc8, 0x21, 0xf2, 0x67, 0x0d, 0x48, 0xfb, 0x98, 0x87, 0x2c, 0xf4, 0x28,
-	0xb5, 0x19, 0xcb, 0xb5, 0x3e, 0xb9, 0x10, 0xc5, 0x0d, 0xe9, 0xce, 0x45, 0xf2, 0xe5, 0x9e, 0xc2,
-	0x5c, 0x7c, 0x87, 0x39, 0x9e, 0x29, 0x47, 0xd2, 0xb6, 0xb8, 0xfa, 0x4c, 0xc7, 0x23, 0xff, 0xd1,
-	0x60, 0x2a, 0x65, 0x14, 0x42, 0xae, 0x77, 0x01, 0x96, 0x3e, 0xdf, 0xc9, 0xbd, 0x3e, 0x28, 0x3b,
-	0x1a, 0x78, 0x53, 0x1a, 0xb8, 0x44, 0xde, 0xe8, 0xcd, 0x40, 0x7b, 0xd7, 0xe1, 0xca, 0x40, 0x35,
-	0x3c, 0x52, 0xf7, 0xad, 0xb0, 0xf3, 0x57, 0x1a, 0x40, 0x3c, 0x13, 0x21, 0x33, 0x5d, 0x92, 0xb6,
-	0x69, 0x02, 0x93, 0x9b, 0xed, 0x91, 0x1a, 0x41, 0x2f, 0x48, 0xd0, 0x3a, 0x99, 0xe9, 0x0d, 0xb4,
-	0x1a, 0xb8, 0x90, 0x27, 0x1a, 0x90, 0xf6, 0xc1, 0x48, 0x6a, 0x3e, 0x1d, 0x38, 0x9b, 0x49, 0xcd,
-	0xa7, 0x83, 0xa7, 0x2f, 0x74, 0x55, 0x22, 0xff, 0x1a, 0x59, 0xec, 0x0d, 0xb9, 0x2a, 0xbc, 0xf2,
-	0x33, 0xaa, 0xbe, 0xa2, 0x96, 0xfc, 0x46, 0x83, 0xa3, 0x89, 0xa9, 0x07, 0x99, 0xed, 0x86, 0xa6,
-	0x39, 0x69, 0xf4, 0x5e, 0xc9, 0x11, 0xf5, 0xa2, 0x44, 0xbd, 0x40, 0xae, 0xf4, 0x83, 0x5a, 0x3d,
-	0xbb, 0x45, 0x5e, 0x8c, 0x46, 0x6f, 0x23, 0x92, 0x56, 0xcb, 0x5a, 0x1f, 0xe5, 0xb9, 0x99, 0xde,
-	0x88, 0x11, 0xe4, 0x97, 0xfa, 0x4c, 0x0a, 0xc1, 0x2c, 0x2f, 0xdd, 0xa7, 0x1a, 0x9c, 0x59, 0xf5,
-	0xb9, 0xe3, 0x5a, 0xdc, 0x6e, 0x7b, 0x63, 0x90, 0xab, 0x69, 0x20, 0x0e, 0x78, 0x9e, 0xe5, 0x16,
-	0xfa, 0x63, 0x42, 0x0b, 0x6e, 0x49, 0x0b, 0xde, 0x20, 0xd7, 0x3b, 0x5b, 0x90, 0x38, 0x85, 0x88,
-	0xb6, 0x98, 0x28, 0x35, 0xd1, 0x49, 0x14, 0x26, 0xfd, 0x4d, 0x83, 0xdc, 0x01, 0x26, 0x6d, 0x04,
-	0x9c, 0xf4, 0x01, 0x2f, 0x7e, 0xc9, 0xa4, 0xa6, 0xfc, 0xc1, 0xdd, 0x3e, 0x2d, 0x49, 0xab, 0x6e,
-	0x90, 0xd7, 0x3f, 0x85, 0x55, 0x2c, 0xe0, 0xc2, 0xac, 0x4f, 0x34, 0xc8, 0xa7, 0x37, 0xa6, 0xe4,
-	0x46, 0x5a, 0x3d, 0xec, 0xa5, 0x79, 0xce, 0x2d, 0x7d, 0x0a, 0x09, 0x68, 0xf2, 0xa6, 0x34, 0x79,
-	0x9d, 0xdc, 0xea, 0x6c, 0x72, 0xa7, 0x8e, 0xd9, 0xac, 0x3a, 0xde, 0x03, 0xf3, 0x7e, 0x9d, 0xb9,
-	0xa6, 0xe8, 0xc6, 0x8b, 0xef, 0x25, 0x5b, 0xf4, 0xc7, 0xcb, 0xeb, 0x4f, 0x9e, 0xe5, 0xb5, 0xa7,
-	0xcf, 0xf2, 0xda, 0xbf, 0x9e, 0xe5, 0xb5, 0x1f, 0x3e, 0xcf, 0x1f, 0x7a, 0xfa, 0x3c, 0x7f, 0xe8,
-	0xef, 0xcf, 0xf3, 0x87, 0xbe, 0x35, 0x97, 0x78, 0x4e, 0xa0, 0xb6, 0xd9, 0xaa, 0xb5, 0xe5, 0x47,
-	0xaa, 0xdf, 0x9d, 0xbf, 0x56, 0xdc, 0x55, 0x00, 0xe4, 0xe3, 0x62, 0x6b, 0x58, 0x8e, 0x46, 0xae,
-	0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xaf, 0xd8, 0xf4, 0xc5, 0x1d, 0x00, 0x00,
+	0x15, 0x76, 0x4f, 0x1c, 0xaf, 0xfd, 0xb2, 0xb1, 0x9d, 0x5a, 0x27, 0x99, 0x8c, 0x93, 0x99, 0x50,
+	0xec, 0xc6, 0xd9, 0xc4, 0xee, 0xb1, 0x13, 0x2f, 0x3f, 0x86, 0xec, 0xc6, 0xf6, 0xda, 0xc9, 0x58,
+	0x49, 0xec, 0xed, 0xac, 0x40, 0x80, 0xa0, 0xd5, 0x1e, 0x77, 0xc6, 0xbd, 0x99, 0xee, 0x9a, 0x4c,
+	0x57, 0x6f, 0x6c, 0xad, 0xa2, 0x95, 0xf6, 0x04, 0x5c, 0x16, 0x09, 0x58, 0x04, 0x42, 0x70, 0x59,
+	0x21, 0xc4, 0x15, 0x24, 0x4e, 0x1c, 0x10, 0x97, 0x88, 0x53, 0x24, 0x38, 0x20, 0x0e, 0x03, 0x4a,
+	0xe0, 0xc6, 0xc9, 0x97, 0xbd, 0xa2, 0xaa, 0x7a, 0xfd, 0x33, 0x3f, 0xee, 0xf9, 0x59, 0x22, 0x2d,
+	0xa7, 0x99, 0xae, 0x7a, 0x3f, 0xdf, 0xfb, 0xa9, 0x57, 0xaf, 0x1e, 0x9c, 0x67, 0xbe, 0xcb, 0x7c,
+	0xc7, 0x2f, 0x56, 0x2c, 0xd7, 0x2d, 0xbe, 0xbb, 0xb0, 0x6d, 0x73, 0x6b, 0xa1, 0xf8, 0x20, 0xb0,
+	0xeb, 0xfb, 0x7a, 0xad, 0xce, 0x38, 0x23, 0x53, 0x48, 0xa1, 0x0b, 0x0a, 0x1d, 0x29, 0x72, 0x53,
+	0x15, 0x56, 0x61, 0x92, 0xa0, 0x28, 0xfe, 0x29, 0xda, 0xdc, 0xb9, 0x8e, 0xd2, 0xf8, 0x1e, 0x6e,
+	0xcf, 0x86, 0xdb, 0x35, 0xc6, 0xaa, 0xae, 0xe5, 0x59, 0x15, 0xbb, 0x1e, 0x51, 0xf9, 0x0f, 0xad,
+	0x9a, 0x59, 0x67, 0x01, 0xb7, 0x91, 0x3a, 0x5f, 0x96, 0xe4, 0xc5, 0x6d, 0xcb, 0xb7, 0x23, 0xaa,
+	0x32, 0x73, 0x3c, 0xdc, 0xbf, 0x94, 0xdc, 0x97, 0x88, 0x23, 0xaa, 0x9a, 0x55, 0x71, 0x3c, 0x8b,
+	0x3b, 0x2c, 0xa4, 0x3d, 0x5b, 0x61, 0xac, 0x52, 0xb5, 0x8b, 0x56, 0xcd, 0x29, 0x5a, 0x9e, 0xc7,
+	0xb8, 0xdc, 0xf4, 0x71, 0xf7, 0x0c, 0xee, 0xca, 0xaf, 0xed, 0xe0, 0x5e, 0xd1, 0xf2, 0xf6, 0xc3,
+	0x2d, 0xa5, 0xc4, 0x54, 0xa6, 0xaa, 0x0f, 0xb5, 0x45, 0x57, 0x61, 0xf2, 0x2d, 0xa1, 0x75, 0x8b,
+	0xb1, 0xaa, 0x61, 0x3f, 0x08, 0x6c, 0x9f, 0x93, 0xcb, 0xf0, 0x82, 0xb0, 0xcd, 0x74, 0x76, 0xb2,
+	0xda, 0x79, 0xed, 0xe2, 0xf0, 0x0a, 0x39, 0x68, 0x14, 0xc6, 0xf7, 0x2d, 0xb7, 0xba, 0x44, 0x71,
+	0x83, 0x1a, 0x23, 0xe2, 0x5f, 0x69, 0x67, 0x29, 0x93, 0xd5, 0xe8, 0x2d, 0x38, 0x91, 0x10, 0xe2,
+	0xd7, 0x98, 0xe7, 0xdb, 0xe4, 0x2a, 0x0c, 0x0b, 0x12, 0x29, 0xe2, 0xd8, 0x95, 0x29, 0x5d, 0xc1,
+	0xd3, 0x43, 0x78, 0xfa, 0xb2, 0xb7, 0xbf, 0x32, 0xf6, 0xe7, 0xdf, 0xcd, 0x1d, 0x15, 0x5c, 0x25,
+	0x43, 0x12, 0x4b, 0x69, 0xdf, 0x4a, 0x48, 0xf3, 0x43, 0x4c, 0xeb, 0x00, 0xb1, 0x3f, 0xb2, 0x19,
+	0x29, 0xf3, 0x82, 0x8e, 0xa6, 0x08, 0xe7, 0xe9, 0x2a, 0xdc, 0xe8, 0x3c, 0x7d, 0xcb, 0xaa, 0xd8,
+	0xc8, 0x6b, 0x24, 0x38, 0xe9, 0x8f, 0x34, 0x20, 0x49, 0xe9, 0x08, 0xf6, 0x35, 0x38, 0x2a, 0xf4,
+	0xfb, 0x59, 0xed, 0xfc, 0x91, 0x5e, 0xd0, 0x2a, 0x6a, 0x72, 0xa3, 0x03, 0xaa, 0x99, 0xae, 0xa8,
+	0x94, 0xce, 0x26, 0x58, 0x39, 0x98, 0x92, 0xa8, 0xee, 0x04, 0x6e, 0xd2, 0x6c, 0xe9, 0x8f, 0x3b,
+	0x70, 0xb2, 0x65, 0x0f, 0x41, 0x2f, 0xc0, 0x98, 0x17, 0xb8, 0x66, 0x08, 0x5c, 0x44, 0x6a, 0xea,
+	0xa0, 0x51, 0x98, 0x54, 0x91, 0x8a, 0xb6, 0xa8, 0x31, 0xea, 0x21, 0xab, 0x94, 0xb7, 0x8a, 0xba,
+	0xc4, 0xca, 0xdb, 0xfb, 0x35, 0x7b, 0x90, 0xb0, 0xd3, 0x0d, 0x04, 0x15, 0x0b, 0x89, 0x41, 0x49,
+	0x62, 0xbe, 0x5f, 0xb3, 0xa5, 0x9c, 0xb1, 0x24, 0xa8, 0x68, 0x8b, 0x1a, 0xa3, 0x35, 0x64, 0xa5,
+	0xbf, 0xd7, 0x20, 0x2f, 0x85, 0xad, 0x5a, 0xd5, 0xf2, 0x06, 0x73, 0x3c, 0x21, 0xf4, 0xee, 0xae,
+	0x55, 0xb7, 0xfd, 0x41, 0xb0, 0x91, 0x5d, 0x18, 0xe3, 0xec, 0xbe, 0xed, 0xf9, 0xa6, 0x23, 0x82,
+	0x22, 0x02, 0x7a, 0xa6, 0x29, 0x28, 0x61, 0x38, 0x56, 0x99, 0xe3, 0xad, 0xcc, 0x3f, 0x6e, 0x14,
+	0x86, 0x7e, 0xf3, 0x8f, 0xc2, 0xc5, 0x8a, 0xc3, 0x77, 0x83, 0x6d, 0xbd, 0xcc, 0x5c, 0x3c, 0x22,
+	0xf8, 0x33, 0xe7, 0xef, 0xdc, 0x2f, 0x0a, 0xcc, 0xbe, 0x64, 0xf0, 0x8d, 0x51, 0x25, 0xbd, 0xe4,
+	0xd1, 0x0f, 0x32, 0x50, 0x38, 0x14, 0x39, 0x3a, 0xc4, 0x87, 0x49, 0x5f, 0xac, 0x98, 0x2c, 0xe0,
+	0xa6, 0xe5, 0xb2, 0xc0, 0xe3, 0xe8, 0x97, 0x92, 0xd0, 0xfc, 0xf7, 0x46, 0xe1, 0x42, 0x0f, 0x9a,
+	0x4b, 0x1e, 0x3f, 0x68, 0x14, 0x4e, 0x2b, 0x8b, 0x5b, 0xe5, 0x51, 0x63, 0x5c, 0x2e, 0x6d, 0x06,
+	0x7c, 0x59, 0x2e, 0x90, 0x77, 0x00, 0xd0, 0x05, 0x2c, 0xe0, 0xcf, 0xc3, 0x07, 0xe8, 0xe1, 0xcd,
+	0x80, 0xd3, 0x9f, 0x69, 0x30, 0x13, 0x39, 0x61, 0x6d, 0xcf, 0xe1, 0xc2, 0x09, 0x92, 0x6a, 0xbd,
+	0xce, 0xdc, 0xe6, 0x38, 0x9e, 0x6e, 0x89, 0x63, 0x14, 0xb3, 0xaf, 0xc1, 0x84, 0xb2, 0xca, 0xf1,
+	0x42, 0x27, 0x65, 0xa4, 0x93, 0xf4, 0xfe, 0x9c, 0x64, 0x1c, 0x97, 0x62, 0x4a, 0x9e, 0x72, 0x04,
+	0xfd, 0x48, 0x83, 0x8b, 0xdd, 0xc1, 0x61, 0xa8, 0x9a, 0xbd, 0xa6, 0x3d, 0x57, 0xaf, 0xad, 0xc1,
+	0xa9, 0xe8, 0x00, 0x6d, 0x59, 0x75, 0xcb, 0x1d, 0x28, 0xd7, 0xe9, 0x0d, 0x38, 0xdd, 0x26, 0x06,
+	0xad, 0x99, 0x85, 0x91, 0x9a, 0x5c, 0x49, 0x2b, 0xc1, 0x06, 0xd2, 0xd0, 0xb7, 0xf0, 0x0c, 0xbe,
+	0xcd, 0xb8, 0x55, 0x15, 0xd2, 0x6e, 0x39, 0x0f, 0x02, 0x67, 0xc7, 0xe1, 0xfb, 0x03, 0x5f, 0x0b,
+	0x1f, 0x6b, 0x78, 0x3a, 0x3a, 0xc9, 0x44, 0x90, 0x8f, 0x60, 0xac, 0x1a, 0x2e, 0x76, 0xf7, 0xf8,
+	0x9b, 0xc2, 0xe3, 0x71, 0x35, 0x89, 0x38, 0x69, 0x7f, 0x51, 0x88, 0xf8, 0x24, 0xcc, 0x75, 0x74,
+	0xa1, 0x44, 0x39, 0x78, 0xd9, 0xa1, 0x01, 0x64, 0xdb, 0xe5, 0xa0, 0x99, 0xdf, 0x80, 0x17, 0xb9,
+	0x58, 0x36, 0x65, 0x76, 0x86, 0x11, 0x49, 0xb1, 0x74, 0x1a, 0x2d, 0x7d, 0x49, 0x29, 0x4b, 0x32,
+	0x53, 0xe3, 0x18, 0x8f, 0x55, 0xd0, 0x3f, 0x68, 0xf0, 0x72, 0x5b, 0x0d, 0xba, 0xc3, 0xee, 0x3e,
+	0xb4, 0x6a, 0xff, 0x17, 0x35, 0xf4, 0x13, 0x0d, 0x5e, 0xe9, 0x82, 0x1f, 0x9d, 0xf8, 0x7e, 0x7f,
+	0xc7, 0x73, 0x0d, 0x5d, 0x78, 0x22, 0x74, 0x61, 0xc8, 0x4a, 0x07, 0x3c, 0xb3, 0xe4, 0x36, 0x80,
+	0x0a, 0x01, 0x56, 0xd5, 0x41, 0xea, 0xd3, 0x98, 0x92, 0x20, 0x4a, 0xc0, 0x7f, 0x34, 0xbc, 0x44,
+	0xef, 0xd6, 0x18, 0xdf, 0xaa, 0x3b, 0xe5, 0x81, 0xae, 0x62, 0xb2, 0x06, 0x93, 0xc2, 0x78, 0xd3,
+	0xf2, 0x7d, 0x9b, 0x9b, 0x3b, 0xb6, 0xc7, 0x5c, 0xc4, 0x36, 0x1d, 0x5f, 0x19, 0xad, 0x14, 0xd4,
+	0x18, 0x17, 0x4b, 0xcb, 0x62, 0xe5, 0x4d, 0xb1, 0x40, 0x6e, 0xc2, 0x89, 0x07, 0x01, 0xe3, 0xcd,
+	0x72, 0x8e, 0x48, 0x39, 0x67, 0x0f, 0x1a, 0x85, 0xac, 0x92, 0xd3, 0x46, 0x42, 0x8d, 0x09, 0xb9,
+	0x16, 0x4b, 0x12, 0x87, 0x6a, 0x63, 0x78, 0x74, 0x78, 0xf2, 0xa8, 0x71, 0xec, 0xa1, 0xc3, 0x77,
+	0x45, 0x24, 0xd7, 0x6d, 0x9b, 0xfe, 0x51, 0x83, 0xe9, 0xb8, 0xf5, 0xfa, 0xba, 0xc3, 0x77, 0xd7,
+	0x9d, 0x2a, 0xb7, 0xeb, 0xa1, 0xd1, 0xd7, 0xe0, 0xb8, 0xeb, 0x78, 0x66, 0xb2, 0x1c, 0x08, 0xe5,
+	0xd9, 0x83, 0x46, 0x61, 0x4a, 0x29, 0x6f, 0xda, 0xa6, 0xc6, 0x8b, 0xae, 0xe3, 0x45, 0x15, 0x85,
+	0x4c, 0x27, 0x1b, 0x0f, 0x69, 0x7f, 0xdc, 0x62, 0xb4, 0xb4, 0x8f, 0x47, 0x06, 0x6e, 0x1f, 0x7f,
+	0xa1, 0xc1, 0xd9, 0xce, 0x36, 0x7c, 0x46, 0x1a, 0x49, 0x03, 0xaf, 0x95, 0x44, 0x4a, 0x21, 0xb2,
+	0x45, 0x00, 0xbf, 0xc6, 0xb8, 0x59, 0x13, 0xab, 0xe8, 0xdb, 0x93, 0xf1, 0xf1, 0x88, 0xf7, 0xa8,
+	0x31, 0xe6, 0x87, 0xdc, 0xb2, 0x40, 0x7e, 0x3f, 0x03, 0xe7, 0x94, 0xd0, 0x87, 0x56, 0x6d, 0x6d,
+	0xcf, 0x2a, 0x63, 0x97, 0x51, 0xf2, 0xc2, 0xd0, 0xbd, 0x0a, 0x23, 0xbe, 0xed, 0xed, 0xd8, 0x75,
+	0x94, 0x7b, 0xe2, 0xa0, 0x51, 0x38, 0x8e, 0x72, 0xe5, 0x3a, 0x35, 0x90, 0x20, 0x99, 0xda, 0x99,
+	0xae, 0xa9, 0xad, 0x83, 0xaa, 0x13, 0xa2, 0x08, 0xa9, 0x54, 0x7c, 0xe9, 0xa0, 0x51, 0x98, 0x48,
+	0x1c, 0x68, 0xd3, 0xf1, 0xa8, 0xf1, 0x82, 0xfc, 0x5b, 0xf2, 0xc8, 0xb7, 0x61, 0x44, 0x3e, 0xbe,
+	0xfc, 0xec, 0xb0, 0x74, 0xbf, 0xae, 0x87, 0xef, 0xbe, 0xc4, 0x63, 0x2d, 0x72, 0xa2, 0x30, 0x27,
+	0xb2, 0x44, 0xb0, 0xad, 0x9c, 0xc4, 0x92, 0x81, 0xd8, 0x95, 0x2c, 0x6a, 0xa0, 0x50, 0xe9, 0x8c,
+	0x9f, 0x86, 0xcd, 0x6a, 0x07, 0x67, 0xc4, 0x1d, 0x9f, 0xc2, 0xf6, 0xbf, 0xeb, 0xf8, 0x5a, 0xe5,
+	0x51, 0x63, 0x5c, 0x2e, 0x45, 0x1d, 0x9f, 0xc4, 0xf6, 0x61, 0xa6, 0x33, 0xb6, 0xcd, 0x80, 0x3f,
+	0xef, 0x48, 0x7d, 0x27, 0xf2, 0xfc, 0x11, 0xe9, 0xf9, 0x62, 0x8f, 0x9e, 0x17, 0xd0, 0x7a, 0x70,
+	0xbd, 0x78, 0x56, 0x44, 0x3e, 0xc8, 0x0e, 0xb7, 0x3e, 0x2b, 0xa2, 0x2d, 0x8a, 0x17, 0xcb, 0x66,
+	0xa0, 0x3c, 0xf2, 0x93, 0xb0, 0x05, 0xe9, 0xe4, 0x11, 0x0c, 0x57, 0x0d, 0x26, 0xc2, 0x54, 0x6a,
+	0x8e, 0xd6, 0xcd, 0xbe, 0xa3, 0x75, 0xaa, 0x39, 0x33, 0xa3, 0x60, 0x1d, 0xc7, 0x04, 0x4d, 0xc4,
+	0xea, 0x2c, 0xe4, 0xe2, 0x6e, 0xa1, 0xb5, 0xd7, 0xa2, 0x3f, 0x0f, 0x6b, 0x65, 0xeb, 0xf6, 0x67,
+	0xa2, 0x6d, 0xa2, 0x15, 0xb8, 0xa4, 0xae, 0x6c, 0xe6, 0x95, 0x6d, 0x8f, 0xd7, 0x2d, 0x6e, 0xef,
+	0xc8, 0x7a, 0xb6, 0x73, 0xcb, 0xf1, 0xee, 0x8b, 0xce, 0x7a, 0x75, 0xfd, 0xf6, 0xed, 0x30, 0xe7,
+	0xbe, 0x0c, 0x2f, 0x96, 0xef, 0xb9, 0xea, 0x35, 0x1a, 0x5f, 0x69, 0xa7, 0xe3, 0xee, 0x26, 0xb9,
+	0x4b, 0x0d, 0x10, 0x9f, 0x4a, 0x1a, 0x35, 0xe1, 0x72, 0x4f, 0x8a, 0xd0, 0x2d, 0xf3, 0x30, 0x55,
+	0x4e, 0x50, 0x36, 0x6b, 0x34, 0x48, 0xb9, 0x4d, 0xca, 0x95, 0xdf, 0x9e, 0x82, 0xa3, 0x52, 0x03,
+	0x79, 0x1f, 0x64, 0x49, 0xf6, 0xc9, 0x8c, 0xde, 0x69, 0x58, 0xa4, 0xb7, 0xcd, 0x24, 0x72, 0x17,
+	0xbb, 0x13, 0x2a, 0x5c, 0xf4, 0xf3, 0x1f, 0xfc, 0xe5, 0x5f, 0x3f, 0xcc, 0x9c, 0x23, 0xd3, 0xc5,
+	0x8e, 0xb3, 0x25, 0x75, 0x07, 0x7c, 0xa8, 0xc1, 0x68, 0xf8, 0xc6, 0x27, 0x97, 0x52, 0x64, 0xb7,
+	0x0c, 0x09, 0x72, 0x97, 0x7b, 0xa2, 0x45, 0x28, 0x97, 0x24, 0x94, 0xcf, 0x91, 0x42, 0x67, 0x28,
+	0xd1, 0xd4, 0xe0, 0xbb, 0x19, 0x8d, 0x7c, 0xac, 0xc1, 0x78, 0x73, 0x02, 0x92, 0xf9, 0x14, 0x5d,
+	0x1d, 0x53, 0x39, 0xb7, 0xd0, 0x07, 0x07, 0x62, 0x9c, 0x93, 0x18, 0x67, 0xc8, 0x2b, 0x9d, 0x31,
+	0xaa, 0x66, 0x38, 0xca, 0x46, 0xf2, 0x2b, 0x0d, 0x26, 0x5a, 0xee, 0x63, 0xb2, 0xd0, 0x2d, 0x36,
+	0x6d, 0xfd, 0x47, 0xee, 0x4a, 0x3f, 0x2c, 0x88, 0x74, 0x56, 0x22, 0xbd, 0x40, 0x5e, 0xee, 0x8c,
+	0xf4, 0x9e, 0xa4, 0xc6, 0x44, 0xf4, 0xc9, 0xf7, 0x34, 0x18, 0x16, 0x92, 0xc8, 0x85, 0x2e, 0xaa,
+	0x42, 0x48, 0x33, 0x5d, 0xe9, 0x10, 0xc7, 0x7c, 0xba, 0xc7, 0xa4, 0xfa, 0xe2, 0x7b, 0x78, 0x1c,
+	0x1e, 0x89, 0xd8, 0x7e, 0xa4, 0xc1, 0x68, 0x38, 0xbc, 0x49, 0xcd, 0xb6, 0x96, 0x31, 0x51, 0x6a,
+	0xb6, 0xb5, 0x4e, 0x83, 0xe8, 0x82, 0xc4, 0x75, 0x99, 0xbc, 0x7a, 0x38, 0x2e, 0xd9, 0xb0, 0xc5,
+	0xd8, 0xc8, 0x8f, 0x35, 0xc8, 0x1e, 0xf6, 0x14, 0x20, 0x4b, 0x29, 0xca, 0xbb, 0xbc, 0x7f, 0x72,
+	0x5f, 0x19, 0x88, 0x17, 0x0d, 0x19, 0x22, 0x7f, 0xd2, 0x80, 0xb4, 0x8f, 0x79, 0xc8, 0x62, 0x8f,
+	0x52, 0x9b, 0xb1, 0xbc, 0xd6, 0x27, 0x17, 0xa2, 0xb8, 0x2e, 0xdd, 0xb9, 0x44, 0xbe, 0xd4, 0x53,
+	0x98, 0x8b, 0xef, 0x30, 0xc7, 0x33, 0xe5, 0x48, 0xda, 0x16, 0x57, 0x9f, 0xe9, 0x78, 0xe4, 0xdf,
+	0x1a, 0x4c, 0xa7, 0x8c, 0x42, 0xc8, 0xb5, 0x2e, 0xc0, 0xd2, 0xe7, 0x3b, 0xb9, 0xd7, 0x07, 0x65,
+	0x47, 0x03, 0x6f, 0x48, 0x03, 0x97, 0xc9, 0x1b, 0xbd, 0x19, 0x68, 0xef, 0x39, 0x5c, 0x19, 0xa8,
+	0x86, 0x47, 0xea, 0xbe, 0x15, 0x76, 0xfe, 0x52, 0x03, 0x88, 0x67, 0x22, 0x64, 0xb6, 0x4b, 0xd2,
+	0x36, 0x4d, 0x60, 0x72, 0x73, 0x3d, 0x52, 0x23, 0xe8, 0x45, 0x09, 0x5a, 0x27, 0xb3, 0xbd, 0x81,
+	0x56, 0x03, 0x17, 0xf2, 0x58, 0x03, 0xd2, 0x3e, 0x18, 0x49, 0xcd, 0xa7, 0x43, 0x67, 0x33, 0xa9,
+	0xf9, 0x74, 0xf8, 0xf4, 0x85, 0xae, 0x49, 0xe4, 0x5f, 0x25, 0x4b, 0xbd, 0x21, 0x57, 0x85, 0x57,
+	0x7e, 0x46, 0xd5, 0x57, 0xd4, 0x92, 0x5f, 0x6b, 0x70, 0x2c, 0x31, 0xf5, 0x20, 0x73, 0xdd, 0xd0,
+	0x34, 0x27, 0x8d, 0xde, 0x2b, 0x39, 0xa2, 0x5e, 0x92, 0xa8, 0x17, 0xc9, 0x95, 0x7e, 0x50, 0xab,
+	0x67, 0xb7, 0xc8, 0x8b, 0xb1, 0xe8, 0x6d, 0x44, 0xd2, 0x6a, 0x59, 0xeb, 0xa3, 0x3c, 0x37, 0xdb,
+	0x1b, 0x31, 0x82, 0xfc, 0x62, 0x9f, 0x49, 0x21, 0x98, 0xe5, 0xa5, 0xfb, 0x44, 0x83, 0x33, 0x6b,
+	0x3e, 0x77, 0x5c, 0x8b, 0xdb, 0x6d, 0x6f, 0x0c, 0x72, 0x35, 0x0d, 0xc4, 0x21, 0xcf, 0xb3, 0xdc,
+	0x62, 0x7f, 0x4c, 0x68, 0xc1, 0x4d, 0x69, 0xc1, 0x1b, 0xe4, 0x5a, 0x67, 0x0b, 0x12, 0xa7, 0x10,
+	0xd1, 0x16, 0x13, 0xa5, 0x26, 0x3a, 0x89, 0xc2, 0xa4, 0xbf, 0x6a, 0x90, 0x3b, 0xc4, 0xa4, 0xcd,
+	0x80, 0x93, 0x3e, 0xe0, 0xc5, 0x2f, 0x99, 0xd4, 0x94, 0x3f, 0xbc, 0xdb, 0xa7, 0x25, 0x69, 0xd5,
+	0x75, 0xf2, 0xfa, 0xa7, 0xb0, 0x8a, 0x05, 0x5c, 0x98, 0xf5, 0x89, 0x06, 0xf9, 0xf4, 0xc6, 0x94,
+	0x5c, 0x4f, 0xab, 0x87, 0xbd, 0x34, 0xcf, 0xb9, 0xe5, 0x4f, 0x21, 0x01, 0x4d, 0xde, 0x92, 0x26,
+	0x6f, 0x90, 0x9b, 0x9d, 0x4d, 0xee, 0xd4, 0x31, 0x9b, 0x55, 0xc7, 0xbb, 0x6f, 0xde, 0xab, 0x33,
+	0xd7, 0x14, 0xdd, 0x78, 0xf1, 0xbd, 0x64, 0x8b, 0xfe, 0x68, 0x65, 0xe3, 0xf1, 0xd3, 0xbc, 0xf6,
+	0xe4, 0x69, 0x5e, 0xfb, 0xe7, 0xd3, 0xbc, 0xf6, 0x83, 0x67, 0xf9, 0xa1, 0x27, 0xcf, 0xf2, 0x43,
+	0x7f, 0x7b, 0x96, 0x1f, 0xfa, 0xe6, 0x7c, 0xe2, 0x39, 0x81, 0xda, 0xe6, 0xaa, 0xd6, 0xb6, 0x1f,
+	0xa9, 0x7e, 0x77, 0xe1, 0x0b, 0xc5, 0x3d, 0x05, 0x40, 0x3e, 0x2e, 0xb6, 0x47, 0xe4, 0x68, 0xe4,
+	0xea, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x02, 0xa0, 0xcd, 0xc5, 0x1d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/gamm/types/route.go b/x/gamm/types/route.go
index b10edcddd0f..d128111ce40 100644
--- a/x/gamm/types/route.go
+++ b/x/gamm/types/route.go
@@ -3,7 +3,7 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type SwapAmountInRoutes []poolmanagertypes.SwapAmountInRoute
diff --git a/x/gamm/types/tx.pb.go b/x/gamm/types/tx.pb.go
index 1eb67bf51fe..47f4a9e135d 100644
--- a/x/gamm/types/tx.pb.go
+++ b/x/gamm/types/tx.pb.go
@@ -12,7 +12,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -865,82 +865,82 @@ func init() { proto.RegisterFile("osmosis/gamm/v1beta1/tx.proto", fileDescriptor
 
 var fileDescriptor_cfc8fd3ac7df3247 = []byte{
 	// 1214 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcb, 0x6e, 0xdb, 0x46,
-	0x14, 0x35, 0x25, 0xc5, 0x76, 0xc6, 0xf5, 0x43, 0x8c, 0x1f, 0x32, 0x9d, 0x48, 0xf6, 0xb4, 0x70,
-	0x9c, 0x38, 0x22, 0x63, 0x07, 0x7d, 0xc0, 0x9b, 0xa2, 0x6a, 0x03, 0x54, 0x41, 0x04, 0x05, 0xcc,
-	0x26, 0xe8, 0x46, 0xa0, 0x2c, 0x42, 0x61, 0x63, 0xce, 0x08, 0x1a, 0xd2, 0x51, 0x50, 0xa0, 0x05,
-	0x0a, 0xb4, 0x40, 0xbb, 0x6a, 0x51, 0xf4, 0xf1, 0x19, 0xdd, 0xf6, 0x0f, 0xb2, 0xcc, 0xa2, 0x05,
-	0xda, 0x14, 0x10, 0x0a, 0x7b, 0xd1, 0x6d, 0xa1, 0x2f, 0x28, 0x86, 0x33, 0xa4, 0x48, 0x8a, 0xb4,
-	0x44, 0x47, 0x8a, 0x37, 0x89, 0x35, 0x73, 0x5f, 0x73, 0xee, 0xe1, 0x99, 0x4b, 0x82, 0x6b, 0x98,
-	0x98, 0x98, 0x18, 0x44, 0x69, 0x6a, 0xa6, 0xa9, 0x1c, 0xef, 0xd5, 0x75, 0x4b, 0xdb, 0x53, 0xac,
-	0x8e, 0xdc, 0x6a, 0x63, 0x0b, 0x8b, 0xcb, 0x7c, 0x5b, 0xa6, 0xdb, 0x32, 0xdf, 0x96, 0x96, 0x9b,
-	0xb8, 0x89, 0x1d, 0x03, 0x85, 0xfe, 0xc5, 0x6c, 0xa5, 0xac, 0x66, 0x1a, 0x08, 0x2b, 0xce, 0xbf,
-	0x7c, 0x29, 0x7f, 0xe8, 0xf8, 0x2b, 0x75, 0x8d, 0xe8, 0x5e, 0xf0, 0x43, 0x6c, 0x20, 0xbe, 0x7f,
-	0xcb, 0xcd, 0xde, 0xc2, 0xf8, 0xc8, 0xd4, 0x90, 0xd6, 0xd4, 0xdb, 0x9e, 0x1d, 0x79, 0xaa, 0xb5,
-	0x6a, 0x6d, 0x6c, 0x5b, 0x3a, 0xb3, 0x86, 0x2f, 0x53, 0x60, 0xae, 0x42, 0x9a, 0xf7, 0xb0, 0x81,
-	0x1e, 0x60, 0x7c, 0x24, 0xde, 0x00, 0xd3, 0x44, 0x47, 0x0d, 0xbd, 0x9d, 0x13, 0x36, 0x85, 0x9d,
-	0xcb, 0xa5, 0x6c, 0xaf, 0x5b, 0x98, 0x7f, 0xa6, 0x99, 0x47, 0x07, 0x90, 0xad, 0x43, 0x95, 0x1b,
-	0x88, 0xbb, 0x60, 0x86, 0xa6, 0xa8, 0x19, 0x8d, 0x5c, 0x6a, 0x53, 0xd8, 0xc9, 0x94, 0xc4, 0x5e,
-	0xb7, 0xb0, 0xc0, 0x6c, 0xf9, 0x06, 0x54, 0xa7, 0xe9, 0x5f, 0xe5, 0x86, 0xd8, 0x06, 0x4b, 0xe4,
-	0xb1, 0xd6, 0xd6, 0x6b, 0xd8, 0xb6, 0x6a, 0x9a, 0x89, 0x6d, 0x64, 0xe5, 0xd2, 0x4e, 0x86, 0x8f,
-	0x9f, 0x77, 0x0b, 0x53, 0x2f, 0xbb, 0x85, 0xed, 0xa6, 0x61, 0x3d, 0xb6, 0xeb, 0xf2, 0x21, 0x36,
-	0x15, 0x7e, 0x44, 0xf6, 0x5f, 0x91, 0x34, 0x9e, 0x28, 0xd6, 0xb3, 0x96, 0x4e, 0xe4, 0x32, 0xb2,
-	0x7a, 0xdd, 0xc2, 0xaa, 0x2f, 0x07, 0x0b, 0x45, 0xa3, 0x42, 0x75, 0xc1, 0xc9, 0x50, 0xb5, 0xad,
-	0x0f, 0x9c, 0x45, 0xb1, 0x0e, 0xe6, 0x2d, 0xfc, 0x44, 0x47, 0x35, 0x03, 0xd5, 0x4c, 0xad, 0x43,
-	0x72, 0x99, 0xcd, 0xf4, 0xce, 0xdc, 0xfe, 0xba, 0xcc, 0xe2, 0xca, 0x14, 0x41, 0x17, 0x7f, 0xf9,
-	0x43, 0x6c, 0xa0, 0xd2, 0x9b, 0xb4, 0x96, 0x5e, 0xb7, 0xb0, 0xc1, 0x32, 0xf8, 0xbd, 0x79, 0x26,
-	0x02, 0xd5, 0x39, 0x67, 0xb9, 0x8c, 0x2a, 0x5a, 0x87, 0x1c, 0x6c, 0x7c, 0xfb, 0xef, 0xaf, 0x37,
-	0x57, 0x03, 0x0d, 0xff, 0x14, 0x1b, 0xa8, 0x48, 0x8b, 0x83, 0x7f, 0x09, 0xe0, 0x8a, 0x0f, 0x5c,
-	0x55, 0x27, 0x2d, 0x8c, 0x88, 0x2e, 0x92, 0x08, 0x30, 0x18, 0xdc, 0xe5, 0xc4, 0x60, 0xac, 0xf1,
-	0xe6, 0x84, 0xe2, 0x0d, 0xa2, 0x51, 0x01, 0xb3, 0xee, 0x79, 0x72, 0xa9, 0x61, 0x40, 0xac, 0x71,
-	0x20, 0x16, 0x83, 0x40, 0x40, 0x75, 0x86, 0x1f, 0x1e, 0xfe, 0xcd, 0x88, 0x73, 0xb7, 0x63, 0x58,
-	0x13, 0x25, 0x4e, 0x0b, 0x2c, 0xb2, 0xb3, 0x19, 0x68, 0x4c, 0xbc, 0x09, 0x85, 0x83, 0xea, 0xbc,
-	0xb3, 0x52, 0x46, 0x1c, 0x28, 0x1d, 0x2c, 0xb0, 0xf3, 0x52, 0x34, 0x4d, 0x03, 0x8d, 0xc0, 0x9b,
-	0xb7, 0x38, 0x5c, 0x57, 0xfd, 0x70, 0x71, 0xf7, 0x3e, 0x71, 0xde, 0x70, 0xd6, 0xab, 0xb6, 0x55,
-	0x31, 0x50, 0x24, 0x73, 0xf4, 0x8e, 0x61, 0x31, 0xe6, 0x34, 0x1d, 0xe2, 0xb8, 0xe0, 0x7a, 0xc4,
-	0x79, 0x00, 0x2e, 0x7b, 0xb1, 0x73, 0xc2, 0xb0, 0xaa, 0x72, 0xbc, 0xaa, 0xa5, 0x50, 0x55, 0x50,
-	0x9d, 0x75, 0x2b, 0x81, 0x5f, 0xa7, 0xc1, 0x72, 0x85, 0x34, 0x1f, 0x3e, 0xd5, 0x5a, 0x77, 0x3b,
-	0xda, 0x21, 0x27, 0x4b, 0x19, 0x25, 0xe9, 0xe7, 0x7d, 0x30, 0xed, 0x48, 0x0a, 0xe1, 0xbc, 0x92,
-	0x65, 0x57, 0xe1, 0x7c, 0x12, 0xe4, 0x95, 0x46, 0x53, 0xb9, 0x59, 0x54, 0xea, 0x56, 0xca, 0xd0,
-	0x3a, 0x55, 0x1e, 0x23, 0xc0, 0x53, 0xda, 0xe9, 0x57, 0xe3, 0xa9, 0xf8, 0x39, 0x58, 0x8e, 0x6a,
-	0x47, 0x2e, 0xe3, 0x9c, 0xaa, 0x92, 0x98, 0x44, 0x1b, 0xf1, 0x2d, 0x86, 0x6a, 0xd6, 0xd7, 0x61,
-	0x76, 0xc6, 0x83, 0x6d, 0xda, 0xe6, 0xad, 0x40, 0x9b, 0xa9, 0x08, 0x17, 0x75, 0x8a, 0x76, 0x91,
-	0x39, 0x16, 0x0d, 0x04, 0x7f, 0x10, 0xc0, 0xd5, 0xa8, 0x46, 0xf8, 0x45, 0xa3, 0x9f, 0x74, 0x3c,
-	0xa2, 0x11, 0x8e, 0x07, 0xd5, 0x05, 0xf7, 0x00, 0x2c, 0x3d, 0xfc, 0x26, 0x0d, 0x56, 0x06, 0xab,
-	0xaa, 0xda, 0x56, 0x12, 0x7e, 0x54, 0x42, 0xfc, 0x50, 0x46, 0xe4, 0x47, 0xd5, 0xb6, 0xa2, 0x08,
-	0xf2, 0x19, 0xb8, 0x12, 0x21, 0xcc, 0x5c, 0x15, 0xee, 0x27, 0xc6, 0x42, 0x8a, 0xd5, 0x7a, 0xa8,
-	0x2e, 0xf5, 0xa5, 0x9e, 0x8b, 0x43, 0xe0, 0x09, 0xcc, 0x0c, 0xa3, 0xe7, 0x08, 0x4f, 0xe0, 0xc1,
-	0x75, 0x4a, 0x10, 0x38, 0x84, 0x20, 0xd4, 0xe7, 0x7b, 0x01, 0x5c, 0x8b, 0xec, 0x85, 0x47, 0x91,
-	0x16, 0x58, 0xf4, 0x8e, 0x11, 0x60, 0xc8, 0xb9, 0xb5, 0x32, 0x14, 0x0e, 0xaa, 0xf3, 0x1c, 0x11,
-	0xce, 0x8f, 0xff, 0x52, 0x60, 0x9d, 0xdf, 0x70, 0xac, 0x2e, 0x4b, 0x6f, 0xa3, 0xf3, 0x68, 0x48,
-	0xa2, 0x3b, 0x61, 0xfc, 0x12, 0xd1, 0xbf, 0x3e, 0xc7, 0x27, 0x11, 0x51, 0x31, 0xa1, 0x9a, 0x75,
-	0xaf, 0xe5, 0xbe, 0x44, 0xdc, 0xa2, 0x0c, 0xb8, 0x3e, 0x38, 0x43, 0x70, 0x1a, 0x50, 0x48, 0x7d,
-	0x42, 0xf1, 0x8b, 0x00, 0xb6, 0x62, 0x21, 0xbf, 0xd0, 0x11, 0x03, 0xfe, 0x9e, 0x0e, 0xb0, 0xe1,
-	0x21, 0xdd, 0x3d, 0x97, 0x62, 0x24, 0x62, 0xc3, 0xfb, 0xee, 0x7d, 0x6d, 0xa0, 0x5a, 0x43, 0x47,
-	0xd8, 0xe4, 0x52, 0xb0, 0xde, 0xeb, 0x16, 0x56, 0x42, 0x34, 0x76, 0xf6, 0xdd, 0x9b, 0xb8, 0x8c,
-	0x3e, 0xa2, 0x3f, 0x23, 0xb1, 0xca, 0x4c, 0x7a, 0x1c, 0x8b, 0x51, 0xb1, 0x4b, 0xaf, 0x43, 0xc5,
-	0xce, 0x66, 0x9c, 0x53, 0xa8, 0x5f, 0x78, 0x7e, 0x0c, 0x32, 0x2e, 0xd8, 0xd6, 0x0b, 0x14, 0x9f,
-	0x3f, 0xd2, 0x20, 0xc7, 0xa7, 0xa4, 0x50, 0x5d, 0x13, 0xd4, 0x9e, 0x92, 0x7b, 0x4c, 0xda, 0x5c,
-	0x3f, 0xdd, 0xa4, 0x70, 0xe1, 0x9e, 0x81, 0x5b, 0x78, 0xd5, 0xb6, 0x18, 0xe1, 0x22, 0x66, 0xda,
-	0xcc, 0x64, 0x67, 0xda, 0xb8, 0x29, 0xe8, 0xd2, 0x6b, 0x9a, 0x82, 0x76, 0x29, 0xe1, 0xb6, 0x07,
-	0x87, 0xdd, 0x41, 0xc2, 0x19, 0x08, 0xfe, 0x2c, 0x80, 0xcd, 0xb8, 0xbe, 0x5e, 0xec, 0x38, 0xd4,
-	0x4b, 0x01, 0xc9, 0x57, 0x99, 0x5f, 0x7b, 0x27, 0xa9, 0x70, 0x81, 0xa1, 0x23, 0x3d, 0x86, 0xa1,
-	0x83, 0xaa, 0x8f, 0x47, 0x19, 0x9f, 0xfa, 0x64, 0x5e, 0x4d, 0x7d, 0x22, 0x42, 0x42, 0x75, 0x89,
-	0x33, 0xb1, 0xaf, 0x3e, 0x45, 0x4a, 0x86, 0x9d, 0x18, 0x32, 0x04, 0xef, 0x3b, 0x5a, 0xf6, 0x4f,
-	0x02, 0x80, 0xf1, 0xa0, 0xfb, 0xf5, 0x27, 0xfc, 0x50, 0x09, 0x13, 0x7d, 0xa8, 0xf6, 0x7f, 0x9b,
-	0x01, 0xe9, 0x0a, 0x69, 0x8a, 0x8f, 0xc0, 0xac, 0xf7, 0xfd, 0x64, 0x4b, 0x8e, 0xfa, 0xba, 0x23,
-	0xfb, 0xbe, 0x02, 0x48, 0x37, 0x86, 0x9a, 0x78, 0x67, 0x7a, 0x04, 0x66, 0xbd, 0x17, 0xec, 0xf8,
-	0xc8, 0xae, 0xc9, 0x19, 0x91, 0x07, 0xde, 0x24, 0x09, 0xc8, 0x0e, 0xbe, 0xf3, 0xdd, 0x8c, 0xf5,
-	0x1f, 0xb0, 0x95, 0xf6, 0x47, 0xb7, 0xf5, 0x92, 0x1e, 0x03, 0x31, 0xe2, 0x4d, 0x62, 0x77, 0xd4,
-	0x48, 0x55, 0xdb, 0x92, 0xee, 0x24, 0x30, 0xf6, 0xf2, 0x7e, 0x29, 0x80, 0xd5, 0x98, 0x11, 0x55,
-	0x39, 0xb3, 0x19, 0x83, 0x0e, 0xd2, 0xbb, 0x09, 0x1d, 0x22, 0x8b, 0x08, 0x4d, 0x46, 0xc3, 0x8b,
-	0x08, 0x3a, 0x8c, 0x50, 0x44, 0xcc, 0x25, 0xfd, 0x95, 0x00, 0xd6, 0xe2, 0xd4, 0xeb, 0xf6, 0x99,
-	0xec, 0x89, 0xf0, 0x90, 0xde, 0x4b, 0xea, 0xe1, 0xd5, 0xf1, 0x05, 0x58, 0x89, 0xbe, 0xb6, 0xe5,
-	0xa1, 0x21, 0x03, 0xf6, 0xd2, 0x3b, 0xc9, 0xec, 0xdd, 0x02, 0x4a, 0xf7, 0x9e, 0x9f, 0xe4, 0x85,
-	0x17, 0x27, 0x79, 0xe1, 0x9f, 0x93, 0xbc, 0xf0, 0xdd, 0x69, 0x7e, 0xea, 0xc5, 0x69, 0x7e, 0xea,
-	0xcf, 0xd3, 0xfc, 0xd4, 0x27, 0xb7, 0x7d, 0x32, 0xc1, 0x63, 0x17, 0x8f, 0xb4, 0x3a, 0x71, 0x7f,
-	0x28, 0xc7, 0x7b, 0x6f, 0x2b, 0x1d, 0x26, 0x5b, 0x8e, 0x68, 0xd4, 0xa7, 0x9d, 0x4f, 0xa9, 0x77,
-	0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x78, 0xc4, 0xe5, 0xf2, 0xf8, 0x15, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5d, 0x6f, 0xdb, 0x54,
+	0x18, 0xae, 0x93, 0xac, 0xed, 0x4e, 0xe9, 0x47, 0xbc, 0x7e, 0xa4, 0xee, 0x96, 0xb4, 0x07, 0xd4,
+	0x75, 0xeb, 0x62, 0xaf, 0x9d, 0x34, 0x50, 0x6f, 0x10, 0x81, 0x49, 0x64, 0x5a, 0x94, 0xc9, 0xbb,
+	0x99, 0xb8, 0x89, 0x9c, 0xc6, 0xca, 0xcc, 0xea, 0x73, 0xa2, 0x1c, 0xbb, 0xcb, 0x84, 0x04, 0x12,
+	0x12, 0x48, 0x70, 0x05, 0x42, 0x7c, 0xfc, 0x0c, 0x6e, 0xf9, 0x07, 0xbb, 0xdc, 0x05, 0x48, 0x30,
+	0xa4, 0x08, 0xb5, 0x17, 0xdc, 0xa2, 0xfc, 0x02, 0x74, 0x7c, 0x8e, 0x1d, 0xdb, 0xb1, 0x9b, 0xb8,
+	0x4b, 0xd6, 0x9b, 0xad, 0x39, 0xe7, 0xfd, 0x3a, 0xcf, 0xfb, 0xf8, 0x39, 0xaf, 0x0d, 0xae, 0x61,
+	0x62, 0x62, 0x62, 0x10, 0xa5, 0xa9, 0x99, 0xa6, 0x72, 0xbc, 0x57, 0xd7, 0x2d, 0x6d, 0x4f, 0xb1,
+	0x3a, 0x72, 0xab, 0x8d, 0x2d, 0x2c, 0x2e, 0xf3, 0x6d, 0x99, 0x6e, 0xcb, 0x7c, 0x5b, 0x5a, 0x6e,
+	0xe2, 0x26, 0x76, 0x0c, 0x14, 0xfa, 0x17, 0xb3, 0x95, 0xb2, 0x9a, 0x69, 0x20, 0xac, 0x38, 0xff,
+	0xf2, 0xa5, 0xfc, 0xa1, 0xe3, 0xaf, 0xd4, 0x35, 0xa2, 0x7b, 0xc1, 0x0f, 0xb1, 0x81, 0xf8, 0xfe,
+	0x2d, 0x37, 0x7b, 0x0b, 0xe3, 0x23, 0x53, 0x43, 0x5a, 0x53, 0x6f, 0x7b, 0x76, 0xe4, 0x99, 0xd6,
+	0xaa, 0xb5, 0xb1, 0x6d, 0xe9, 0xcc, 0x1a, 0xbe, 0x4a, 0x81, 0xb9, 0x0a, 0x69, 0xde, 0xc7, 0x06,
+	0x7a, 0x88, 0xf1, 0x91, 0x78, 0x03, 0x4c, 0x13, 0x1d, 0x35, 0xf4, 0x76, 0x4e, 0xd8, 0x14, 0x76,
+	0x2e, 0x97, 0xb2, 0xbd, 0x6e, 0x61, 0xfe, 0xb9, 0x66, 0x1e, 0x1d, 0x40, 0xb6, 0x0e, 0x55, 0x6e,
+	0x20, 0xee, 0x82, 0x19, 0x9a, 0xa2, 0x66, 0x34, 0x72, 0xa9, 0x4d, 0x61, 0x27, 0x53, 0x12, 0x7b,
+	0xdd, 0xc2, 0x02, 0xb3, 0xe5, 0x1b, 0x50, 0x9d, 0xa6, 0x7f, 0x95, 0x1b, 0x62, 0x1b, 0x2c, 0x91,
+	0x27, 0x5a, 0x5b, 0xaf, 0x61, 0xdb, 0xaa, 0x69, 0x26, 0xb6, 0x91, 0x95, 0x4b, 0x3b, 0x19, 0x3e,
+	0x7e, 0xd1, 0x2d, 0x4c, 0xbd, 0xea, 0x16, 0xb6, 0x9b, 0x86, 0xf5, 0xc4, 0xae, 0xcb, 0x87, 0xd8,
+	0x54, 0xf8, 0x11, 0xd9, 0x7f, 0x45, 0xd2, 0x78, 0xaa, 0x58, 0xcf, 0x5b, 0x3a, 0x91, 0xcb, 0xc8,
+	0xea, 0x75, 0x0b, 0xab, 0xbe, 0x1c, 0x2c, 0x14, 0x8d, 0x0a, 0xd5, 0x05, 0x27, 0x43, 0xd5, 0xb6,
+	0x3e, 0x70, 0x16, 0xc5, 0x3a, 0x98, 0xb7, 0xf0, 0x53, 0x1d, 0xd5, 0x0c, 0x54, 0x33, 0xb5, 0x0e,
+	0xc9, 0x65, 0x36, 0xd3, 0x3b, 0x73, 0xfb, 0xeb, 0x32, 0x8b, 0x2b, 0x53, 0x04, 0x5d, 0xfc, 0xe5,
+	0x0f, 0xb1, 0x81, 0x4a, 0x6f, 0xd3, 0x5a, 0x7a, 0xdd, 0xc2, 0x06, 0xcb, 0xe0, 0xf7, 0xe6, 0x99,
+	0x08, 0x54, 0xe7, 0x9c, 0xe5, 0x32, 0xaa, 0x68, 0x1d, 0x72, 0xb0, 0xf1, 0xed, 0xbf, 0xbf, 0xde,
+	0x5c, 0x0d, 0x34, 0xfc, 0x53, 0x6c, 0xa0, 0x22, 0x2d, 0x0e, 0xfe, 0x25, 0x80, 0x2b, 0x3e, 0x70,
+	0x55, 0x9d, 0xb4, 0x30, 0x22, 0xba, 0x48, 0x22, 0xc0, 0x60, 0x70, 0x97, 0x13, 0x83, 0xb1, 0xc6,
+	0x9b, 0x13, 0x8a, 0x37, 0x88, 0x46, 0x05, 0xcc, 0xba, 0xe7, 0xc9, 0xa5, 0x86, 0x01, 0xb1, 0xc6,
+	0x81, 0x58, 0x0c, 0x02, 0x01, 0xd5, 0x19, 0x7e, 0x78, 0xf8, 0x37, 0x23, 0xce, 0xbd, 0x8e, 0x61,
+	0x4d, 0x94, 0x38, 0x2d, 0xb0, 0xc8, 0xce, 0x66, 0xa0, 0x31, 0xf1, 0x26, 0x14, 0x0e, 0xaa, 0xf3,
+	0xce, 0x4a, 0x19, 0x71, 0xa0, 0x74, 0xb0, 0xc0, 0xce, 0x4b, 0xd1, 0x34, 0x0d, 0x34, 0x02, 0x6f,
+	0xde, 0xe1, 0x70, 0x5d, 0xf5, 0xc3, 0xc5, 0xdd, 0xfb, 0xc4, 0x79, 0xcb, 0x59, 0xaf, 0xda, 0x56,
+	0xc5, 0x40, 0x91, 0xcc, 0xd1, 0x3b, 0x86, 0xc5, 0x98, 0xd3, 0x74, 0x88, 0xe3, 0x82, 0xeb, 0x11,
+	0xe7, 0x21, 0xb8, 0xec, 0xc5, 0xce, 0x09, 0xc3, 0xaa, 0xca, 0xf1, 0xaa, 0x96, 0x42, 0x55, 0x41,
+	0x75, 0xd6, 0xad, 0x04, 0x7e, 0x9d, 0x06, 0xcb, 0x15, 0xd2, 0x7c, 0xf4, 0x4c, 0x6b, 0xdd, 0xeb,
+	0x68, 0x87, 0x9c, 0x2c, 0x65, 0x94, 0xa4, 0x9f, 0x0f, 0xc0, 0xb4, 0x23, 0x29, 0x84, 0xf3, 0x4a,
+	0x96, 0x5d, 0x85, 0xf3, 0x49, 0x90, 0x57, 0x1a, 0x4d, 0xe5, 0x66, 0x51, 0xa9, 0x5b, 0x29, 0x43,
+	0xeb, 0x54, 0x79, 0x8c, 0x00, 0x4f, 0x69, 0xa7, 0x5f, 0x8f, 0xa7, 0xe2, 0xe7, 0x60, 0x39, 0xaa,
+	0x1d, 0xb9, 0x8c, 0x73, 0xaa, 0x4a, 0x62, 0x12, 0x6d, 0xc4, 0xb7, 0x18, 0xaa, 0x59, 0x5f, 0x87,
+	0xd9, 0x19, 0x0f, 0xb6, 0x69, 0x9b, 0xb7, 0x02, 0x6d, 0xa6, 0x22, 0x5c, 0xd4, 0x29, 0xda, 0x45,
+	0xe6, 0x58, 0x34, 0x10, 0xfc, 0x41, 0x00, 0x57, 0xa3, 0x1a, 0xe1, 0x17, 0x8d, 0x7e, 0xd2, 0xf1,
+	0x88, 0x46, 0x38, 0x1e, 0x54, 0x17, 0xdc, 0x03, 0xb0, 0xf4, 0xf0, 0x9b, 0x34, 0x58, 0x19, 0xac,
+	0xaa, 0x6a, 0x5b, 0x49, 0xf8, 0x51, 0x09, 0xf1, 0x43, 0x19, 0x91, 0x1f, 0x55, 0xdb, 0x8a, 0x22,
+	0xc8, 0x67, 0xe0, 0x4a, 0x84, 0x30, 0x73, 0x55, 0x78, 0x90, 0x18, 0x0b, 0x29, 0x56, 0xeb, 0xa1,
+	0xba, 0xd4, 0x97, 0x7a, 0x2e, 0x0e, 0x81, 0x27, 0x30, 0x33, 0x8c, 0x9e, 0x23, 0x3c, 0x81, 0x07,
+	0xd7, 0x29, 0x41, 0xe0, 0x10, 0x82, 0x50, 0x9f, 0xef, 0x05, 0x70, 0x2d, 0xb2, 0x17, 0x1e, 0x45,
+	0x5a, 0x60, 0xd1, 0x3b, 0x46, 0x80, 0x21, 0xe7, 0xd6, 0xca, 0x50, 0x38, 0xa8, 0xce, 0x73, 0x44,
+	0x38, 0x3f, 0xfe, 0x4b, 0x81, 0x75, 0x7e, 0xc3, 0xb1, 0xba, 0x2c, 0xbd, 0x8d, 0xce, 0xa3, 0x21,
+	0x89, 0xee, 0x84, 0xf1, 0x4b, 0x44, 0xff, 0xfa, 0x1c, 0x9f, 0x44, 0x44, 0xc5, 0x84, 0x6a, 0xd6,
+	0xbd, 0x96, 0xfb, 0x12, 0x71, 0x8b, 0x32, 0xe0, 0xfa, 0xe0, 0x0c, 0xc1, 0x69, 0x40, 0x21, 0xf5,
+	0x09, 0xc5, 0x2f, 0x02, 0xd8, 0x8a, 0x85, 0xfc, 0x42, 0x47, 0x0c, 0xf8, 0x7b, 0x3a, 0xc0, 0x86,
+	0x47, 0x74, 0xf7, 0x5c, 0x8a, 0x91, 0x88, 0x0d, 0xef, 0xbb, 0xf7, 0xb5, 0x81, 0x6a, 0x0d, 0x1d,
+	0x61, 0x93, 0x4b, 0xc1, 0x7a, 0xaf, 0x5b, 0x58, 0x09, 0xd1, 0xd8, 0xd9, 0x77, 0x6f, 0xe2, 0x32,
+	0xfa, 0x88, 0xfe, 0x8c, 0xc4, 0x2a, 0x33, 0xe9, 0x71, 0x2c, 0x46, 0xc5, 0x2e, 0xbd, 0x09, 0x15,
+	0x3b, 0x9b, 0x71, 0x4e, 0xa1, 0x7e, 0xe1, 0xf9, 0x31, 0xc8, 0xb8, 0x60, 0x5b, 0x2f, 0x50, 0x7c,
+	0xfe, 0x48, 0x83, 0x1c, 0x9f, 0x92, 0x42, 0x75, 0x4d, 0x50, 0x7b, 0x4a, 0xee, 0x31, 0x69, 0x73,
+	0xfd, 0x74, 0x93, 0xc2, 0x85, 0x7b, 0x06, 0x6e, 0xe1, 0x55, 0xdb, 0x62, 0x84, 0x8b, 0x98, 0x69,
+	0x33, 0x93, 0x9d, 0x69, 0xe3, 0xa6, 0xa0, 0x4b, 0x6f, 0x68, 0x0a, 0xda, 0xa5, 0x84, 0xdb, 0x1e,
+	0x1c, 0x76, 0x07, 0x09, 0x67, 0x20, 0xf8, 0xb3, 0x00, 0x36, 0xe3, 0xfa, 0x7a, 0xb1, 0xe3, 0x50,
+	0x2f, 0x05, 0x24, 0x5f, 0x65, 0x7e, 0xed, 0x9d, 0xa4, 0xc2, 0x05, 0x86, 0x8e, 0xf4, 0x18, 0x86,
+	0x0e, 0xaa, 0x3e, 0x1e, 0x65, 0x7c, 0xea, 0x93, 0x79, 0x3d, 0xf5, 0x89, 0x08, 0x09, 0xd5, 0x25,
+	0xce, 0xc4, 0xbe, 0xfa, 0x14, 0x29, 0x19, 0x76, 0x62, 0xc8, 0x10, 0xbc, 0xef, 0x68, 0xd9, 0x3f,
+	0x09, 0x00, 0xc6, 0x83, 0xee, 0xd7, 0x9f, 0xf0, 0x43, 0x25, 0x4c, 0xf4, 0xa1, 0xda, 0xff, 0x6d,
+	0x06, 0xa4, 0x2b, 0xa4, 0x29, 0x3e, 0x06, 0xb3, 0xde, 0xf7, 0x93, 0x2d, 0x39, 0xea, 0xeb, 0x8e,
+	0xec, 0xfb, 0x0a, 0x20, 0xdd, 0x18, 0x6a, 0xe2, 0x9d, 0xe9, 0x31, 0x98, 0xf5, 0x5e, 0xb0, 0xe3,
+	0x23, 0xbb, 0x26, 0x67, 0x44, 0x1e, 0x78, 0x93, 0x24, 0x20, 0x3b, 0xf8, 0xce, 0x77, 0x33, 0xd6,
+	0x7f, 0xc0, 0x56, 0xda, 0x1f, 0xdd, 0xd6, 0x4b, 0x7a, 0x0c, 0xc4, 0x88, 0x37, 0x89, 0xdd, 0x51,
+	0x23, 0x55, 0x6d, 0x4b, 0xba, 0x93, 0xc0, 0xd8, 0xcb, 0xfb, 0xa5, 0x00, 0x56, 0x63, 0x46, 0x54,
+	0xe5, 0xcc, 0x66, 0x0c, 0x3a, 0x48, 0xef, 0x26, 0x74, 0x88, 0x2c, 0x22, 0x34, 0x19, 0x0d, 0x2f,
+	0x22, 0xe8, 0x30, 0x42, 0x11, 0x31, 0x97, 0xf4, 0x57, 0x02, 0x58, 0x8b, 0x53, 0xaf, 0xdb, 0x67,
+	0xb2, 0x27, 0xc2, 0x43, 0x7a, 0x2f, 0xa9, 0x87, 0x57, 0xc7, 0x17, 0x60, 0x25, 0xfa, 0xda, 0x96,
+	0x87, 0x86, 0x0c, 0xd8, 0x4b, 0x77, 0x93, 0xd9, 0xbb, 0x05, 0x94, 0xee, 0xbf, 0x38, 0xc9, 0x0b,
+	0x2f, 0x4f, 0xf2, 0xc2, 0x3f, 0x27, 0x79, 0xe1, 0xbb, 0xd3, 0xfc, 0xd4, 0xcb, 0xd3, 0xfc, 0xd4,
+	0x9f, 0xa7, 0xf9, 0xa9, 0x4f, 0x6e, 0xfb, 0x64, 0x82, 0xc7, 0x2e, 0x1e, 0x69, 0x75, 0xe2, 0xfe,
+	0x50, 0x8e, 0xf7, 0xee, 0x2a, 0x1d, 0x26, 0x5b, 0x8e, 0x68, 0xd4, 0xa7, 0x9d, 0x4f, 0xa9, 0x77,
+	0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x38, 0x69, 0x9d, 0xcb, 0xf8, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/gamm/v2types/query.pb.go b/x/gamm/v2types/query.pb.go
index 25c07751ae4..25c86be5afb 100644
--- a/x/gamm/v2types/query.pb.go
+++ b/x/gamm/v2types/query.pb.go
@@ -13,7 +13,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	_ "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -156,33 +156,33 @@ var fileDescriptor_49ff000e88fc374c = []byte{
 	// 468 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x6f, 0xd3, 0x30,
 	0x14, 0xc7, 0xeb, 0x02, 0x43, 0xf5, 0x61, 0x63, 0x16, 0x83, 0xd2, 0x8d, 0x74, 0xca, 0x81, 0x0d,
-	0x10, 0xb1, 0x1a, 0xe0, 0xb2, 0x1b, 0x15, 0x48, 0x20, 0x71, 0x80, 0x70, 0xe3, 0x12, 0x39, 0xad,
-	0x09, 0x96, 0x9a, 0x3c, 0xb7, 0x76, 0xaa, 0x55, 0x88, 0x0b, 0x27, 0x8e, 0x93, 0xb8, 0xf1, 0x89,
-	0x38, 0x4e, 0xe2, 0x02, 0x97, 0x0a, 0xb5, 0x7c, 0x82, 0x7e, 0x02, 0x64, 0x3b, 0xe9, 0x58, 0x40,
-	0xda, 0x2d, 0x7e, 0xbf, 0xbf, 0xff, 0xff, 0xf7, 0x9c, 0x87, 0x77, 0x41, 0x65, 0xa0, 0x84, 0xa2,
-	0x29, 0xcb, 0x32, 0x3a, 0x0d, 0xe9, 0xb8, 0xe0, 0x93, 0x59, 0x20, 0x27, 0xa0, 0x81, 0x6c, 0x95,
-	0x30, 0x30, 0x30, 0x98, 0x86, 0x9d, 0xeb, 0x29, 0xa4, 0x60, 0x19, 0x35, 0x5f, 0x4e, 0xd6, 0xb9,
-	0x7d, 0xde, 0xa3, 0x97, 0x70, 0xcd, 0x7a, 0x54, 0x1f, 0x97, 0xd8, 0x1b, 0x58, 0x4e, 0x13, 0xa6,
-	0xf8, 0x9a, 0x0e, 0x40, 0xe4, 0x25, 0xbf, 0xf7, 0x37, 0xb7, 0xf1, 0x6b, 0x95, 0x64, 0xa9, 0xc8,
-	0x99, 0x16, 0x50, 0x69, 0xf7, 0x52, 0x80, 0x74, 0xc4, 0x29, 0x93, 0x82, 0xb2, 0x3c, 0x07, 0x6d,
-	0xa1, 0x2a, 0xe9, 0xad, 0x92, 0xda, 0x53, 0x52, 0xbc, 0xa3, 0x2c, 0x9f, 0x55, 0xc8, 0x85, 0xc4,
-	0xae, 0x79, 0x77, 0x70, 0xc8, 0xff, 0x89, 0xf0, 0xce, 0x6b, 0x13, 0xfb, 0x46, 0x82, 0x7e, 0x35,
-	0x11, 0x03, 0x1e, 0xf1, 0x71, 0xc1, 0x95, 0x26, 0xf7, 0xf1, 0x55, 0x09, 0x30, 0x8a, 0xc5, 0xb0,
-	0x8d, 0xf6, 0xd1, 0xe1, 0xe5, 0x3e, 0x59, 0xcd, 0xbb, 0x9b, 0x33, 0x96, 0x8d, 0x8e, 0xfc, 0x12,
-	0xf8, 0xd1, 0x86, 0xf9, 0x7a, 0x31, 0x24, 0xcf, 0xf0, 0x35, 0x33, 0x41, 0xcc, 0x94, 0xe2, 0x3a,
-	0x1e, 0xf2, 0x1c, 0xb2, 0x76, 0x73, 0x1f, 0x1d, 0xb6, 0xfa, 0xbb, 0xab, 0x79, 0xf7, 0xa6, 0xbb,
-	0x55, 0x57, 0xf8, 0xd1, 0xa6, 0x29, 0x3d, 0x31, 0x95, 0xa7, 0xa6, 0x40, 0x9e, 0xe3, 0xed, 0x71,
-	0x01, 0xfa, 0xbc, 0xcf, 0x25, 0xeb, 0xb3, 0xb7, 0x9a, 0x77, 0xdb, 0xce, 0xe7, 0x1f, 0x89, 0x1f,
-	0x6d, 0xd9, 0xda, 0x99, 0xd3, 0x51, 0xb3, 0x8d, 0xfc, 0x08, 0xdf, 0xa8, 0x8f, 0xa6, 0x24, 0xe4,
-	0x8a, 0x93, 0x47, 0x18, 0x2b, 0x09, 0x3a, 0x96, 0xa6, 0x6a, 0xc7, 0x6b, 0xf5, 0x77, 0x56, 0xf3,
-	0xee, 0xb6, 0x0b, 0x38, 0x63, 0x7e, 0xd4, 0x52, 0xd5, 0x6d, 0xe3, 0x19, 0x7e, 0x45, 0xf8, 0x8a,
-	0x35, 0x25, 0x27, 0x08, 0xb7, 0xd6, 0xce, 0xe4, 0x4e, 0x50, 0x5b, 0x97, 0xe0, 0xbf, 0xaf, 0xda,
-	0x39, 0xb8, 0x50, 0xe7, 0x5a, 0xf4, 0xc3, 0x4f, 0xdf, 0x7f, 0x7f, 0x69, 0xde, 0x25, 0x07, 0xb4,
-	0xbe, 0xa4, 0xe6, 0xc9, 0x15, 0xfd, 0x50, 0xfe, 0x83, 0x8f, 0xd4, 0x36, 0xaa, 0x3e, 0x37, 0x51,
-	0xff, 0xe5, 0xb7, 0x85, 0x87, 0x4e, 0x17, 0x1e, 0xfa, 0xb5, 0xf0, 0xd0, 0xc9, 0xd2, 0x6b, 0x9c,
-	0x2e, 0xbd, 0xc6, 0x8f, 0xa5, 0xd7, 0x78, 0x1b, 0xa6, 0x42, 0xbf, 0x2f, 0x92, 0x60, 0x00, 0x59,
-	0xe5, 0xf7, 0x60, 0xc4, 0x12, 0xb5, 0x36, 0x9f, 0xf6, 0x1e, 0xd3, 0xe3, 0x2a, 0x42, 0xcf, 0x24,
-	0x57, 0xc9, 0x86, 0xdd, 0x90, 0x87, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x9a, 0x16, 0x18,
+	0x10, 0xb1, 0x1a, 0x10, 0x87, 0xdd, 0xa8, 0x40, 0x02, 0x89, 0x03, 0x84, 0x1b, 0x97, 0xc8, 0x69,
+	0x4d, 0xb0, 0xd4, 0xe4, 0xb9, 0xb5, 0x53, 0xad, 0x42, 0x5c, 0x38, 0x71, 0x9c, 0xc4, 0x8d, 0x4f,
+	0xc4, 0x71, 0x12, 0x17, 0xb8, 0x54, 0xa8, 0xe5, 0x13, 0xf4, 0x13, 0x20, 0xdb, 0x49, 0xc7, 0x02,
+	0xd2, 0x6e, 0xf1, 0xfb, 0xfd, 0xfd, 0xff, 0xbf, 0xe7, 0x3c, 0xbc, 0x0b, 0x2a, 0x03, 0x25, 0x14,
+	0x4d, 0x59, 0x96, 0xd1, 0x69, 0x48, 0xc7, 0x05, 0x9f, 0xcc, 0x02, 0x39, 0x01, 0x0d, 0x64, 0xab,
+	0x84, 0x81, 0x81, 0xc1, 0x34, 0xec, 0x5c, 0x4f, 0x21, 0x05, 0xcb, 0xa8, 0xf9, 0x72, 0xb2, 0xce,
+	0xed, 0xf3, 0x1e, 0xbd, 0x84, 0x6b, 0xd6, 0xa3, 0xfa, 0xb8, 0xc4, 0xde, 0xc0, 0x72, 0x9a, 0x30,
+	0xc5, 0xd7, 0x74, 0x00, 0x22, 0x2f, 0xf9, 0xbd, 0xbf, 0xb9, 0x8d, 0x5f, 0xab, 0x24, 0x4b, 0x45,
+	0xce, 0xb4, 0x80, 0x4a, 0xbb, 0x97, 0x02, 0xa4, 0x23, 0x4e, 0x99, 0x14, 0x94, 0xe5, 0x39, 0x68,
+	0x0b, 0x55, 0x49, 0x6f, 0x95, 0xd4, 0x9e, 0x92, 0xe2, 0x1d, 0x65, 0xf9, 0xac, 0x42, 0x2e, 0x24,
+	0x76, 0xcd, 0xbb, 0x83, 0x43, 0xfe, 0x4f, 0x84, 0x77, 0x5e, 0x9b, 0xd8, 0x37, 0x12, 0xf4, 0xab,
+	0x89, 0x18, 0xf0, 0x88, 0x8f, 0x0b, 0xae, 0x34, 0xb9, 0x8f, 0xaf, 0x4a, 0x80, 0x51, 0x2c, 0x86,
+	0x6d, 0xb4, 0x8f, 0x0e, 0x2f, 0xf7, 0xc9, 0x6a, 0xde, 0xdd, 0x9c, 0xb1, 0x6c, 0x74, 0xe4, 0x97,
+	0xc0, 0x8f, 0x36, 0xcc, 0xd7, 0x8b, 0x21, 0x79, 0x86, 0xaf, 0x99, 0x09, 0x62, 0xa6, 0x14, 0xd7,
+	0xf1, 0x90, 0xe7, 0x90, 0xb5, 0x9b, 0xfb, 0xe8, 0xb0, 0xd5, 0xdf, 0x5d, 0xcd, 0xbb, 0x37, 0xdd,
+	0xad, 0xba, 0xc2, 0x8f, 0x36, 0x4d, 0xe9, 0x89, 0xa9, 0x3c, 0x35, 0x05, 0xf2, 0x1c, 0x6f, 0x8f,
+	0x0b, 0xd0, 0xe7, 0x7d, 0x2e, 0x59, 0x9f, 0xbd, 0xd5, 0xbc, 0xdb, 0x76, 0x3e, 0xff, 0x48, 0xfc,
+	0x68, 0xcb, 0xd6, 0xce, 0x9c, 0x8e, 0x9a, 0x6d, 0xe4, 0x47, 0xf8, 0x46, 0x7d, 0x34, 0x25, 0x21,
+	0x57, 0x9c, 0x3c, 0xc2, 0x58, 0x49, 0xd0, 0xb1, 0x34, 0x55, 0x3b, 0x5e, 0xab, 0xbf, 0xb3, 0x9a,
+	0x77, 0xb7, 0x5d, 0xc0, 0x19, 0xf3, 0xa3, 0x96, 0xaa, 0x6e, 0x1b, 0xcf, 0xf0, 0x2b, 0xc2, 0x57,
+	0xac, 0x29, 0x39, 0x41, 0xb8, 0xb5, 0x76, 0x26, 0x77, 0x82, 0xda, 0xba, 0x04, 0xff, 0x7d, 0xd5,
+	0xce, 0xc1, 0x85, 0x3a, 0xd7, 0xa2, 0x1f, 0x7e, 0xfa, 0xfe, 0xfb, 0x4b, 0xf3, 0x2e, 0x39, 0xa0,
+	0xf5, 0x25, 0x35, 0x4f, 0xae, 0xe8, 0x87, 0xf2, 0x1f, 0x7c, 0xa4, 0xb6, 0x51, 0xf5, 0xb9, 0x89,
+	0xfa, 0x2f, 0xbf, 0x2d, 0x3c, 0x74, 0xba, 0xf0, 0xd0, 0xaf, 0x85, 0x87, 0x4e, 0x96, 0x5e, 0xe3,
+	0x74, 0xe9, 0x35, 0x7e, 0x2c, 0xbd, 0xc6, 0xdb, 0x30, 0x15, 0xfa, 0x7d, 0x91, 0x04, 0x03, 0xc8,
+	0x2a, 0xbf, 0x07, 0x23, 0x96, 0xa8, 0xb5, 0xf9, 0xb4, 0xf7, 0x98, 0x1e, 0x57, 0x11, 0x7a, 0x26,
+	0xb9, 0x4a, 0x36, 0xec, 0x86, 0x3c, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x55, 0x33, 0x08, 0x40,
 	0x26, 0x03, 0x00, 0x00,
 }
 
diff --git a/x/ibc-rate-limit/client/cli/query.go b/x/ibc-rate-limit/client/cli/query.go
index 683e93dacc0..5a70e6d2817 100644
--- a/x/ibc-rate-limit/client/cli/query.go
+++ b/x/ibc-rate-limit/client/cli/query.go
@@ -4,8 +4,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/ibc-rate-limit/client/grpc/grpc_query.go b/x/ibc-rate-limit/client/grpc/grpc_query.go
index 2030e23136d..5eda9ff5c28 100644
--- a/x/ibc-rate-limit/client/grpc/grpc_query.go
+++ b/x/ibc-rate-limit/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/ibc-rate-limit/client/query_proto_wrap.go b/x/ibc-rate-limit/client/query_proto_wrap.go
index de37bc382aa..fa455753c88 100644
--- a/x/ibc-rate-limit/client/query_proto_wrap.go
+++ b/x/ibc-rate-limit/client/query_proto_wrap.go
@@ -3,8 +3,8 @@ package client
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/queryproto"
+	ibcratelimit "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto"
 )
 
 // This file should evolve to being code gen'd, off of `proto/twap/v1beta/query.yml`
diff --git a/x/ibc-rate-limit/client/queryproto/query.pb.go b/x/ibc-rate-limit/client/queryproto/query.pb.go
index e748b7d17a9..a6535e41038 100644
--- a/x/ibc-rate-limit/client/queryproto/query.pb.go
+++ b/x/ibc-rate-limit/client/queryproto/query.pb.go
@@ -10,7 +10,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	types "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -127,24 +127,24 @@ var fileDescriptor_9376d12c6390a846 = []byte{
 	// 321 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xbf, 0x4a, 0x73, 0x31,
 	0x18, 0xc6, 0x4f, 0x3e, 0x3e, 0x3b, 0x44, 0x54, 0x38, 0x38, 0x48, 0x29, 0x51, 0x8a, 0x48, 0x69,
-	0x6d, 0x42, 0x2b, 0xde, 0x40, 0x07, 0x67, 0x2d, 0x4e, 0x4e, 0x26, 0x87, 0x10, 0x03, 0xe7, 0xe4,
-	0x3d, 0x3d, 0x49, 0x8b, 0xae, 0x5e, 0x81, 0xd0, 0xd9, 0xfb, 0xe9, 0x58, 0x70, 0x71, 0x12, 0x69,
-	0xbd, 0x10, 0x69, 0x92, 0x76, 0x70, 0xd0, 0x4e, 0xf9, 0xf7, 0x7b, 0x9e, 0xf7, 0xc9, 0xfb, 0xe2,
-	0x36, 0xd8, 0x02, 0xac, 0xb6, 0x4c, 0x8b, 0xac, 0x5b, 0x71, 0x27, 0xbb, 0xb9, 0x2e, 0xb4, 0x63,
-	0x93, 0x9e, 0x90, 0x8e, 0xf7, 0xd8, 0x68, 0x2c, 0xab, 0x27, 0x5a, 0x56, 0xe0, 0x20, 0x6d, 0x44,
-	0x96, 0x6a, 0x91, 0xad, 0x50, 0x4f, 0xd2, 0x48, 0xd6, 0x0f, 0x15, 0x28, 0xf0, 0x20, 0x5b, 0xed,
-	0x82, 0xa6, 0xde, 0x50, 0x00, 0x2a, 0x97, 0x8c, 0x97, 0x9a, 0x71, 0x63, 0xc0, 0x71, 0xa7, 0xc1,
-	0xd8, 0xf8, 0xda, 0xce, 0xbc, 0x25, 0x13, 0xdc, 0xca, 0x50, 0x6a, 0x53, 0xb8, 0xe4, 0x4a, 0x1b,
-	0x0f, 0x47, 0xb6, 0xf3, 0x47, 0xd2, 0x92, 0x57, 0xbc, 0x88, 0xc6, 0xcd, 0x03, 0xbc, 0x77, 0xed,
-	0xcf, 0x43, 0x39, 0x1a, 0x4b, 0xeb, 0x9a, 0xb7, 0x78, 0x7f, 0x7d, 0x61, 0x4b, 0x30, 0x56, 0xa6,
-	0x03, 0x5c, 0x0b, 0x92, 0x23, 0x74, 0x82, 0x5a, 0xbb, 0xfd, 0x53, 0xfa, 0xdb, 0xf7, 0x68, 0x50,
-	0x0f, 0xfe, 0xcf, 0x3e, 0x8e, 0x93, 0x61, 0x54, 0xf6, 0x5f, 0x11, 0xde, 0xb9, 0x59, 0xc5, 0x4e,
-	0xa7, 0x08, 0xd7, 0x02, 0x92, 0x76, 0xb6, 0x31, 0x8a, 0xb9, 0xea, 0xe7, 0xdb, 0xc1, 0x21, 0x73,
-	0x93, 0x3e, 0xbf, 0x7d, 0x4d, 0xff, 0xb5, 0xd2, 0x33, 0xb6, 0x55, 0x33, 0x06, 0xf7, 0xb3, 0x05,
-	0x41, 0xf3, 0x05, 0x41, 0x9f, 0x0b, 0x82, 0x5e, 0x96, 0x24, 0x99, 0x2f, 0x49, 0xf2, 0xbe, 0x24,
-	0xc9, 0xdd, 0x95, 0xd2, 0xee, 0x61, 0x2c, 0x68, 0x06, 0xc5, 0xda, 0xab, 0x9b, 0x73, 0x61, 0x37,
-	0xc6, 0x93, 0xde, 0x25, 0x7b, 0xfc, 0x69, 0x9f, 0xe5, 0x5a, 0x1a, 0x17, 0x26, 0xe5, 0x1b, 0x2d,
-	0x6a, 0x7e, 0xb9, 0xf8, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x78, 0xe8, 0x85, 0xaf, 0x48, 0x02, 0x00,
+	0x6d, 0x42, 0x2b, 0x78, 0x01, 0x1d, 0x9c, 0xb5, 0x38, 0x39, 0x99, 0x1c, 0x42, 0x0c, 0x9c, 0x93,
+	0xf7, 0xf4, 0x24, 0x2d, 0xba, 0x7a, 0x05, 0x42, 0x67, 0xef, 0xa7, 0x63, 0xc1, 0xc5, 0x49, 0xa4,
+	0xf5, 0x42, 0xa4, 0x49, 0xda, 0xc1, 0x41, 0x3b, 0xe5, 0xdf, 0xef, 0x79, 0xde, 0x27, 0xef, 0x8b,
+	0xdb, 0x60, 0x0b, 0xb0, 0xda, 0x32, 0x2d, 0xb2, 0x6e, 0xc5, 0x9d, 0xec, 0xe6, 0xba, 0xd0, 0x8e,
+	0x4d, 0x7a, 0x42, 0x3a, 0xde, 0x63, 0xa3, 0xb1, 0xac, 0x9e, 0x68, 0x59, 0x81, 0x83, 0xb4, 0x11,
+	0x59, 0xaa, 0x45, 0xb6, 0x42, 0x3d, 0x49, 0x23, 0x59, 0x3f, 0x54, 0xa0, 0xc0, 0x83, 0x6c, 0xb5,
+	0x0b, 0x9a, 0x7a, 0x43, 0x01, 0xa8, 0x5c, 0x32, 0x5e, 0x6a, 0xc6, 0x8d, 0x01, 0xc7, 0x9d, 0x06,
+	0x63, 0xe3, 0x6b, 0x3b, 0xf3, 0x96, 0x4c, 0x70, 0x2b, 0x43, 0xa9, 0x4d, 0xe1, 0x92, 0x2b, 0x6d,
+	0x3c, 0x1c, 0xd9, 0xce, 0x1f, 0x49, 0x4b, 0x5e, 0xf1, 0x22, 0x1a, 0x37, 0x0f, 0xf0, 0xde, 0xb5,
+	0x3f, 0x0f, 0xe5, 0x68, 0x2c, 0xad, 0x6b, 0xde, 0xe2, 0xfd, 0xf5, 0x85, 0x2d, 0xc1, 0x58, 0x99,
+	0x0e, 0x70, 0x2d, 0x48, 0x8e, 0xd0, 0x09, 0x6a, 0xed, 0xf6, 0x4f, 0xe9, 0x6f, 0xdf, 0xa3, 0x41,
+	0x3d, 0xf8, 0x3f, 0xfb, 0x38, 0x4e, 0x86, 0x51, 0xd9, 0x7f, 0x45, 0x78, 0xe7, 0x66, 0x15, 0x3b,
+	0x9d, 0x22, 0x5c, 0x0b, 0x48, 0xda, 0xd9, 0xc6, 0x28, 0xe6, 0xaa, 0x9f, 0x6f, 0x07, 0x87, 0xcc,
+	0x4d, 0xfa, 0xfc, 0xf6, 0x35, 0xfd, 0xd7, 0x4a, 0xcf, 0xd8, 0x56, 0xcd, 0x18, 0xdc, 0xcf, 0x16,
+	0x04, 0xcd, 0x17, 0x04, 0x7d, 0x2e, 0x08, 0x7a, 0x59, 0x92, 0x64, 0xbe, 0x24, 0xc9, 0xfb, 0x92,
+	0x24, 0x77, 0x57, 0x4a, 0xbb, 0x87, 0xb1, 0xa0, 0x19, 0x14, 0x6b, 0xaf, 0x6e, 0xce, 0x85, 0xdd,
+	0x18, 0x4f, 0x7a, 0x97, 0xec, 0xf1, 0xa7, 0x7d, 0x96, 0x6b, 0x69, 0x5c, 0x98, 0x94, 0x6f, 0xb4,
+	0xa8, 0xf9, 0xe5, 0xe2, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xde, 0xa0, 0xfd, 0xd1, 0x48, 0x02, 0x00,
 	0x00,
 }
 
diff --git a/x/ibc-rate-limit/genesis.go b/x/ibc-rate-limit/genesis.go
index a4280f85278..80466ab81bb 100644
--- a/x/ibc-rate-limit/genesis.go
+++ b/x/ibc-rate-limit/genesis.go
@@ -3,7 +3,7 @@ package ibc_rate_limit
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 // InitGenesis initializes the x/ibc-rate-limit module's state from a provided genesis
diff --git a/x/ibc-rate-limit/genesis_test.go b/x/ibc-rate-limit/genesis_test.go
index 27c9c284c01..4b64b1fd415 100644
--- a/x/ibc-rate-limit/genesis_test.go
+++ b/x/ibc-rate-limit/genesis_test.go
@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 type GenesisTestSuite struct {
diff --git a/x/ibc-rate-limit/ibc_middleware_test.go b/x/ibc-rate-limit/ibc_middleware_test.go
index 4b5b55e01fb..a713afcd374 100644
--- a/x/ibc-rate-limit/ibc_middleware_test.go
+++ b/x/ibc-rate-limit/ibc_middleware_test.go
@@ -15,11 +15,11 @@ import (
 	ibctesting "github.com/cosmos/ibc-go/v4/testing"
 	"github.com/stretchr/testify/suite"
 
-	txfeetypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	txfeetypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/tests/osmosisibctesting"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/tests/osmosisibctesting"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 type MiddlewareTestSuite struct {
diff --git a/x/ibc-rate-limit/ibc_module.go b/x/ibc-rate-limit/ibc_module.go
index aa8cc00cce6..f4b99c4b7d7 100644
--- a/x/ibc-rate-limit/ibc_module.go
+++ b/x/ibc-rate-limit/ibc_module.go
@@ -16,7 +16,7 @@ import (
 	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v4/modules/core/exported"
 
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 type IBCModule struct {
diff --git a/x/ibc-rate-limit/ibcratelimitmodule/module.go b/x/ibc-rate-limit/ibcratelimitmodule/module.go
index 7f143ba5f27..d9969575ca6 100644
--- a/x/ibc-rate-limit/ibcratelimitmodule/module.go
+++ b/x/ibc-rate-limit/ibcratelimitmodule/module.go
@@ -17,12 +17,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	ibcratelimit "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit"
-	ibcratelimitclient "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client"
-	ibcratelimitcli "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	ibcratelimit "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit"
+	ibcratelimitclient "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client"
+	ibcratelimitcli "github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 var (
diff --git a/x/ibc-rate-limit/ics4_wrapper.go b/x/ibc-rate-limit/ics4_wrapper.go
index ad63f80d0f3..2232d9ce5f1 100644
--- a/x/ibc-rate-limit/ics4_wrapper.go
+++ b/x/ibc-rate-limit/ics4_wrapper.go
@@ -14,7 +14,7 @@ import (
 	porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v4/modules/core/exported"
 
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 var (
diff --git a/x/ibc-rate-limit/rate_limit.go b/x/ibc-rate-limit/rate_limit.go
index fa8df2fbac1..e3bf50b176f 100644
--- a/x/ibc-rate-limit/rate_limit.go
+++ b/x/ibc-rate-limit/rate_limit.go
@@ -10,7 +10,7 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v4/modules/core/exported"
 
-	"github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
+	"github.com/osmosis-labs/osmosis/v16/x/ibc-rate-limit/types"
 )
 
 var (
diff --git a/x/ibc-rate-limit/types/genesis.pb.go b/x/ibc-rate-limit/types/genesis.pb.go
index 10915acf0c6..49376a49d93 100644
--- a/x/ibc-rate-limit/types/genesis.pb.go
+++ b/x/ibc-rate-limit/types/genesis.pb.go
@@ -94,9 +94,9 @@ var fileDescriptor_14e381f6ddb4f706 = []byte{
 	0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x54, 0xa7, 0x53, 0xc8, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9,
 	0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e,
 	0xcb, 0x31, 0x44, 0x59, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43,
-	0xcd, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0x4d, 0xf5, 0x2b, 0xd0, 0x1d,
+	0xcd, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0xcd, 0xf4, 0x2b, 0xd0, 0x1d,
 	0x5e, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xb0, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff,
-	0x58, 0xd2, 0x0b, 0x33, 0x77, 0x01, 0x00, 0x00,
+	0xe7, 0xda, 0x14, 0xfa, 0x77, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/ibc-rate-limit/types/params.pb.go b/x/ibc-rate-limit/types/params.pb.go
index ad0f97f9b1b..6002f8c4e93 100644
--- a/x/ibc-rate-limit/types/params.pb.go
+++ b/x/ibc-rate-limit/types/params.pb.go
@@ -89,9 +89,9 @@ var fileDescriptor_ca004105b8c54072 = []byte{
 	0x84, 0xae, 0x42, 0x29, 0x88, 0x1f, 0x26, 0xe4, 0x08, 0x11, 0x71, 0x0a, 0x39, 0xf1, 0x48, 0x8e,
 	0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58,
 	0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xab, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4,
-	0xfc, 0x5c, 0x7d, 0xa8, 0x53, 0x75, 0x73, 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x43, 0x53,
+	0xfc, 0x5c, 0x7d, 0xa8, 0x53, 0x75, 0x73, 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x43, 0x33,
 	0xfd, 0x0a, 0x74, 0xaf, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x9d, 0x6b, 0x0c, 0x08,
-	0x00, 0x00, 0xff, 0xff, 0xf9, 0xfc, 0x38, 0x72, 0x11, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x46, 0xf4, 0x27, 0xbb, 0x11, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go
index c12016e3e98..1178ad2049b 100644
--- a/x/incentives/client/cli/cli_test.go
+++ b/x/incentives/client/cli/cli_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/query"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 )
 
 
diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go
index ee17fbe2e7d..595b03d4c98 100644
--- a/x/incentives/client/cli/query.go
+++ b/x/incentives/client/cli/query.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go
index 1c85ec9372a..7e40589357f 100644
--- a/x/incentives/client/cli/query_test.go
+++ b/x/incentives/client/cli/query_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go
index d8aa0cb3a64..b251307f02f 100644
--- a/x/incentives/client/cli/tx.go
+++ b/x/incentives/client/cli/tx.go
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go
index f0feeb05e25..c1f059fe25d 100644
--- a/x/incentives/keeper/bench_test.go
+++ b/x/incentives/keeper/bench_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go
index 4ee63e66f24..95108fe6a17 100644
--- a/x/incentives/keeper/distribute.go
+++ b/x/incentives/keeper/distribute.go
@@ -9,10 +9,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // getDistributedCoinsFromGauges returns coins that have been distributed already from the provided gauges
diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go
index 2b1401c086c..aaade1b54ef 100644
--- a/x/incentives/keeper/distribute_test.go
+++ b/x/incentives/keeper/distribute_test.go
@@ -7,11 +7,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var _ = suite.TestingSuite(nil)
diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go
index b5a1b31661c..8b6f3a98a6b 100644
--- a/x/incentives/keeper/export_test.go
+++ b/x/incentives/keeper/export_test.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 )
 
 // AddGaugeRefByKey appends the provided gauge ID into an array associated with the provided key.
diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go
index 1d0a2ffd526..ec68d60e6a1 100644
--- a/x/incentives/keeper/gauge.go
+++ b/x/incentives/keeper/gauge.go
@@ -16,8 +16,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go
index 80ceee23036..f8052258867 100644
--- a/x/incentives/keeper/gauge_test.go
+++ b/x/incentives/keeper/gauge_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go
index f1551671e3c..9fb1c96d983 100644
--- a/x/incentives/keeper/genesis.go
+++ b/x/incentives/keeper/genesis.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 )
 
 // InitGenesis initializes the incentives module's state from a provided genesis state.
diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go
index 5b63f5e6d7b..9f49f2bd412 100644
--- a/x/incentives/keeper/genesis_test.go
+++ b/x/incentives/keeper/genesis_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	osmoapp "github.com/osmosis-labs/osmosis/v15/app"
+	osmoapp "github.com/osmosis-labs/osmosis/v16/app"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // TestIncentivesExportGenesis tests export genesis command for the incentives module.
diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go
index 93cdee21934..55679437d72 100644
--- a/x/incentives/keeper/grpc_query.go
+++ b/x/incentives/keeper/grpc_query.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types/query"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go
index cbe9dfd17e8..f369beb8306 100644
--- a/x/incentives/keeper/grpc_query_test.go
+++ b/x/incentives/keeper/grpc_query_test.go
@@ -8,9 +8,9 @@ import (
 
 	query "github.com/cosmos/cosmos-sdk/types/query"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	pooltypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	pooltypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var _ = suite.TestingSuite(nil)
diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go
index 44430284b5f..d40d690b6f2 100644
--- a/x/incentives/keeper/hooks.go
+++ b/x/incentives/keeper/hooks.go
@@ -1,8 +1,8 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go
index df596306d73..b8dba35ced5 100644
--- a/x/incentives/keeper/iterator.go
+++ b/x/incentives/keeper/iterator.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go
index 073ce6b788c..6d517332b0b 100644
--- a/x/incentives/keeper/keeper.go
+++ b/x/incentives/keeper/keeper.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go
index bf8378c771f..5fce1ee669b 100644
--- a/x/incentives/keeper/keeper_test.go
+++ b/x/incentives/keeper/keeper_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/keeper"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go
index cb6154d344d..ddac84ee5e9 100644
--- a/x/incentives/keeper/msg_server.go
+++ b/x/incentives/keeper/msg_server.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/incentives/keeper/msg_server_test.go b/x/incentives/keeper/msg_server_test.go
index 1dbe720e299..6c52e6d8709 100644
--- a/x/incentives/keeper/msg_server_test.go
+++ b/x/incentives/keeper/msg_server_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go
index 0396b7787a5..f2ec44ba79a 100644
--- a/x/incentives/keeper/params.go
+++ b/x/incentives/keeper/params.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/store.go b/x/incentives/keeper/store.go
index 356d3d058fc..7d58be719fd 100644
--- a/x/incentives/keeper/store.go
+++ b/x/incentives/keeper/store.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go
index 9aa0df5364a..44d010ae83d 100644
--- a/x/incentives/keeper/suite_test.go
+++ b/x/incentives/keeper/suite_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go
index 357d5d3c2ce..3218ab39720 100644
--- a/x/incentives/keeper/utils.go
+++ b/x/incentives/keeper/utils.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go
index c763f092055..da1d5a9a8f2 100644
--- a/x/incentives/keeper/utils_test.go
+++ b/x/incentives/keeper/utils_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/module.go b/x/incentives/module.go
index db796950f34..92753488ea5 100644
--- a/x/incentives/module.go
+++ b/x/incentives/module.go
@@ -27,12 +27,12 @@ import (
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/client/rest"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/client/rest"
 )
 
 var (
diff --git a/x/incentives/simulation/genesis.go b/x/incentives/simulation/genesis.go
index ec8f4e90c2b..40a107b10b5 100644
--- a/x/incentives/simulation/genesis.go
+++ b/x/incentives/simulation/genesis.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 )
 
 // Simulation parameter constants.
diff --git a/x/incentives/simulation/operations.go b/x/incentives/simulation/operations.go
index 4097d146853..6414d8e9286 100644
--- a/x/incentives/simulation/operations.go
+++ b/x/incentives/simulation/operations.go
@@ -4,13 +4,13 @@ import (
 	"math/rand"
 	"time"
 
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go
index 4fd81e74d87..1b3a70d84ed 100644
--- a/x/incentives/types/expected_keepers.go
+++ b/x/incentives/types/expected_keepers.go
@@ -5,9 +5,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go
index d004ed0cfb2..b13cfb1f730 100644
--- a/x/incentives/types/gauge.go
+++ b/x/incentives/types/gauge.go
@@ -3,7 +3,7 @@ package types
 import (
 	time "time"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go
index efb952e2c74..66f2624a320 100644
--- a/x/incentives/types/gauge.pb.go
+++ b/x/incentives/types/gauge.pb.go
@@ -11,7 +11,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -205,38 +205,38 @@ var fileDescriptor_c0304e2bb0159901 = []byte{
 	// 545 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x30,
 	0x1c, 0xc7, 0x9b, 0xad, 0x1d, 0xc3, 0xed, 0x10, 0xb5, 0x86, 0x94, 0x56, 0x22, 0x2d, 0x45, 0x48,
-	0xbd, 0xcc, 0xa6, 0x43, 0x70, 0xe0, 0xd8, 0x81, 0xd0, 0x24, 0x24, 0x4a, 0xb5, 0x03, 0xe2, 0x12,
-	0x39, 0x89, 0x9b, 0x59, 0x4d, 0xf2, 0x8b, 0x62, 0xa7, 0x5a, 0xdf, 0x80, 0xe3, 0xc4, 0x89, 0x67,
-	0xe0, 0x49, 0x76, 0xdc, 0x91, 0xd3, 0x86, 0xda, 0x37, 0xe0, 0x09, 0x50, 0xec, 0x44, 0xad, 0xca,
-	0x95, 0x93, 0xe3, 0xdf, 0xf7, 0xf7, 0xef, 0xfb, 0x91, 0x83, 0x1c, 0x90, 0x31, 0x48, 0x21, 0xa9,
-	0x48, 0x7c, 0x9e, 0x28, 0xb1, 0xe0, 0x92, 0x86, 0x2c, 0x0f, 0x39, 0x49, 0x33, 0x50, 0x80, 0x71,
-	0xa9, 0x93, 0x8d, 0xde, 0x3d, 0x0e, 0x21, 0x04, 0x2d, 0xd3, 0xe2, 0xcb, 0x64, 0x76, 0x9d, 0x10,
-	0x20, 0x8c, 0x38, 0xd5, 0x37, 0x2f, 0x9f, 0xd1, 0x20, 0xcf, 0x98, 0x12, 0x90, 0x94, 0x7a, 0x6f,
-	0x57, 0x57, 0x22, 0xe6, 0x52, 0xb1, 0x38, 0xad, 0x1a, 0xf8, 0x7a, 0x16, 0xf5, 0x98, 0xe4, 0x74,
-	0x31, 0xf2, 0xb8, 0x62, 0x23, 0xea, 0x83, 0xa8, 0x1a, 0x74, 0xaa, 0x55, 0x23, 0xf0, 0xe7, 0x79,
-	0xaa, 0x0f, 0x23, 0x0d, 0xbe, 0xd7, 0x51, 0xe3, 0x43, 0xb1, 0x35, 0x7e, 0x84, 0xf6, 0x44, 0x60,
-	0x5b, 0x7d, 0x6b, 0x58, 0x9f, 0xee, 0x89, 0x00, 0x3f, 0x43, 0x2d, 0x21, 0xdd, 0x94, 0x67, 0x29,
-	0x57, 0x39, 0x8b, 0xec, 0xbd, 0xbe, 0x35, 0x3c, 0x9c, 0x36, 0x85, 0x9c, 0x54, 0x21, 0x7c, 0x8e,
-	0x8e, 0x02, 0x21, 0x55, 0x26, 0xbc, 0x5c, 0x71, 0x57, 0x81, 0xbd, 0xdf, 0xb7, 0x86, 0xcd, 0x53,
-	0x87, 0x54, 0xd6, 0xcd, 0x3c, 0xf2, 0x39, 0xe7, 0xd9, 0xf2, 0x0c, 0x92, 0x40, 0x14, 0xae, 0xc6,
-	0xf5, 0x9b, 0xbb, 0x5e, 0x6d, 0xda, 0xda, 0x94, 0x5e, 0x00, 0x66, 0xa8, 0x51, 0x2c, 0x2c, 0xed,
-	0x7a, 0x7f, 0x7f, 0xd8, 0x3c, 0xed, 0x10, 0x63, 0x89, 0x14, 0x96, 0x48, 0x69, 0x89, 0x9c, 0x81,
-	0x48, 0xc6, 0x2f, 0x8b, 0xea, 0x9f, 0xf7, 0xbd, 0x61, 0x28, 0xd4, 0x65, 0xee, 0x11, 0x1f, 0x62,
-	0x5a, 0xfa, 0x37, 0xc7, 0x89, 0x0c, 0xe6, 0x54, 0x2d, 0x53, 0x2e, 0x75, 0x81, 0x9c, 0x9a, 0xce,
-	0xf8, 0x0b, 0x42, 0x52, 0xb1, 0x4c, 0xb9, 0x05, 0x3e, 0xbb, 0xa1, 0x57, 0xed, 0x12, 0xc3, 0x96,
-	0x54, 0x6c, 0xc9, 0x45, 0xc5, 0x76, 0xfc, 0xb4, 0x18, 0xf4, 0xe7, 0xae, 0xd7, 0x5e, 0xb2, 0x38,
-	0x7a, 0x3b, 0xd8, 0xd4, 0x0e, 0xae, 0xef, 0x7b, 0xd6, 0xf4, 0xa1, 0x0e, 0x14, 0xe9, 0x98, 0xa2,
-	0xe3, 0x24, 0x8f, 0x5d, 0x9e, 0x82, 0x7f, 0x29, 0xdd, 0x94, 0x89, 0xc0, 0x85, 0x05, 0xcf, 0xec,
-	0x03, 0x0d, 0xb3, 0x9d, 0xe4, 0xf1, 0x7b, 0x2d, 0x4d, 0x98, 0x08, 0x3e, 0x2d, 0x78, 0x86, 0x9f,
-	0xa3, 0xa3, 0x99, 0x88, 0x22, 0x1e, 0x94, 0x35, 0xf6, 0x03, 0x9d, 0xd9, 0x32, 0x41, 0x93, 0x8c,
-	0xaf, 0x50, 0x7b, 0x83, 0x28, 0x70, 0x0d, 0x9e, 0xc3, 0xff, 0x8f, 0xe7, 0xf1, 0xd6, 0x14, 0x1d,
-	0x19, 0x7c, 0xb3, 0xd0, 0x93, 0x8f, 0xe0, 0xcf, 0x99, 0x17, 0xf1, 0x77, 0xe5, 0x5b, 0x94, 0xe7,
-	0xc9, 0x0c, 0x30, 0x20, 0x1c, 0x95, 0x82, 0x5b, 0xbd, 0x52, 0x69, 0x5b, 0xe5, 0x52, 0xbb, 0x2c,
-	0xab, 0xda, 0xf1, 0x8b, 0x12, 0x65, 0xc7, 0xa0, 0xfc, 0xb7, 0xc5, 0xe0, 0x47, 0x81, 0xb4, 0x1d,
-	0xed, 0x0e, 0x1d, 0x4f, 0x6e, 0x56, 0x8e, 0x75, 0xbb, 0x72, 0xac, 0xdf, 0x2b, 0xc7, 0xba, 0x5e,
-	0x3b, 0xb5, 0xdb, 0xb5, 0x53, 0xfb, 0xb5, 0x76, 0x6a, 0x5f, 0xdf, 0x6c, 0x19, 0x2c, 0xdf, 0xdb,
-	0x49, 0xc4, 0x3c, 0x59, 0x5d, 0xe8, 0x62, 0xf4, 0x9a, 0x5e, 0x6d, 0xff, 0x9d, 0xda, 0xb4, 0x77,
-	0xa0, 0xd7, 0x7b, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x16, 0x38, 0x0c, 0xba, 0xc0, 0x03, 0x00,
+	0xbd, 0xcc, 0xa6, 0x43, 0xda, 0x81, 0x63, 0x07, 0x42, 0x93, 0x90, 0x28, 0xd5, 0x0e, 0x88, 0x4b,
+	0xe4, 0x24, 0x6e, 0x66, 0x35, 0xc9, 0x2f, 0x8a, 0x9d, 0x6a, 0x7d, 0x03, 0x8e, 0x13, 0x27, 0x9e,
+	0x81, 0x27, 0xd9, 0x71, 0x47, 0x4e, 0x1b, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0xb1, 0x13, 0xb5, 0x2a,
+	0x57, 0x4e, 0x8e, 0x7f, 0xdf, 0xdf, 0xbf, 0xef, 0x47, 0x0e, 0x72, 0x40, 0xc6, 0x20, 0x85, 0xa4,
+	0x22, 0xf1, 0x79, 0xa2, 0xc4, 0x82, 0x4b, 0x1a, 0xb2, 0x3c, 0xe4, 0x24, 0xcd, 0x40, 0x01, 0xc6,
+	0xa5, 0x4e, 0x36, 0x7a, 0xf7, 0x38, 0x84, 0x10, 0xb4, 0x4c, 0x8b, 0x2f, 0x93, 0xd9, 0x75, 0x42,
+	0x80, 0x30, 0xe2, 0x54, 0xdf, 0xbc, 0x7c, 0x46, 0x83, 0x3c, 0x63, 0x4a, 0x40, 0x52, 0xea, 0xbd,
+	0x5d, 0x5d, 0x89, 0x98, 0x4b, 0xc5, 0xe2, 0xb4, 0x6a, 0xe0, 0xeb, 0x59, 0xd4, 0x63, 0x92, 0xd3,
+	0xc5, 0xc8, 0xe3, 0x8a, 0x8d, 0xa8, 0x0f, 0xa2, 0x6a, 0xd0, 0xa9, 0x56, 0x8d, 0xc0, 0x9f, 0xe7,
+	0xa9, 0x3e, 0x8c, 0x34, 0xf8, 0x5e, 0x47, 0x8d, 0x0f, 0xc5, 0xd6, 0xf8, 0x09, 0xda, 0x13, 0x81,
+	0x6d, 0xf5, 0xad, 0x61, 0x7d, 0xba, 0x27, 0x02, 0xfc, 0x02, 0xb5, 0x84, 0x74, 0x53, 0x9e, 0xa5,
+	0x5c, 0xe5, 0x2c, 0xb2, 0xf7, 0xfa, 0xd6, 0xf0, 0x70, 0xda, 0x14, 0x72, 0x52, 0x85, 0xf0, 0x05,
+	0x3a, 0x0a, 0x84, 0x54, 0x99, 0xf0, 0x72, 0xc5, 0x5d, 0x05, 0xf6, 0x7e, 0xdf, 0x1a, 0x36, 0x4f,
+	0x1d, 0x52, 0x59, 0x37, 0xf3, 0xc8, 0xe7, 0x9c, 0x67, 0xcb, 0x73, 0x48, 0x02, 0x51, 0xb8, 0x1a,
+	0xd7, 0x6f, 0xef, 0x7b, 0xb5, 0x69, 0x6b, 0x53, 0x7a, 0x09, 0x98, 0xa1, 0x46, 0xb1, 0xb0, 0xb4,
+	0xeb, 0xfd, 0xfd, 0x61, 0xf3, 0xb4, 0x43, 0x8c, 0x25, 0x52, 0x58, 0x22, 0xa5, 0x25, 0x72, 0x0e,
+	0x22, 0x19, 0xbf, 0x2e, 0xaa, 0x7f, 0x3e, 0xf4, 0x86, 0xa1, 0x50, 0x57, 0xb9, 0x47, 0x7c, 0x88,
+	0x69, 0xe9, 0xdf, 0x1c, 0x27, 0x32, 0x98, 0x53, 0xb5, 0x4c, 0xb9, 0xd4, 0x05, 0x72, 0x6a, 0x3a,
+	0xe3, 0x2f, 0x08, 0x49, 0xc5, 0x32, 0xe5, 0x16, 0xf8, 0xec, 0x86, 0x5e, 0xb5, 0x4b, 0x0c, 0x5b,
+	0x52, 0xb1, 0x25, 0x97, 0x15, 0xdb, 0xf1, 0xf3, 0x62, 0xd0, 0x9f, 0xfb, 0x5e, 0x7b, 0xc9, 0xe2,
+	0xe8, 0xed, 0x60, 0x53, 0x3b, 0xb8, 0x79, 0xe8, 0x59, 0xd3, 0xc7, 0x3a, 0x50, 0xa4, 0x63, 0x8a,
+	0x8e, 0x93, 0x3c, 0x76, 0x79, 0x0a, 0xfe, 0x95, 0x74, 0x53, 0x26, 0x02, 0x17, 0x16, 0x3c, 0xb3,
+	0x0f, 0x34, 0xcc, 0x76, 0x92, 0xc7, 0xef, 0xb5, 0x34, 0x61, 0x22, 0xf8, 0xb4, 0xe0, 0x19, 0x7e,
+	0x89, 0x8e, 0x66, 0x22, 0x8a, 0x78, 0x50, 0xd6, 0xd8, 0x8f, 0x74, 0x66, 0xcb, 0x04, 0x4d, 0x32,
+	0xbe, 0x46, 0xed, 0x0d, 0xa2, 0xc0, 0x35, 0x78, 0x0e, 0xff, 0x3f, 0x9e, 0xa7, 0x5b, 0x53, 0x74,
+	0x64, 0xf0, 0xcd, 0x42, 0xcf, 0x3e, 0x82, 0x3f, 0x67, 0x5e, 0xc4, 0xdf, 0x95, 0x6f, 0x51, 0x5e,
+	0x24, 0x33, 0xc0, 0x80, 0x70, 0x54, 0x0a, 0x6e, 0xf5, 0x4a, 0xa5, 0x6d, 0x95, 0x4b, 0xed, 0xb2,
+	0xac, 0x6a, 0xc7, 0xaf, 0x4a, 0x94, 0x1d, 0x83, 0xf2, 0xdf, 0x16, 0x83, 0x1f, 0x05, 0xd2, 0x76,
+	0xb4, 0x3b, 0x74, 0x3c, 0xb9, 0x5d, 0x39, 0xd6, 0xdd, 0xca, 0xb1, 0x7e, 0xaf, 0x1c, 0xeb, 0x66,
+	0xed, 0xd4, 0xee, 0xd6, 0x4e, 0xed, 0xd7, 0xda, 0xa9, 0x7d, 0x3d, 0xdb, 0x32, 0x58, 0xbe, 0xb7,
+	0x93, 0x88, 0x79, 0xb2, 0xba, 0xd0, 0xc5, 0xe8, 0x8c, 0x5e, 0x6f, 0xff, 0x9d, 0xda, 0xb4, 0x77,
+	0xa0, 0xd7, 0x7b, 0xf3, 0x37, 0x00, 0x00, 0xff, 0xff, 0x31, 0x3f, 0xd2, 0xb8, 0xc0, 0x03, 0x00,
 	0x00,
 }
 
diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go
index efa9e1963bc..e50dd8028c5 100644
--- a/x/incentives/types/genesis.pb.go
+++ b/x/incentives/types/genesis.pb.go
@@ -110,29 +110,29 @@ func init() {
 func init() { proto.RegisterFile("osmosis/incentives/genesis.proto", fileDescriptor_a288ccc95d977d2d) }
 
 var fileDescriptor_a288ccc95d977d2d = []byte{
-	// 342 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xbf, 0x6e, 0xf2, 0x30,
-	0x14, 0xc5, 0x13, 0x40, 0x0c, 0xe1, 0xfb, 0x86, 0x5a, 0x1d, 0x02, 0x83, 0x13, 0x45, 0xaa, 0xc4,
-	0x52, 0x5b, 0xa5, 0xea, 0x1f, 0x75, 0x44, 0x95, 0x50, 0x37, 0x44, 0xb7, 0x2e, 0xc8, 0x01, 0xd7,
-	0xb5, 0x9a, 0xc4, 0x88, 0xeb, 0xa0, 0xf2, 0x16, 0x9d, 0xaa, 0x3e, 0x12, 0x23, 0x63, 0x27, 0x5a,
-	0xc1, 0x1b, 0xf4, 0x09, 0xaa, 0x38, 0xb1, 0x5a, 0x09, 0x36, 0x5f, 0x9f, 0xdf, 0x3d, 0xf7, 0xdc,
-	0xeb, 0x85, 0x0a, 0x52, 0x05, 0x12, 0xa8, 0xcc, 0x26, 0x3c, 0xd3, 0x72, 0xc1, 0x81, 0x0a, 0x9e,
-	0x71, 0x90, 0x40, 0x66, 0x73, 0xa5, 0x15, 0x42, 0x15, 0x41, 0x7e, 0x89, 0xce, 0xb1, 0x50, 0x42,
-	0x19, 0x99, 0x16, 0xaf, 0x92, 0xec, 0x60, 0xa1, 0x94, 0x48, 0x38, 0x35, 0x55, 0x9c, 0x3f, 0xd2,
-	0x69, 0x3e, 0x67, 0x5a, 0xaa, 0xac, 0xd2, 0x83, 0x03, 0xb3, 0x66, 0x6c, 0xce, 0x52, 0xb0, 0x06,
-	0x87, 0xc2, 0xb0, 0x5c, 0xf0, 0x52, 0x8f, 0xde, 0x6a, 0xde, 0xbf, 0x41, 0x19, 0xee, 0x5e, 0x33,
-	0xcd, 0xd1, 0xb5, 0xd7, 0x2c, 0x0d, 0x7c, 0x37, 0x74, 0xbb, 0xad, 0x5e, 0x87, 0xec, 0x87, 0x25,
-	0x43, 0x43, 0xf4, 0x1b, 0xab, 0x4d, 0xe0, 0x8c, 0x2a, 0x1e, 0x5d, 0x79, 0x4d, 0xe3, 0x0c, 0x7e,
-	0x2d, 0xac, 0x77, 0x5b, 0xbd, 0xf6, 0xa1, 0xce, 0x41, 0x41, 0xd8, 0xc6, 0x12, 0x47, 0xca, 0x43,
-	0x89, 0x9a, 0x3c, 0xb3, 0x38, 0xe1, 0x63, 0xbb, 0x1f, 0xf8, 0xf5, 0xca, 0xa4, 0xbc, 0x00, 0xb1,
-	0x17, 0x20, 0xb7, 0x15, 0xd1, 0x3f, 0x29, 0x4c, 0xbe, 0x37, 0x41, 0x7b, 0xc9, 0xd2, 0xe4, 0x26,
-	0xda, 0xb7, 0x88, 0xde, 0x3f, 0x03, 0x77, 0x74, 0x64, 0x05, 0xdb, 0x08, 0x28, 0xf2, 0xfe, 0x27,
-	0x0c, 0xf4, 0xd8, 0xcc, 0x1f, 0xcb, 0xa9, 0xdf, 0x08, 0xdd, 0x6e, 0x63, 0xd4, 0x2a, 0x3e, 0x4d,
-	0xc0, 0xbb, 0x69, 0x7f, 0xb8, 0xda, 0x62, 0x77, 0xbd, 0xc5, 0xee, 0xd7, 0x16, 0xbb, 0xaf, 0x3b,
-	0xec, 0xac, 0x77, 0xd8, 0xf9, 0xd8, 0x61, 0xe7, 0xe1, 0x52, 0x48, 0xfd, 0x94, 0xc7, 0x64, 0xa2,
-	0x52, 0x5a, 0x6d, 0x78, 0x9a, 0xb0, 0x18, 0x6c, 0x41, 0x17, 0x67, 0x17, 0xf4, 0xe5, 0xef, 0xc1,
-	0xf5, 0x72, 0xc6, 0x21, 0x6e, 0x9a, 0x15, 0xce, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x39, 0xbd,
-	0xb2, 0x4d, 0x20, 0x02, 0x00, 0x00,
+	// 341 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x6e, 0xfa, 0x30,
+	0x10, 0xc6, 0x13, 0x40, 0x0c, 0xe1, 0xff, 0x1f, 0x6a, 0x75, 0x08, 0x0c, 0x4e, 0x14, 0xa9, 0x12,
+	0x4b, 0x6d, 0x95, 0x4a, 0xb4, 0xea, 0x88, 0x2a, 0xa1, 0x6e, 0x88, 0x6e, 0x5d, 0x90, 0x03, 0xae,
+	0x6b, 0x35, 0x89, 0x11, 0xe7, 0xa0, 0xf2, 0x16, 0x9d, 0xaa, 0x3e, 0x12, 0x23, 0x63, 0x27, 0x5a,
+	0xc1, 0x1b, 0xf4, 0x09, 0xaa, 0x38, 0xb1, 0x5a, 0x09, 0x36, 0x9f, 0xbf, 0xdf, 0x7d, 0xf7, 0xdd,
+	0x79, 0xa1, 0x82, 0x54, 0x81, 0x04, 0x2a, 0xb3, 0x29, 0xcf, 0xb4, 0x5c, 0x72, 0xa0, 0x82, 0x67,
+	0x1c, 0x24, 0x90, 0xf9, 0x42, 0x69, 0x85, 0x50, 0x45, 0x90, 0x5f, 0xa2, 0x73, 0x2a, 0x94, 0x50,
+	0x46, 0xa6, 0xc5, 0xab, 0x24, 0x3b, 0x58, 0x28, 0x25, 0x12, 0x4e, 0x4d, 0x15, 0xe7, 0x8f, 0x74,
+	0x96, 0x2f, 0x98, 0x96, 0x2a, 0xab, 0xf4, 0xe0, 0xc8, 0xac, 0x39, 0x5b, 0xb0, 0x14, 0xac, 0xc1,
+	0xb1, 0x30, 0x2c, 0x17, 0xbc, 0xd4, 0xa3, 0xb7, 0x9a, 0xf7, 0x6f, 0x58, 0x86, 0xbb, 0xd7, 0x4c,
+	0x73, 0x74, 0xed, 0x35, 0x4b, 0x03, 0xdf, 0x0d, 0xdd, 0x6e, 0xab, 0xd7, 0x21, 0x87, 0x61, 0xc9,
+	0xc8, 0x10, 0x83, 0xc6, 0x7a, 0x1b, 0x38, 0xe3, 0x8a, 0x47, 0x57, 0x5e, 0xd3, 0x38, 0x83, 0x5f,
+	0x0b, 0xeb, 0xdd, 0x56, 0xaf, 0x7d, 0xac, 0x73, 0x58, 0x10, 0xb6, 0xb1, 0xc4, 0x91, 0xf2, 0x50,
+	0xa2, 0xa6, 0xcf, 0x2c, 0x4e, 0xf8, 0xc4, 0xee, 0x07, 0x7e, 0xbd, 0x32, 0x29, 0x2f, 0x40, 0xec,
+	0x05, 0xc8, 0x6d, 0x45, 0x0c, 0xce, 0x0a, 0x93, 0xef, 0x6d, 0xd0, 0x5e, 0xb1, 0x34, 0xb9, 0x89,
+	0x0e, 0x2d, 0xa2, 0xf7, 0xcf, 0xc0, 0x1d, 0x9f, 0x58, 0xc1, 0x36, 0x02, 0x8a, 0xbc, 0xff, 0x09,
+	0x03, 0x3d, 0x31, 0xf3, 0x27, 0x72, 0xe6, 0x37, 0x42, 0xb7, 0xdb, 0x18, 0xb7, 0x8a, 0x4f, 0x13,
+	0xf0, 0x6e, 0x36, 0x18, 0xad, 0x77, 0xd8, 0xdd, 0xec, 0xb0, 0xfb, 0xb5, 0xc3, 0xee, 0xeb, 0x1e,
+	0x3b, 0x9b, 0x3d, 0x76, 0x3e, 0xf6, 0xd8, 0x79, 0xe8, 0x0b, 0xa9, 0x9f, 0xf2, 0x98, 0x4c, 0x55,
+	0x4a, 0xab, 0x0d, 0xcf, 0x13, 0x16, 0x83, 0x2d, 0xe8, 0xf2, 0xa2, 0x4f, 0x5f, 0xfe, 0x1e, 0x5c,
+	0xaf, 0xe6, 0x1c, 0xe2, 0xa6, 0x59, 0xe1, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xba, 0x6c,
+	0x4f, 0x20, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go
index ea57f9bb71e..5b94e041a9c 100644
--- a/x/incentives/types/msgs.go
+++ b/x/incentives/types/msgs.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go
index 9cf790a0c2f..a69fe97a212 100644
--- a/x/incentives/types/msgs_test.go
+++ b/x/incentives/types/msgs_test.go
@@ -9,12 +9,12 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // TestMsgCreatePool tests if valid/invalid create pool messages are properly validated/invalidated
diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go
index 35f2ece6d84..ccc714281fc 100644
--- a/x/incentives/types/params.pb.go
+++ b/x/incentives/types/params.pb.go
@@ -89,8 +89,8 @@ var fileDescriptor_1cc8b460d089f845 = []byte{
 	0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18,
 	0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x2c, 0x3d, 0xb3, 0x24, 0xa3, 0x34,
 	0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x62, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf,
-	0xcc, 0xd0, 0x54, 0xbf, 0x02, 0xd9, 0x97, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xb7,
-	0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xa4, 0xec, 0x1f, 0x08, 0x01, 0x00, 0x00,
+	0xcc, 0xd0, 0x4c, 0xbf, 0x02, 0xd9, 0x97, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xb7,
+	0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96, 0xa3, 0x32, 0x1d, 0x08, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go
index c5c19baf54d..6c7c674101e 100644
--- a/x/incentives/types/query.pb.go
+++ b/x/incentives/types/query.pb.go
@@ -14,7 +14,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	_ "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	_ "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -938,71 +938,71 @@ func init() { proto.RegisterFile("osmosis/incentives/query.proto", fileDescripto
 var fileDescriptor_8124258a89427f98 = []byte{
 	// 1057 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xc7, 0x33, 0x4e, 0x52, 0x9a, 0xd7, 0x12, 0x9a, 0x21, 0x40, 0xe2, 0xb6, 0x6b, 0xb3, 0x6a,
-	0x53, 0x37, 0x25, 0x3b, 0x71, 0x4c, 0x52, 0x04, 0x02, 0x09, 0xe3, 0x52, 0x2a, 0x81, 0x14, 0x56,
+	0x14, 0xc7, 0x33, 0x4e, 0x5c, 0xda, 0xd7, 0x12, 0x9a, 0x21, 0x40, 0xe2, 0xb6, 0x6b, 0xb3, 0x6a,
+	0x53, 0x37, 0x25, 0x3b, 0x71, 0x4c, 0x53, 0x04, 0x02, 0x09, 0xe3, 0x52, 0x2a, 0x81, 0x14, 0x56,
 	0x20, 0x24, 0x24, 0xb4, 0x5a, 0x7b, 0x87, 0xed, 0x2a, 0xf6, 0x8e, 0xbb, 0xb3, 0x9b, 0x60, 0x45,
 	0xb9, 0x20, 0xce, 0x15, 0x88, 0x08, 0x71, 0xe8, 0x5f, 0xc0, 0x11, 0x24, 0x8e, 0x1c, 0x38, 0xf5,
 	0x58, 0x09, 0x09, 0x71, 0x4a, 0x51, 0xc2, 0x5f, 0xd0, 0xbf, 0x00, 0xed, 0xec, 0xac, 0xbd, 0xb6,
 	0xd7, 0xeb, 0x04, 0xd1, 0x2a, 0x27, 0x67, 0xf2, 0x7e, 0x7d, 0xde, 0xd7, 0xe3, 0xf7, 0x06, 0x14,
-	0xc6, 0x5b, 0x8c, 0x3b, 0x9c, 0x38, 0x6e, 0x83, 0xba, 0xbe, 0xb3, 0x4d, 0x39, 0xb9, 0x17, 0x50,
-	0xaf, 0xa3, 0xb5, 0x3d, 0xe6, 0x33, 0x8c, 0xa5, 0x5d, 0xeb, 0xd9, 0xf3, 0xf3, 0x36, 0xb3, 0x99,
-	0x30, 0x93, 0xf0, 0xaf, 0xc8, 0x33, 0x7f, 0xc9, 0x66, 0xcc, 0x6e, 0x52, 0x62, 0xb6, 0x1d, 0x62,
-	0xba, 0x2e, 0xf3, 0x4d, 0xdf, 0x61, 0x2e, 0x97, 0x56, 0x45, 0x5a, 0xc5, 0xa9, 0x1e, 0x7c, 0x49,
-	0xac, 0xc0, 0x13, 0x0e, 0xb1, 0xbd, 0x21, 0x0a, 0x91, 0xba, 0xc9, 0x29, 0xd9, 0x2e, 0xd7, 0xa9,
-	0x6f, 0x96, 0x49, 0x83, 0x39, 0xb1, 0x7d, 0x39, 0x69, 0x17, 0x80, 0x5d, 0xaf, 0xb6, 0x69, 0x3b,
-	0x6e, 0x5f, 0xae, 0x94, 0x9e, 0x6c, 0x33, 0xb0, 0xa9, 0xb4, 0x2f, 0xc6, 0xf6, 0x26, 0x6b, 0x6c,
-	0x05, 0x6d, 0xf1, 0x11, 0x99, 0xd4, 0x22, 0x28, 0x1f, 0x31, 0x2b, 0x68, 0xd2, 0x4f, 0x58, 0xcd,
-	0xe1, 0xbe, 0xe7, 0xd4, 0x03, 0x9f, 0xbe, 0xc7, 0x1c, 0x97, 0xeb, 0xf4, 0x5e, 0x40, 0xb9, 0xaf,
-	0x7e, 0x83, 0xa0, 0x30, 0xd2, 0x85, 0xb7, 0x99, 0xcb, 0x29, 0x36, 0x61, 0x3a, 0x44, 0xe7, 0x0b,
-	0xa8, 0x38, 0x59, 0x3a, 0xb7, 0xb6, 0xa8, 0x45, 0xf0, 0x5a, 0x08, 0xaf, 0x49, 0x6c, 0x2d, 0x0c,
-	0xa9, 0xae, 0x3e, 0x3c, 0x28, 0x4c, 0xfc, 0xf4, 0xb8, 0x50, 0xb2, 0x1d, 0xff, 0x6e, 0x50, 0xd7,
-	0x1a, 0xac, 0x45, 0x64, 0xa7, 0xd1, 0xc7, 0x0a, 0xb7, 0xb6, 0x88, 0xdf, 0x69, 0x53, 0xae, 0x45,
-	0x35, 0xa2, 0xcc, 0xaa, 0x0a, 0x17, 0x6e, 0x87, 0x2d, 0x55, 0x3b, 0x77, 0x6a, 0x12, 0x0d, 0xcf,
-	0x42, 0xce, 0xb1, 0x16, 0x50, 0x11, 0x95, 0xa6, 0xf4, 0x9c, 0x63, 0xa9, 0x35, 0x98, 0x4b, 0xf8,
-	0x48, 0x36, 0x02, 0xd3, 0x42, 0x0b, 0xe1, 0x17, 0xb2, 0x0d, 0x7f, 0xc1, 0x9a, 0x88, 0xd2, 0x23,
-	0x3f, 0xf5, 0x33, 0x78, 0x5e, 0x9c, 0x63, 0x05, 0xf0, 0xfb, 0x00, 0x3d, 0xc9, 0x65, 0x9a, 0xa5,
-	0xbe, 0x16, 0xa3, 0x0b, 0x14, 0x37, 0xba, 0x69, 0xda, 0x54, 0xc6, 0xea, 0x89, 0x48, 0xf5, 0x3e,
-	0x82, 0xd9, 0x38, 0xb3, 0x84, 0xab, 0xc0, 0x94, 0x65, 0xfa, 0x66, 0x57, 0xb7, 0x51, 0x6c, 0xd5,
-	0xa9, 0x50, 0x37, 0x5d, 0x38, 0xe3, 0xdb, 0x7d, 0x3c, 0x39, 0xc1, 0x73, 0x6d, 0x2c, 0x4f, 0x54,
-	0xb1, 0x0f, 0xe8, 0x0b, 0x78, 0xf1, 0xdd, 0x46, 0x58, 0xe5, 0xe9, 0xf4, 0xbb, 0x8f, 0x60, 0xbe,
-	0x3f, 0xff, 0xa9, 0xe8, 0x7a, 0x17, 0x2e, 0x26, 0xa9, 0x36, 0xa9, 0x57, 0xa3, 0x2e, 0x6b, 0xc5,
-	0xdd, 0xcf, 0xc3, 0xb4, 0x15, 0x9e, 0x45, 0xe3, 0x33, 0x7a, 0x74, 0x18, 0xd0, 0x24, 0xf7, 0x9f,
-	0x35, 0x79, 0x80, 0xe0, 0x52, 0x7a, 0xf5, 0x53, 0xa1, 0x8d, 0x01, 0x2f, 0x7d, 0xda, 0x6e, 0xb0,
-	0x96, 0xe3, 0xda, 0x4f, 0xe7, 0x4e, 0xfc, 0x80, 0xe0, 0xe5, 0xc1, 0x0a, 0xa7, 0xa2, 0xf3, 0x3d,
-	0xb8, 0xdc, 0xcf, 0xf5, 0x6c, 0xef, 0xc5, 0x2f, 0x08, 0x94, 0x51, 0xf5, 0xa5, 0x3e, 0x1f, 0xc0,
-	0x0b, 0x81, 0xf4, 0x30, 0xc4, 0xa4, 0xe2, 0xc7, 0x95, 0x6a, 0x36, 0xe8, 0xcb, 0xfc, 0xff, 0x89,
-	0xc6, 0x61, 0x4e, 0xa7, 0x3b, 0xa6, 0x67, 0xf1, 0x5b, 0xdc, 0x8f, 0x85, 0x5a, 0x82, 0x69, 0xb6,
-	0xe3, 0x52, 0x2f, 0x12, 0xaa, 0x7a, 0xe1, 0xc9, 0x41, 0xe1, 0x7c, 0xc7, 0x6c, 0x35, 0xdf, 0x54,
-	0xc5, 0xbf, 0x55, 0x3d, 0x32, 0xe3, 0x45, 0x38, 0x1b, 0x2e, 0x22, 0xc3, 0xb1, 0xf8, 0x42, 0xae,
-	0x38, 0x59, 0x9a, 0xd2, 0x9f, 0x0b, 0xcf, 0x77, 0x2c, 0x8e, 0x2f, 0xc2, 0x0c, 0x75, 0x2d, 0x83,
-	0xb6, 0x59, 0xe3, 0xee, 0xc2, 0x64, 0x11, 0x95, 0x26, 0xf5, 0xb3, 0xd4, 0xb5, 0x6e, 0x85, 0x67,
-	0x75, 0x07, 0x70, 0xb2, 0xe8, 0xb3, 0x5b, 0x41, 0x05, 0xb8, 0xfc, 0x71, 0xa8, 0xcb, 0x87, 0xac,
-	0xb1, 0x65, 0xd6, 0x9b, 0xb4, 0x26, 0x37, 0x7a, 0x77, 0x55, 0x7e, 0x87, 0x40, 0x19, 0xe5, 0x21,
-	0x31, 0x19, 0xe0, 0xa6, 0x34, 0x1a, 0xf1, 0x8b, 0xa0, 0xc7, 0x1c, 0xbd, 0x19, 0xb4, 0xf8, 0xcd,
-	0xa0, 0xc5, 0xf1, 0xd5, 0xab, 0x21, 0xf3, 0x93, 0x83, 0xc2, 0x62, 0x24, 0xe4, 0x70, 0x0a, 0xf5,
-	0xc7, 0xc7, 0x05, 0xa4, 0xcf, 0x35, 0x07, 0x0b, 0xaf, 0xfd, 0x79, 0x0e, 0xa6, 0x05, 0x13, 0xfe,
-	0x1d, 0xc1, 0x2b, 0x23, 0x16, 0x39, 0x5e, 0x4b, 0xbb, 0x42, 0xd9, 0x0f, 0x83, 0x7c, 0xe5, 0x44,
-	0x31, 0x51, 0xff, 0xea, 0x3b, 0x5f, 0xff, 0xf1, 0xcf, 0xf7, 0xb9, 0x37, 0xf0, 0x06, 0x49, 0x79,
-	0xb3, 0xc4, 0x0f, 0x9c, 0x96, 0x48, 0x62, 0xf8, 0xcc, 0xb0, 0xba, 0x69, 0x0c, 0xf1, 0x1d, 0xe0,
-	0xfb, 0x08, 0x66, 0xba, 0x3b, 0x1e, 0x5f, 0x19, 0x7d, 0xf3, 0x7b, 0xcf, 0x84, 0xfc, 0xd5, 0x31,
-	0x5e, 0x12, 0xed, 0x75, 0x81, 0xa6, 0xe1, 0xd7, 0xb2, 0xd0, 0xc4, 0x0f, 0xcf, 0xa8, 0x77, 0x0c,
-	0xc7, 0x22, 0xbb, 0x8e, 0xb5, 0x87, 0x77, 0xe1, 0x8c, 0xfc, 0x55, 0xbd, 0x3a, 0xb2, 0x4c, 0x57,
-	0x32, 0x35, 0xcb, 0x45, 0x62, 0x2c, 0x0b, 0x8c, 0x2b, 0x58, 0x1d, 0x8b, 0xc1, 0xf1, 0x3e, 0x82,
-	0xf3, 0xc9, 0x6d, 0x82, 0xaf, 0xa5, 0x15, 0x48, 0xd9, 0xf1, 0xf9, 0xd2, 0x78, 0x47, 0xc9, 0x53,
-	0x16, 0x3c, 0x37, 0xf0, 0xf5, 0x2c, 0x1e, 0x53, 0x44, 0xca, 0xb1, 0x84, 0x7f, 0x1d, 0x58, 0xfc,
-	0xf1, 0x28, 0xc3, 0x64, 0x5c, 0xd5, 0x81, 0xa1, 0x9b, 0x5f, 0x3d, 0x7e, 0x80, 0xc4, 0x7d, 0x4b,
-	0xe0, 0xae, 0xe3, 0xca, 0xb1, 0x71, 0x8d, 0x36, 0xf5, 0x8c, 0x68, 0x9a, 0x3f, 0x40, 0x30, 0xdb,
-	0x3f, 0x85, 0xf1, 0xf5, 0x34, 0x82, 0xd4, 0x1d, 0x99, 0x5f, 0x3e, 0x8e, 0xab, 0xc4, 0xac, 0x08,
-	0xcc, 0x15, 0x7c, 0x23, 0x0b, 0x73, 0x60, 0xdc, 0xe3, 0xdf, 0x86, 0x96, 0x67, 0x57, 0xd9, 0xf2,
-	0xf8, 0xda, 0x83, 0xda, 0xae, 0x9d, 0x24, 0x44, 0x62, 0xbf, 0x2d, 0xb0, 0x6f, 0xe2, 0xf5, 0x13,
-	0x60, 0x27, 0xf4, 0xdd, 0x47, 0x00, 0xbd, 0xd9, 0x8d, 0x53, 0x7f, 0x98, 0x43, 0x0b, 0x25, 0xbf,
-	0x34, 0xce, 0x4d, 0xc2, 0xdd, 0x14, 0x70, 0x65, 0x4c, 0xb2, 0xe0, 0xbc, 0x28, 0xce, 0xa0, 0xdc,
-	0x27, 0xbb, 0x62, 0x11, 0xed, 0xe1, 0x9f, 0x11, 0xcc, 0x0d, 0x8d, 0xec, 0x74, 0x49, 0x33, 0x17,
-	0x40, 0xba, 0xa4, 0xd9, 0x1b, 0x41, 0xdd, 0x10, 0xd4, 0xab, 0x58, 0xcb, 0xa2, 0x1e, 0x1e, 0xf8,
-	0xd5, 0xcd, 0x87, 0x87, 0x0a, 0x7a, 0x74, 0xa8, 0xa0, 0xbf, 0x0f, 0x15, 0xf4, 0xed, 0x91, 0x32,
-	0xf1, 0xe8, 0x48, 0x99, 0xf8, 0xeb, 0x48, 0x99, 0xf8, 0x7c, 0x23, 0xb1, 0xd8, 0x64, 0xce, 0x95,
-	0xa6, 0x59, 0xe7, 0xdd, 0x02, 0xdb, 0xe5, 0x75, 0xf2, 0x55, 0xb2, 0x8c, 0x58, 0x76, 0xf5, 0x33,
-	0x62, 0xef, 0x54, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xe1, 0x4c, 0x24, 0x23, 0x0f, 0x00,
+	0xc6, 0xdb, 0x8c, 0x3b, 0x9c, 0x38, 0x6e, 0x93, 0xba, 0xbe, 0xb3, 0x45, 0x39, 0xb9, 0x17, 0x50,
+	0xaf, 0xab, 0x75, 0x3c, 0xe6, 0x33, 0x8c, 0xa5, 0x5d, 0xeb, 0xdb, 0x0b, 0xf3, 0x36, 0xb3, 0x99,
+	0x30, 0x93, 0xf0, 0xaf, 0xc8, 0xb3, 0x70, 0xd1, 0x66, 0xcc, 0x6e, 0x51, 0x62, 0x76, 0x1c, 0x62,
+	0xba, 0x2e, 0xf3, 0x4d, 0xdf, 0x61, 0x2e, 0x97, 0x56, 0x45, 0x5a, 0xc5, 0xa9, 0x11, 0x7c, 0x49,
+	0xac, 0xc0, 0x13, 0x0e, 0xb1, 0xbd, 0x29, 0x0a, 0x91, 0x86, 0xc9, 0x29, 0xd9, 0xaa, 0x34, 0xa8,
+	0x6f, 0x56, 0x48, 0x93, 0x39, 0xb1, 0x7d, 0x39, 0x69, 0x17, 0x80, 0x3d, 0xaf, 0x8e, 0x69, 0x3b,
+	0xee, 0x40, 0xae, 0x94, 0x9e, 0x6c, 0x33, 0xb0, 0xa9, 0xb4, 0x2f, 0xc6, 0xf6, 0x16, 0x6b, 0x6e,
+	0x06, 0x1d, 0xf1, 0x11, 0x99, 0xd4, 0x12, 0x28, 0x1f, 0x31, 0x2b, 0x68, 0xd1, 0x4f, 0x58, 0xdd,
+	0xe1, 0xbe, 0xe7, 0x34, 0x02, 0x9f, 0xbe, 0xc7, 0x1c, 0x97, 0xeb, 0xf4, 0x5e, 0x40, 0xb9, 0xaf,
+	0x7e, 0x83, 0xa0, 0x38, 0xd6, 0x85, 0x77, 0x98, 0xcb, 0x29, 0x36, 0x21, 0x1f, 0xa2, 0xf3, 0x05,
+	0x54, 0x9a, 0x2e, 0x9f, 0x5d, 0x5b, 0xd4, 0x22, 0x78, 0x2d, 0x84, 0xd7, 0x24, 0xb6, 0x16, 0x86,
+	0xd4, 0x56, 0x1f, 0xee, 0x17, 0xa7, 0x7e, 0x7a, 0x5c, 0x2c, 0xdb, 0x8e, 0x7f, 0x37, 0x68, 0x68,
+	0x4d, 0xd6, 0x26, 0xb2, 0xd3, 0xe8, 0x63, 0x85, 0x5b, 0x9b, 0xc4, 0xef, 0x76, 0x28, 0xd7, 0xa2,
+	0x1a, 0x51, 0x66, 0x55, 0x85, 0xf3, 0xb7, 0xc3, 0x96, 0x6a, 0xdd, 0x3b, 0x75, 0x89, 0x86, 0x67,
+	0x21, 0xe7, 0x58, 0x0b, 0xa8, 0x84, 0xca, 0x33, 0x7a, 0xce, 0xb1, 0xd4, 0x3a, 0xcc, 0x25, 0x7c,
+	0x24, 0x1b, 0x81, 0xbc, 0xd0, 0x42, 0xf8, 0x85, 0x6c, 0xa3, 0x5f, 0xb0, 0x26, 0xa2, 0xf4, 0xc8,
+	0x4f, 0xfd, 0x0c, 0x9e, 0x17, 0xe7, 0x58, 0x01, 0xfc, 0x3e, 0x40, 0x5f, 0x72, 0x99, 0x66, 0x69,
+	0xa0, 0xc5, 0xe8, 0x02, 0xc5, 0x8d, 0x6e, 0x98, 0x36, 0x95, 0xb1, 0x7a, 0x22, 0x52, 0xbd, 0x8f,
+	0x60, 0x36, 0xce, 0x2c, 0xe1, 0xaa, 0x30, 0x63, 0x99, 0xbe, 0xd9, 0xd3, 0x6d, 0x1c, 0x5b, 0x6d,
+	0x26, 0xd4, 0x4d, 0x17, 0xce, 0xf8, 0xf6, 0x00, 0x4f, 0x4e, 0xf0, 0x5c, 0x9d, 0xc8, 0x13, 0x55,
+	0x1c, 0x00, 0xfa, 0x02, 0x5e, 0x7c, 0xb7, 0x19, 0x56, 0x79, 0x3a, 0xfd, 0xee, 0x21, 0x98, 0x1f,
+	0xcc, 0x7f, 0x22, 0xba, 0xde, 0x81, 0x0b, 0x49, 0xaa, 0x0d, 0xea, 0xd5, 0xa9, 0xcb, 0xda, 0x71,
+	0xf7, 0xf3, 0x90, 0xb7, 0xc2, 0xb3, 0x68, 0xfc, 0x8c, 0x1e, 0x1d, 0x86, 0x34, 0xc9, 0xfd, 0x67,
+	0x4d, 0x1e, 0x20, 0xb8, 0x98, 0x5e, 0xfd, 0x44, 0x68, 0x63, 0xc0, 0x4b, 0x9f, 0x76, 0x9a, 0xac,
+	0xed, 0xb8, 0xf6, 0xd3, 0xb9, 0x13, 0x3f, 0x20, 0x78, 0x79, 0xb8, 0xc2, 0x89, 0xe8, 0x7c, 0x17,
+	0x2e, 0x0d, 0x72, 0x3d, 0xdb, 0x7b, 0xf1, 0x0b, 0x02, 0x65, 0x5c, 0x7d, 0xa9, 0xcf, 0x07, 0xf0,
+	0x42, 0x20, 0x3d, 0x0c, 0x31, 0xa9, 0xf8, 0x51, 0xa5, 0x9a, 0x0d, 0x06, 0x32, 0xff, 0x7f, 0xa2,
+	0x71, 0x98, 0xd3, 0xe9, 0xb6, 0xe9, 0x59, 0xfc, 0x16, 0xf7, 0x63, 0xa1, 0x96, 0x20, 0xcf, 0xb6,
+	0x5d, 0xea, 0x45, 0x42, 0xd5, 0xce, 0x3f, 0xd9, 0x2f, 0x9e, 0xeb, 0x9a, 0xed, 0xd6, 0x9b, 0xaa,
+	0xf8, 0xb7, 0xaa, 0x47, 0x66, 0xbc, 0x08, 0xa7, 0xc3, 0x45, 0x64, 0x38, 0x16, 0x5f, 0xc8, 0x95,
+	0xa6, 0xcb, 0x33, 0xfa, 0x73, 0xe1, 0xf9, 0x8e, 0xc5, 0xf1, 0x05, 0x38, 0x43, 0x5d, 0xcb, 0xa0,
+	0x1d, 0xd6, 0xbc, 0xbb, 0x30, 0x5d, 0x42, 0xe5, 0x69, 0xfd, 0x34, 0x75, 0xad, 0x5b, 0xe1, 0x59,
+	0xdd, 0x06, 0x9c, 0x2c, 0xfa, 0xec, 0x56, 0x50, 0x11, 0x2e, 0x7d, 0x1c, 0xea, 0xf2, 0x21, 0x6b,
+	0x6e, 0x9a, 0x8d, 0x16, 0xad, 0xcb, 0x8d, 0xde, 0x5b, 0x95, 0xdf, 0x21, 0x50, 0xc6, 0x79, 0x48,
+	0x4c, 0x06, 0xb8, 0x25, 0x8d, 0x46, 0xfc, 0x22, 0xe8, 0x33, 0x47, 0x6f, 0x06, 0x2d, 0x7e, 0x33,
+	0x68, 0x71, 0x7c, 0xed, 0x4a, 0xc8, 0xfc, 0x64, 0xbf, 0xb8, 0x18, 0x09, 0x39, 0x9a, 0x42, 0xfd,
+	0xf1, 0x71, 0x11, 0xe9, 0x73, 0xad, 0xe1, 0xc2, 0x6b, 0x7f, 0x9e, 0x85, 0xbc, 0x60, 0xc2, 0xbf,
+	0x23, 0x78, 0x65, 0xcc, 0x22, 0xc7, 0x6b, 0x69, 0x57, 0x28, 0xfb, 0x61, 0x50, 0xa8, 0x1e, 0x2b,
+	0x26, 0xea, 0x5f, 0x7d, 0xe7, 0xeb, 0x3f, 0xfe, 0xf9, 0x3e, 0xf7, 0x06, 0x5e, 0x27, 0x29, 0x6f,
+	0x96, 0xf8, 0x81, 0xd3, 0x16, 0x49, 0x0c, 0x9f, 0x19, 0x56, 0x2f, 0x8d, 0x21, 0xbe, 0x03, 0x7c,
+	0x1f, 0xc1, 0x99, 0xde, 0x8e, 0xc7, 0x97, 0xc7, 0xdf, 0xfc, 0xfe, 0x33, 0xa1, 0x70, 0x65, 0x82,
+	0x97, 0x44, 0x7b, 0x5d, 0xa0, 0x69, 0xf8, 0xb5, 0x2c, 0x34, 0xf1, 0xc3, 0x33, 0x1a, 0x5d, 0xc3,
+	0xb1, 0xc8, 0x8e, 0x63, 0xed, 0xe2, 0x1d, 0x38, 0x25, 0x7f, 0x55, 0xaf, 0x8e, 0x2d, 0xd3, 0x93,
+	0x4c, 0xcd, 0x72, 0x91, 0x18, 0xcb, 0x02, 0xe3, 0x32, 0x56, 0x27, 0x62, 0x70, 0xbc, 0x87, 0xe0,
+	0x5c, 0x72, 0x9b, 0xe0, 0xab, 0x69, 0x05, 0x52, 0x76, 0x7c, 0xa1, 0x3c, 0xd9, 0x51, 0xf2, 0x54,
+	0x04, 0xcf, 0x75, 0x7c, 0x2d, 0x8b, 0xc7, 0x14, 0x91, 0x72, 0x2c, 0xe1, 0x5f, 0x87, 0x16, 0x7f,
+	0x3c, 0xca, 0x30, 0x99, 0x54, 0x75, 0x68, 0xe8, 0x16, 0x56, 0x8f, 0x1e, 0x20, 0x71, 0xdf, 0x12,
+	0xb8, 0x37, 0x70, 0xf5, 0xc8, 0xb8, 0x46, 0x87, 0x7a, 0x46, 0x34, 0xcd, 0x1f, 0x20, 0x98, 0x1d,
+	0x9c, 0xc2, 0xf8, 0x5a, 0x1a, 0x41, 0xea, 0x8e, 0x2c, 0x2c, 0x1f, 0xc5, 0x55, 0x62, 0x56, 0x05,
+	0xe6, 0x0a, 0xbe, 0x9e, 0x85, 0x39, 0x34, 0xee, 0xf1, 0x6f, 0x23, 0xcb, 0xb3, 0xa7, 0x6c, 0x65,
+	0x72, 0xed, 0x61, 0x6d, 0xd7, 0x8e, 0x13, 0x22, 0xb1, 0xdf, 0x16, 0xd8, 0x37, 0xf1, 0x8d, 0x63,
+	0x60, 0x27, 0xf4, 0xdd, 0x43, 0x00, 0xfd, 0xd9, 0x8d, 0x53, 0x7f, 0x98, 0x23, 0x0b, 0xa5, 0xb0,
+	0x34, 0xc9, 0x4d, 0xc2, 0xdd, 0x14, 0x70, 0x15, 0x4c, 0xb2, 0xe0, 0xbc, 0x28, 0xce, 0xa0, 0xdc,
+	0x27, 0x3b, 0x62, 0x11, 0xed, 0xe2, 0x9f, 0x11, 0xcc, 0x8d, 0x8c, 0xec, 0x74, 0x49, 0x33, 0x17,
+	0x40, 0xba, 0xa4, 0xd9, 0x1b, 0x41, 0x5d, 0x17, 0xd4, 0xab, 0x58, 0xcb, 0xa2, 0x1e, 0x1d, 0xf8,
+	0xb5, 0x8d, 0x87, 0x07, 0x0a, 0x7a, 0x74, 0xa0, 0xa0, 0xbf, 0x0f, 0x14, 0xf4, 0xed, 0xa1, 0x32,
+	0xf5, 0xe8, 0x50, 0x99, 0xfa, 0xeb, 0x50, 0x99, 0xfa, 0x7c, 0x3d, 0xb1, 0xd8, 0x64, 0xce, 0x95,
+	0x96, 0xd9, 0xe0, 0xbd, 0x02, 0x5b, 0x95, 0x75, 0xf2, 0x55, 0xb2, 0x8c, 0x58, 0x76, 0x8d, 0x53,
+	0x62, 0xef, 0x54, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xdf, 0xe6, 0x92, 0x26, 0x23, 0x0f, 0x00,
 	0x00,
 }
 
diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go
index cf79fb1e391..8349647bfb3 100644
--- a/x/incentives/types/tx.pb.go
+++ b/x/incentives/types/tx.pb.go
@@ -14,7 +14,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -280,45 +280,45 @@ func init() { proto.RegisterFile("osmosis/incentives/tx.proto", fileDescriptor_8
 
 var fileDescriptor_8ea120e22291556e = []byte{
 	// 628 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x4f, 0xd4, 0x40,
-	0x18, 0xc6, 0x77, 0xdc, 0xe5, 0xdf, 0x2c, 0x18, 0x68, 0x50, 0xcb, 0x6a, 0xda, 0xa5, 0x31, 0xa6,
-	0x92, 0xec, 0x8c, 0x60, 0xf4, 0xc0, 0xcd, 0x25, 0xc6, 0x70, 0x20, 0x62, 0x43, 0x62, 0x42, 0x62,
-	0x9a, 0x69, 0x67, 0x2c, 0x13, 0xb6, 0x9d, 0xa6, 0x33, 0x5d, 0xe0, 0x2b, 0x78, 0xe2, 0x73, 0x78,
-	0xf2, 0xea, 0xcd, 0x23, 0x47, 0x8e, 0x9e, 0xc0, 0xc0, 0xc1, 0x3b, 0x9f, 0xc0, 0x74, 0xda, 0x02,
-	0x1b, 0x41, 0x2e, 0x5e, 0x3a, 0x9d, 0x79, 0xde, 0xf7, 0x9d, 0x79, 0x9f, 0xdf, 0xb4, 0xf0, 0xb1,
-	0x90, 0xb1, 0x90, 0x5c, 0x62, 0x9e, 0x84, 0x2c, 0x51, 0x7c, 0xc8, 0x24, 0x56, 0xfb, 0x28, 0xcd,
-	0x84, 0x12, 0x86, 0x51, 0x89, 0xe8, 0x4a, 0xec, 0xcc, 0x47, 0x22, 0x12, 0x5a, 0xc6, 0xc5, 0x5b,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x3f, 0x4f, 0xdc, 0x30,
+	0x18, 0xc6, 0xcf, 0xbd, 0xe3, 0x9f, 0x0f, 0x2a, 0x88, 0x68, 0x1b, 0xae, 0x55, 0x72, 0x44, 0x55,
+	0x95, 0x22, 0x9d, 0x5d, 0xa8, 0xc4, 0xc0, 0xd6, 0x43, 0x55, 0xc5, 0x80, 0x4a, 0x23, 0xa4, 0x4a,
+	0x48, 0x55, 0xe4, 0xc4, 0x6e, 0xb0, 0xb8, 0xc4, 0x51, 0xec, 0x1c, 0xf0, 0x15, 0x3a, 0xf1, 0x39,
+	0x3a, 0x75, 0xed, 0xd6, 0x91, 0x91, 0xb1, 0x13, 0x54, 0x30, 0x74, 0xe7, 0x13, 0x54, 0x71, 0x12,
+	0xe0, 0x54, 0x28, 0x4b, 0x97, 0x38, 0xf6, 0xf3, 0xbe, 0xaf, 0xfd, 0x3e, 0x3f, 0x27, 0xf0, 0xa9,
+	0x90, 0xb1, 0x90, 0x5c, 0x62, 0x9e, 0x84, 0x2c, 0x51, 0x7c, 0xc8, 0x24, 0x56, 0x07, 0x28, 0xcd,
+	0x84, 0x12, 0x86, 0x51, 0x89, 0xe8, 0x5a, 0xec, 0xcc, 0x47, 0x22, 0x12, 0x5a, 0xc6, 0xc5, 0x5b,
 	0x19, 0xd9, 0x99, 0x23, 0x31, 0x4f, 0x04, 0xd6, 0xcf, 0x6a, 0xc9, 0x8e, 0x84, 0x88, 0x06, 0x0c,
 	0xeb, 0x59, 0x90, 0x7f, 0xc6, 0x8a, 0xc7, 0x4c, 0x2a, 0x12, 0xa7, 0x55, 0x80, 0x15, 0xea, 0xf2,
-	0x38, 0x20, 0x92, 0xe1, 0xe1, 0x72, 0xc0, 0x14, 0x59, 0xc6, 0xa1, 0xe0, 0x49, 0xad, 0xdf, 0x70,
-	0xb4, 0x88, 0xe4, 0x11, 0xab, 0xf4, 0x85, 0x5a, 0x1f, 0x88, 0x70, 0x37, 0x4f, 0xf5, 0x50, 0x4a,
-	0xce, 0xf7, 0x26, 0xbc, 0xbf, 0x21, 0xa3, 0xb5, 0x8c, 0x11, 0xc5, 0xde, 0x15, 0x39, 0xc6, 0x22,
+	0x38, 0x20, 0x92, 0xe1, 0xe1, 0x72, 0xc0, 0x14, 0x59, 0xc6, 0xa1, 0xe0, 0x49, 0xad, 0xdf, 0x72,
+	0xb4, 0x88, 0xe4, 0x11, 0xab, 0xf4, 0x85, 0x5a, 0x1f, 0x88, 0x70, 0x2f, 0x4f, 0xf5, 0x50, 0x4a,
+	0xce, 0xf7, 0x26, 0x7c, 0xb8, 0x29, 0xa3, 0xf5, 0x8c, 0x11, 0xc5, 0xde, 0x15, 0x39, 0xc6, 0x22,
 	0x9c, 0xe6, 0xd2, 0x4f, 0x59, 0x96, 0x32, 0x95, 0x93, 0x81, 0x09, 0xba, 0xc0, 0x9d, 0xf4, 0xda,
-	0x5c, 0x6e, 0xd6, 0x4b, 0xc6, 0x33, 0x38, 0x26, 0xf6, 0x12, 0x96, 0x99, 0xf7, 0xba, 0xc0, 0x9d,
-	0xea, 0xcf, 0x5e, 0x9c, 0xd8, 0xd3, 0x07, 0x24, 0x1e, 0xac, 0x3a, 0x7a, 0xd9, 0xf1, 0x4a, 0xd9,
-	0x58, 0x87, 0x33, 0x94, 0x4b, 0x95, 0xf1, 0x20, 0x57, 0xcc, 0x57, 0xc2, 0x6c, 0x76, 0x81, 0xdb,
-	0x5e, 0xb1, 0x50, 0x6d, 0x57, 0x79, 0x20, 0xf4, 0x21, 0x67, 0xd9, 0xc1, 0x9a, 0x48, 0x28, 0x57,
-	0x5c, 0x24, 0xfd, 0xd6, 0xd1, 0x89, 0xdd, 0xf0, 0xa6, 0xaf, 0x52, 0xb7, 0x84, 0x41, 0xe0, 0x58,
+	0x5c, 0x6e, 0xd5, 0x4b, 0xc6, 0x0b, 0x38, 0x26, 0xf6, 0x13, 0x96, 0x99, 0x0f, 0xba, 0xc0, 0x9d,
+	0xea, 0xcf, 0x5e, 0x9e, 0xda, 0xd3, 0x87, 0x24, 0x1e, 0xac, 0x39, 0x7a, 0xd9, 0xf1, 0x4a, 0xd9,
+	0xd8, 0x80, 0x33, 0x94, 0x4b, 0x95, 0xf1, 0x20, 0x57, 0xcc, 0x57, 0xc2, 0x6c, 0x76, 0x81, 0xdb,
+	0x5e, 0xb1, 0x50, 0x6d, 0x57, 0x79, 0x20, 0xf4, 0x21, 0x67, 0xd9, 0xe1, 0xba, 0x48, 0x28, 0x57,
+	0x5c, 0x24, 0xfd, 0xd6, 0xf1, 0xa9, 0xdd, 0xf0, 0xa6, 0xaf, 0x53, 0xb7, 0x85, 0x41, 0xe0, 0x58,
 	0xd1, 0xb1, 0x34, 0x5b, 0xdd, 0xa6, 0xdb, 0x5e, 0x59, 0x40, 0xa5, 0x27, 0xa8, 0xf0, 0x04, 0x55,
-	0x9e, 0xa0, 0x35, 0xc1, 0x93, 0xfe, 0x8b, 0x22, 0xfb, 0xeb, 0xa9, 0xed, 0x46, 0x5c, 0xed, 0xe4,
-	0x01, 0x0a, 0x45, 0x8c, 0x2b, 0x03, 0xcb, 0xa1, 0x27, 0xe9, 0x2e, 0x56, 0x07, 0x29, 0x93, 0x3a,
+	0x9e, 0xa0, 0x75, 0xc1, 0x93, 0xfe, 0xab, 0x22, 0xfb, 0xeb, 0x99, 0xed, 0x46, 0x5c, 0xed, 0xe6,
+	0x01, 0x0a, 0x45, 0x8c, 0x2b, 0x03, 0xcb, 0xa1, 0x27, 0xe9, 0x1e, 0x56, 0x87, 0x29, 0x93, 0x3a,
 	0x41, 0x7a, 0x65, 0x65, 0xe3, 0x23, 0x84, 0x52, 0x91, 0x4c, 0xf9, 0x85, 0xff, 0xe6, 0x98, 0x3e,
-	0x6a, 0x07, 0x95, 0x70, 0x50, 0x0d, 0x07, 0x6d, 0xd5, 0x70, 0xfa, 0x4f, 0x8a, 0x8d, 0x2e, 0x4e,
-	0xec, 0xd9, 0xb2, 0xf5, 0x4b, 0x6a, 0xce, 0xe1, 0xa9, 0x0d, 0xbc, 0x29, 0x5d, 0xab, 0x88, 0x36,
-	0x30, 0x9c, 0x4f, 0xf2, 0xd8, 0x67, 0xa9, 0x08, 0x77, 0xa4, 0x9f, 0x12, 0x4e, 0x7d, 0x31, 0x64,
-	0x99, 0x39, 0xde, 0x05, 0x6e, 0xcb, 0x9b, 0x4b, 0xf2, 0xf8, 0xad, 0x96, 0x36, 0x09, 0xa7, 0xef,
-	0x87, 0x2c, 0x5b, 0x7d, 0xfa, 0xe5, 0xf7, 0xb7, 0x25, 0xfb, 0x06, 0xaa, 0xa1, 0xe6, 0xd4, 0xd3,
-	0x70, 0x1d, 0x13, 0x3e, 0x1c, 0x45, 0xe7, 0x31, 0x99, 0x8a, 0x44, 0x32, 0xe7, 0x14, 0xc0, 0x99,
-	0x0d, 0x19, 0xbd, 0xa1, 0x74, 0x4b, 0x94, 0x50, 0x2f, 0x89, 0x81, 0x7f, 0x13, 0x5b, 0x80, 0x93,
-	0xba, 0xb8, 0xcf, 0xa9, 0x86, 0xdb, 0xf2, 0x26, 0xf4, 0x7c, 0x9d, 0x1a, 0x0c, 0x4e, 0x64, 0x6c,
-	0x8f, 0x64, 0x54, 0x9a, 0xcd, 0xff, 0xcf, 0xa0, 0xae, 0x7d, 0x7b, 0xef, 0x84, 0xd2, 0x9e, 0x12,
-	0x55, 0xef, 0x8f, 0xe0, 0x83, 0x91, 0x06, 0xeb, 0xd6, 0x57, 0x7e, 0x00, 0xd8, 0xdc, 0x90, 0x91,
-	0xf1, 0x09, 0xb6, 0xaf, 0x5f, 0x6a, 0x07, 0xfd, 0xfd, 0x85, 0xa2, 0x51, 0xf7, 0x3a, 0x4b, 0x77,
-	0xc7, 0xd4, 0xdb, 0x18, 0xdb, 0x10, 0x5e, 0x73, 0x77, 0xf1, 0x96, 0xcc, 0xab, 0x90, 0xce, 0xf3,
-	0x3b, 0x43, 0xea, 0xda, 0xfd, 0xcd, 0xa3, 0x33, 0x0b, 0x1c, 0x9f, 0x59, 0xe0, 0xd7, 0x99, 0x05,
-	0x0e, 0xcf, 0xad, 0xc6, 0xf1, 0xb9, 0xd5, 0xf8, 0x79, 0x6e, 0x35, 0xb6, 0x5f, 0x5f, 0xb3, 0xb3,
-	0x2a, 0xd7, 0x1b, 0x90, 0x40, 0xd6, 0x13, 0x3c, 0x5c, 0x7e, 0x85, 0xf7, 0x47, 0xfe, 0x50, 0x85,
-	0xc5, 0xc1, 0xb8, 0xbe, 0xbd, 0x2f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xbf, 0x60, 0xa8,
+	0x6a, 0x07, 0x95, 0x70, 0x50, 0x0d, 0x07, 0x6d, 0xd7, 0x70, 0xfa, 0xcf, 0x8a, 0x8d, 0x2e, 0x4f,
+	0xed, 0xd9, 0xb2, 0xf5, 0x2b, 0x6a, 0xce, 0xd1, 0x99, 0x0d, 0xbc, 0x29, 0x5d, 0xab, 0x88, 0x36,
+	0x30, 0x9c, 0x4f, 0xf2, 0xd8, 0x67, 0xa9, 0x08, 0x77, 0xa5, 0x9f, 0x12, 0x4e, 0x7d, 0x31, 0x64,
+	0x99, 0x39, 0xde, 0x05, 0x6e, 0xcb, 0x9b, 0x4b, 0xf2, 0xf8, 0xad, 0x96, 0xb6, 0x08, 0xa7, 0xef,
+	0x87, 0x2c, 0x5b, 0x7b, 0xfe, 0xe5, 0xf7, 0xb7, 0x25, 0xfb, 0x16, 0xaa, 0xa1, 0xe6, 0xd4, 0xd3,
+	0x70, 0x1d, 0x13, 0x3e, 0x1e, 0x45, 0xe7, 0x31, 0x99, 0x8a, 0x44, 0x32, 0xe7, 0x0c, 0xc0, 0x99,
+	0x4d, 0x19, 0xbd, 0xa1, 0x74, 0x5b, 0x94, 0x50, 0xaf, 0x88, 0x81, 0x7f, 0x13, 0x5b, 0x80, 0x93,
+	0xba, 0xb8, 0xcf, 0xa9, 0x86, 0xdb, 0xf2, 0x26, 0xf4, 0x7c, 0x83, 0x1a, 0x0c, 0x4e, 0x64, 0x6c,
+	0x9f, 0x64, 0x54, 0x9a, 0xcd, 0xff, 0xcf, 0xa0, 0xae, 0x7d, 0x77, 0xef, 0x84, 0xd2, 0x9e, 0x12,
+	0x55, 0xef, 0x4f, 0xe0, 0xa3, 0x91, 0x06, 0xeb, 0xd6, 0x57, 0x7e, 0x00, 0xd8, 0xdc, 0x94, 0x91,
+	0xf1, 0x09, 0xb6, 0x6f, 0x5e, 0x6a, 0x07, 0xfd, 0xfd, 0x85, 0xa2, 0x51, 0xf7, 0x3a, 0x4b, 0xf7,
+	0xc7, 0xd4, 0xdb, 0x18, 0x3b, 0x10, 0xde, 0x70, 0x77, 0xf1, 0x8e, 0xcc, 0xeb, 0x90, 0xce, 0xcb,
+	0x7b, 0x43, 0xea, 0xda, 0xfd, 0xad, 0xe3, 0x73, 0x0b, 0x9c, 0x9c, 0x5b, 0xe0, 0xd7, 0xb9, 0x05,
+	0x8e, 0x2e, 0xac, 0xc6, 0xc9, 0x85, 0xd5, 0xf8, 0x79, 0x61, 0x35, 0x76, 0x56, 0x6f, 0xd8, 0x59,
+	0x95, 0xeb, 0x0d, 0x48, 0x20, 0xeb, 0x09, 0x1e, 0x2e, 0xaf, 0xe2, 0x83, 0x91, 0x3f, 0x54, 0x61,
+	0x71, 0x30, 0xae, 0x6f, 0xef, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xb8, 0xbe, 0xaa,
 	0xc4, 0x04, 0x00, 0x00,
 }
 
diff --git a/x/lockup/abci.go b/x/lockup/abci.go
index 3b01b119fc8..fb10985d35d 100644
--- a/x/lockup/abci.go
+++ b/x/lockup/abci.go
@@ -3,7 +3,7 @@ package lockup
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/client/cli/cli_test.go b/x/lockup/client/cli/cli_test.go
index 969ede89025..2c2c182ba43 100644
--- a/x/lockup/client/cli/cli_test.go
+++ b/x/lockup/client/cli/cli_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 var testAddresses = osmoutils.CreateRandomAccounts(3)
diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go
index faa79d831b8..88c882f1647 100644
--- a/x/lockup/client/cli/query.go
+++ b/x/lockup/client/cli/query.go
@@ -18,7 +18,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/lockup/client/cli/tx.go b/x/lockup/client/cli/tx.go
index 0c49522aa9a..d2e63d0e9bd 100644
--- a/x/lockup/client/cli/tx.go
+++ b/x/lockup/client/cli/tx.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // GetTxCmd returns the transaction commands for this module.
diff --git a/x/lockup/client/rest/query.go b/x/lockup/client/rest/query.go
index 5ff95490832..eaf8423d6a4 100644
--- a/x/lockup/client/rest/query.go
+++ b/x/lockup/client/rest/query.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/client/rest/tx.go b/x/lockup/client/rest/tx.go
index 5453e7b23ab..52888da5bad 100644
--- a/x/lockup/client/rest/tx.go
+++ b/x/lockup/client/rest/tx.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
diff --git a/x/lockup/keeper/admin_keeper.go b/x/lockup/keeper/admin_keeper.go
index f7bbc509605..1d495501e3c 100644
--- a/x/lockup/keeper/admin_keeper.go
+++ b/x/lockup/keeper/admin_keeper.go
@@ -2,7 +2,7 @@ package keeper
 
 import (
 	"github.com/gogo/protobuf/proto"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/admin_keeper_test.go b/x/lockup/keeper/admin_keeper_test.go
index 8203eb4bd8b..2fa3235cd30 100644
--- a/x/lockup/keeper/admin_keeper_test.go
+++ b/x/lockup/keeper/admin_keeper_test.go
@@ -3,7 +3,7 @@ package keeper_test
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/bench_test.go b/x/lockup/keeper/bench_test.go
index 90de2943f79..8d4bd4d1454 100644
--- a/x/lockup/keeper/bench_test.go
+++ b/x/lockup/keeper/bench_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/export_test.go b/x/lockup/keeper/export_test.go
index 527b5fa29e5..60f794626a4 100644
--- a/x/lockup/keeper/export_test.go
+++ b/x/lockup/keeper/export_test.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/genesis.go b/x/lockup/keeper/genesis.go
index 92781d7f9e8..c81be5c929f 100644
--- a/x/lockup/keeper/genesis.go
+++ b/x/lockup/keeper/genesis.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/genesis_test.go b/x/lockup/keeper/genesis_test.go
index 637f975d4cd..6384819bece 100644
--- a/x/lockup/keeper/genesis_test.go
+++ b/x/lockup/keeper/genesis_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	osmoapp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	osmoapp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/grpc_query.go b/x/lockup/keeper/grpc_query.go
index 676f047f72b..ebd6e806232 100644
--- a/x/lockup/keeper/grpc_query.go
+++ b/x/lockup/keeper/grpc_query.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/lockup/keeper/grpc_query_test.go b/x/lockup/keeper/grpc_query_test.go
index 6ec096aaf77..8a8d4a500b4 100644
--- a/x/lockup/keeper/grpc_query_test.go
+++ b/x/lockup/keeper/grpc_query_test.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 func (s *KeeperTestSuite) LockTokens(addr sdk.AccAddress, coins sdk.Coins, duration time.Duration) {
diff --git a/x/lockup/keeper/invariants.go b/x/lockup/keeper/invariants.go
index 3fd3b4b889d..14f6319e506 100644
--- a/x/lockup/keeper/invariants.go
+++ b/x/lockup/keeper/invariants.go
@@ -8,7 +8,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // RegisterInvariants registers all governance invariants.
diff --git a/x/lockup/keeper/iterator.go b/x/lockup/keeper/iterator.go
index 31a22088b2d..6221ca0e2b8 100644
--- a/x/lockup/keeper/iterator.go
+++ b/x/lockup/keeper/iterator.go
@@ -5,7 +5,7 @@ import (
 
 	db "github.com/tendermint/tm-db"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/keeper.go b/x/lockup/keeper/keeper.go
index 23314cd005b..13629d4919a 100644
--- a/x/lockup/keeper/keeper.go
+++ b/x/lockup/keeper/keeper.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/lockup/keeper/keeper_test.go b/x/lockup/keeper/keeper_test.go
index e63694fc9c7..33ef39e3d84 100644
--- a/x/lockup/keeper/keeper_test.go
+++ b/x/lockup/keeper/keeper_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/stretchr/testify/suite"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go
index 838ac71a132..c9c1231093c 100644
--- a/x/lockup/keeper/lock.go
+++ b/x/lockup/keeper/lock.go
@@ -14,8 +14,8 @@ import (
 	"github.com/gogo/protobuf/proto"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/sumtree"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // WithdrawAllMaturedLocks withdraws every lock thats in the process of unlocking, and has finished unlocking by
diff --git a/x/lockup/keeper/lock_refs.go b/x/lockup/keeper/lock_refs.go
index 91ca5b4b36d..b30ed96fd32 100644
--- a/x/lockup/keeper/lock_refs.go
+++ b/x/lockup/keeper/lock_refs.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/lock_test.go b/x/lockup/keeper/lock_test.go
index 7def8ddf9dc..b5b98485b1a 100644
--- a/x/lockup/keeper/lock_test.go
+++ b/x/lockup/keeper/lock_test.go
@@ -7,10 +7,10 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/migration.go b/x/lockup/keeper/migration.go
index ee69f062cb4..eb75dce07d7 100644
--- a/x/lockup/keeper/migration.go
+++ b/x/lockup/keeper/migration.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/migration_test.go b/x/lockup/keeper/migration_test.go
index 5debe214d06..fd5ed7990b7 100644
--- a/x/lockup/keeper/migration_test.go
+++ b/x/lockup/keeper/migration_test.go
@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/msg_server.go b/x/lockup/keeper/msg_server.go
index 2ee51b2084c..b0d424a4e78 100644
--- a/x/lockup/keeper/msg_server.go
+++ b/x/lockup/keeper/msg_server.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/msg_server_test.go b/x/lockup/keeper/msg_server_test.go
index b22191239d0..87e8133288a 100644
--- a/x/lockup/keeper/msg_server_test.go
+++ b/x/lockup/keeper/msg_server_test.go
@@ -3,9 +3,9 @@ package keeper_test
 import (
 	"time"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/store.go b/x/lockup/keeper/store.go
index 98283331136..510830c851f 100644
--- a/x/lockup/keeper/store.go
+++ b/x/lockup/keeper/store.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go
index 7a7a51fc257..08b40c05b2b 100644
--- a/x/lockup/keeper/synthetic_lock.go
+++ b/x/lockup/keeper/synthetic_lock.go
@@ -8,7 +8,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // A synthetic lock object is a lock obejct used for the superfluid module.
diff --git a/x/lockup/keeper/synthetic_lock_test.go b/x/lockup/keeper/synthetic_lock_test.go
index 7fb02c12b48..608b871e339 100644
--- a/x/lockup/keeper/synthetic_lock_test.go
+++ b/x/lockup/keeper/synthetic_lock_test.go
@@ -3,8 +3,8 @@ package keeper_test
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/utils.go b/x/lockup/keeper/utils.go
index cdf4e241657..ba77de1bcca 100644
--- a/x/lockup/keeper/utils.go
+++ b/x/lockup/keeper/utils.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/keeper/utils_test.go b/x/lockup/keeper/utils_test.go
index b6d2067cb2c..9897f1b48e3 100644
--- a/x/lockup/keeper/utils_test.go
+++ b/x/lockup/keeper/utils_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/module.go b/x/lockup/module.go
index 3d016ff5946..33076e7d53f 100644
--- a/x/lockup/module.go
+++ b/x/lockup/module.go
@@ -28,13 +28,13 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/client/rest"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
 
-	simulation "github.com/osmosis-labs/osmosis/v15/x/lockup/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	simulation "github.com/osmosis-labs/osmosis/v16/x/lockup/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 var (
diff --git a/x/lockup/simulation/operations.go b/x/lockup/simulation/operations.go
index 7ba75bbfcd6..043b808e759 100644
--- a/x/lockup/simulation/operations.go
+++ b/x/lockup/simulation/operations.go
@@ -7,9 +7,9 @@ import (
 	legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/lockup/types/genesis.pb.go b/x/lockup/types/genesis.pb.go
index 7e2f456f00a..0e17db7cd6c 100644
--- a/x/lockup/types/genesis.pb.go
+++ b/x/lockup/types/genesis.pb.go
@@ -106,9 +106,9 @@ var fileDescriptor_648db7c6ebb608b0 = []byte{
 	0x62, 0x64, 0xc1, 0x62, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0,
 	0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88,
 	0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xac, 0x9b,
-	0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xea, 0x57, 0xc0, 0xc2, 0xa2, 0xa4, 0xb2,
-	0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x1a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x3a,
-	0x08, 0x17, 0x6e, 0x01, 0x00, 0x00,
+	0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xe9, 0x57, 0xc0, 0xc2, 0xa2, 0xa4, 0xb2,
+	0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x1a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x93,
+	0x16, 0x4f, 0x6e, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/lockup/types/lock.pb.go b/x/lockup/types/lock.pb.go
index 3942780af20..dd7965493ef 100644
--- a/x/lockup/types/lock.pb.go
+++ b/x/lockup/types/lock.pb.go
@@ -331,44 +331,44 @@ var fileDescriptor_7e9d7527a237b489 = []byte{
 	// 640 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x3f, 0x6f, 0xd4, 0x30,
 	0x1c, 0xbd, 0xdc, 0x9f, 0xd2, 0xba, 0xf4, 0x7a, 0xb2, 0x8a, 0x48, 0x0f, 0x48, 0x4e, 0x19, 0xd0,
-	0x09, 0xb5, 0x09, 0x57, 0xc4, 0xc2, 0x46, 0x7a, 0x0c, 0x95, 0x3a, 0x40, 0xa8, 0x18, 0xba, 0x44,
-	0x49, 0x6c, 0x52, 0xab, 0x49, 0x1c, 0xe2, 0xa4, 0x25, 0xdf, 0x80, 0xb1, 0x23, 0x48, 0x6c, 0x6c,
-	0x7c, 0x0b, 0xb6, 0x8e, 0x1d, 0x99, 0xae, 0xa8, 0xdd, 0x18, 0xfb, 0x09, 0x90, 0xed, 0xe4, 0x7a,
-	0x2d, 0xaa, 0xd4, 0x01, 0xa6, 0x9c, 0xfd, 0x7e, 0xbf, 0xe7, 0x9f, 0xdf, 0x7b, 0x3e, 0xb0, 0x4a,
-	0x59, 0x4c, 0x19, 0x61, 0x56, 0x44, 0x83, 0xfd, 0x22, 0x15, 0x1f, 0x33, 0xcd, 0x68, 0x4e, 0x61,
-	0xb7, 0x82, 0x4c, 0x09, 0xf5, 0x57, 0x42, 0x1a, 0x52, 0x01, 0x59, 0xfc, 0x97, 0xac, 0xea, 0x6b,
-	0x21, 0xa5, 0x61, 0x84, 0x2d, 0xb1, 0xf2, 0x8b, 0xf7, 0x16, 0x2a, 0x32, 0x2f, 0x27, 0x34, 0xa9,
-	0x70, 0xfd, 0x3a, 0x9e, 0x93, 0x18, 0xb3, 0xdc, 0x8b, 0xd3, 0x9a, 0x20, 0x10, 0xe7, 0x58, 0xbe,
-	0xc7, 0xb0, 0x75, 0x30, 0xf2, 0x71, 0xee, 0x8d, 0xac, 0x80, 0x92, 0x8a, 0xc0, 0xf8, 0xd1, 0x02,
-	0xe0, 0x35, 0xce, 0x08, 0x45, 0xdb, 0x34, 0xd8, 0x87, 0x5d, 0xd0, 0xdc, 0x1a, 0xab, 0xca, 0x40,
-	0x19, 0xb6, 0x9d, 0xe6, 0xd6, 0x18, 0x3e, 0x06, 0x1d, 0x7a, 0x98, 0xe0, 0x4c, 0x6d, 0x0e, 0x94,
-	0xe1, 0x82, 0xdd, 0xbb, 0x98, 0xe8, 0x77, 0x4b, 0x2f, 0x8e, 0x5e, 0x18, 0x62, 0xdb, 0x70, 0x24,
-	0x0c, 0xf7, 0xc0, 0x7c, 0x3d, 0x99, 0xda, 0x1a, 0x28, 0xc3, 0xc5, 0x8d, 0x55, 0x53, 0x8e, 0x66,
-	0xd6, 0xa3, 0x99, 0xe3, 0xaa, 0xc0, 0x1e, 0x1d, 0x4f, 0xf4, 0xc6, 0xef, 0x89, 0x0e, 0xeb, 0x96,
-	0x35, 0x1a, 0x93, 0x1c, 0xc7, 0x69, 0x5e, 0x5e, 0x4c, 0xf4, 0x65, 0xc9, 0x5f, 0x63, 0xc6, 0xe7,
-	0x53, 0x5d, 0x71, 0xa6, 0xec, 0xd0, 0x01, 0xf3, 0x38, 0x41, 0x2e, 0xbf, 0xa7, 0xda, 0x16, 0x27,
-	0xf5, 0xff, 0x3a, 0x69, 0xa7, 0x16, 0xc1, 0x7e, 0xc0, 0x8f, 0xba, 0x24, 0xad, 0x3b, 0x8d, 0x23,
-	0x4e, 0x7a, 0x07, 0x27, 0x88, 0x97, 0x42, 0x0f, 0x74, 0xb8, 0x24, 0x4c, 0xed, 0x0c, 0x5a, 0x62,
-	0x74, 0x29, 0x9a, 0xc9, 0x45, 0x33, 0x2b, 0xd1, 0xcc, 0x4d, 0x4a, 0x12, 0xfb, 0x29, 0xe7, 0xfb,
-	0x7e, 0xaa, 0x0f, 0x43, 0x92, 0xef, 0x15, 0xbe, 0x19, 0xd0, 0xd8, 0xaa, 0x14, 0x96, 0x9f, 0x75,
-	0x86, 0xf6, 0xad, 0xbc, 0x4c, 0x31, 0x13, 0x0d, 0xcc, 0x91, 0xcc, 0x70, 0x17, 0xdc, 0xcf, 0xf0,
-	0xa1, 0x97, 0x21, 0x37, 0xc3, 0x01, 0x26, 0x07, 0x38, 0x73, 0x3d, 0x84, 0x32, 0xcc, 0x98, 0x3a,
-	0x27, 0xa4, 0x35, 0x2e, 0x26, 0xba, 0x26, 0xa7, 0xbc, 0xa1, 0xd0, 0x70, 0xee, 0x49, 0xc4, 0xa9,
-	0x80, 0x97, 0xd5, 0xfe, 0x97, 0x26, 0xe8, 0xbe, 0x29, 0x70, 0x56, 0x6e, 0xd2, 0x04, 0x11, 0xa1,
-	0xd2, 0x2b, 0xb0, 0xcc, 0x73, 0xe5, 0x7e, 0xe0, 0xdb, 0x2e, 0x9f, 0x47, 0x98, 0xda, 0xdd, 0x78,
-	0x64, 0x5e, 0xcd, 0x9d, 0xc9, 0x6d, 0x17, 0xcd, 0x3b, 0x65, 0x8a, 0x9d, 0xa5, 0x68, 0x76, 0x09,
-	0x57, 0x40, 0x07, 0xe1, 0x84, 0xc6, 0xd2, 0x7e, 0x47, 0x2e, 0xb8, 0x05, 0xb7, 0x37, 0xfb, 0x9a,
-	0x03, 0x37, 0xd9, 0xfa, 0x0e, 0x2c, 0x4c, 0xa3, 0x7b, 0x0b, 0x5f, 0x1f, 0x56, 0xac, 0x3d, 0xc9,
-	0x3a, 0x6d, 0x95, 0xc6, 0x5e, 0x52, 0x19, 0x5f, 0x9b, 0x60, 0xe9, 0x6d, 0x99, 0xe4, 0x7b, 0x38,
-	0x27, 0x81, 0x88, 0xf8, 0x1a, 0x80, 0x45, 0x82, 0x70, 0x16, 0x95, 0x24, 0x09, 0x5d, 0xa1, 0x12,
-	0x41, 0x55, 0xe4, 0x7b, 0x97, 0x08, 0xaf, 0xdd, 0x42, 0x50, 0x07, 0x8b, 0x8c, 0xb7, 0xbb, 0xb3,
-	0x3a, 0x00, 0xb1, 0x35, 0xae, 0xc5, 0x98, 0xe6, 0xb1, 0xf5, 0x8f, 0xf2, 0x38, 0xfb, 0x9a, 0xda,
-	0xff, 0xf3, 0x35, 0x3d, 0x19, 0x81, 0xa5, 0x2b, 0x01, 0x80, 0x5d, 0x00, 0xec, 0xb2, 0xe6, 0xee,
-	0x35, 0x20, 0x00, 0x73, 0x76, 0xc9, 0x87, 0xea, 0x29, 0xfd, 0xf6, 0xa7, 0x6f, 0x5a, 0xc3, 0xde,
-	0x3e, 0x3e, 0xd3, 0x94, 0x93, 0x33, 0x4d, 0xf9, 0x75, 0xa6, 0x29, 0x47, 0xe7, 0x5a, 0xe3, 0xe4,
-	0x5c, 0x6b, 0xfc, 0x3c, 0xd7, 0x1a, 0xbb, 0x1b, 0x33, 0x8f, 0xa2, 0x4a, 0xd9, 0x7a, 0xe4, 0xf9,
-	0xac, 0x5e, 0x58, 0x07, 0xa3, 0xe7, 0xd6, 0xc7, 0xfa, 0xbf, 0x50, 0x3c, 0x12, 0x7f, 0x4e, 0x5c,
-	0xe8, 0xd9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0x6e, 0xd4, 0xf2, 0x2a, 0x05, 0x00, 0x00,
+	0x09, 0xb5, 0x09, 0x57, 0x24, 0x06, 0x36, 0xd2, 0x63, 0xa8, 0xd4, 0x01, 0x42, 0xc5, 0xd0, 0x25,
+	0x4a, 0x62, 0x93, 0x5a, 0x4d, 0xe2, 0x10, 0x27, 0x2d, 0xf9, 0x06, 0x8c, 0x1d, 0x41, 0x62, 0x63,
+	0xe3, 0x5b, 0xb0, 0x75, 0xec, 0xc8, 0x74, 0x45, 0xed, 0xc6, 0xd8, 0x4f, 0x80, 0x6c, 0x27, 0xd7,
+	0x6b, 0x51, 0xa5, 0x0e, 0x30, 0xe5, 0xec, 0xf7, 0xfb, 0x3d, 0xff, 0xfc, 0xde, 0xf3, 0x81, 0x55,
+	0xca, 0x62, 0xca, 0x08, 0xb3, 0x22, 0x1a, 0xec, 0x17, 0xa9, 0xf8, 0x98, 0x69, 0x46, 0x73, 0x0a,
+	0xbb, 0x15, 0x64, 0x4a, 0xa8, 0xbf, 0x12, 0xd2, 0x90, 0x0a, 0xc8, 0xe2, 0xbf, 0x64, 0x55, 0x5f,
+	0x0b, 0x29, 0x0d, 0x23, 0x6c, 0x89, 0x95, 0x5f, 0xbc, 0xb7, 0x50, 0x91, 0x79, 0x39, 0xa1, 0x49,
+	0x85, 0xeb, 0xd7, 0xf1, 0x9c, 0xc4, 0x98, 0xe5, 0x5e, 0x9c, 0xd6, 0x04, 0x81, 0x38, 0xc7, 0xf2,
+	0x3d, 0x86, 0xad, 0x83, 0x91, 0x8f, 0x73, 0x6f, 0x64, 0x05, 0x94, 0x54, 0x04, 0xc6, 0x8f, 0x16,
+	0x00, 0xaf, 0x71, 0x46, 0x28, 0xda, 0xa6, 0xc1, 0x3e, 0xec, 0x82, 0xe6, 0xd6, 0x58, 0x55, 0x06,
+	0xca, 0xb0, 0xed, 0x34, 0xb7, 0xc6, 0xf0, 0x31, 0xe8, 0xd0, 0xc3, 0x04, 0x67, 0x6a, 0x73, 0xa0,
+	0x0c, 0x17, 0xec, 0xde, 0xc5, 0x44, 0xbf, 0x5b, 0x7a, 0x71, 0xf4, 0xc2, 0x10, 0xdb, 0x86, 0x23,
+	0x61, 0xb8, 0x07, 0xe6, 0xeb, 0xc9, 0xd4, 0xd6, 0x40, 0x19, 0x2e, 0x6e, 0xac, 0x9a, 0x72, 0x34,
+	0xb3, 0x1e, 0xcd, 0x1c, 0x57, 0x05, 0xf6, 0xe8, 0x78, 0xa2, 0x37, 0x7e, 0x4f, 0x74, 0x58, 0xb7,
+	0xac, 0xd1, 0x98, 0xe4, 0x38, 0x4e, 0xf3, 0xf2, 0x62, 0xa2, 0x2f, 0x4b, 0xfe, 0x1a, 0x33, 0x3e,
+	0x9f, 0xea, 0x8a, 0x33, 0x65, 0x87, 0x0e, 0x98, 0xc7, 0x09, 0x72, 0xf9, 0x3d, 0xd5, 0xb6, 0x38,
+	0xa9, 0xff, 0xd7, 0x49, 0x3b, 0xb5, 0x08, 0xf6, 0x03, 0x7e, 0xd4, 0x25, 0x69, 0xdd, 0x69, 0x1c,
+	0x71, 0xd2, 0x3b, 0x38, 0x41, 0xbc, 0x14, 0x7a, 0xa0, 0xc3, 0x25, 0x61, 0x6a, 0x67, 0xd0, 0x12,
+	0xa3, 0x4b, 0xd1, 0x4c, 0x2e, 0x9a, 0x59, 0x89, 0x66, 0x6e, 0x52, 0x92, 0xd8, 0x4f, 0x39, 0xdf,
+	0xf7, 0x53, 0x7d, 0x18, 0x92, 0x7c, 0xaf, 0xf0, 0xcd, 0x80, 0xc6, 0x56, 0xa5, 0xb0, 0xfc, 0xac,
+	0x33, 0xb4, 0x6f, 0xe5, 0x65, 0x8a, 0x99, 0x68, 0x60, 0x8e, 0x64, 0x86, 0xbb, 0xe0, 0x7e, 0x86,
+	0x0f, 0xbd, 0x0c, 0xb9, 0x19, 0x0e, 0x30, 0x39, 0xc0, 0x99, 0xeb, 0x21, 0x94, 0x61, 0xc6, 0xd4,
+	0x39, 0x21, 0xad, 0x71, 0x31, 0xd1, 0x35, 0x39, 0xe5, 0x0d, 0x85, 0x86, 0x73, 0x4f, 0x22, 0x4e,
+	0x05, 0xbc, 0xac, 0xf6, 0xbf, 0x34, 0x41, 0xf7, 0x4d, 0x81, 0xb3, 0x72, 0x93, 0x26, 0x88, 0x08,
+	0x95, 0x5e, 0x81, 0x65, 0x9e, 0x2b, 0xf7, 0x03, 0xdf, 0x76, 0xf9, 0x3c, 0xc2, 0xd4, 0xee, 0xc6,
+	0x23, 0xf3, 0x6a, 0xee, 0x4c, 0x6e, 0xbb, 0x68, 0xde, 0x29, 0x53, 0xec, 0x2c, 0x45, 0xb3, 0x4b,
+	0xb8, 0x02, 0x3a, 0x08, 0x27, 0x34, 0x96, 0xf6, 0x3b, 0x72, 0xc1, 0x2d, 0xb8, 0xbd, 0xd9, 0xd7,
+	0x1c, 0xb8, 0xc9, 0xd6, 0x77, 0x60, 0x61, 0x1a, 0xdd, 0x5b, 0xf8, 0xfa, 0xb0, 0x62, 0xed, 0x49,
+	0xd6, 0x69, 0xab, 0x34, 0xf6, 0x92, 0xca, 0xf8, 0xda, 0x04, 0x4b, 0x6f, 0xcb, 0x24, 0xdf, 0xc3,
+	0x39, 0x09, 0x44, 0xc4, 0xd7, 0x00, 0x2c, 0x12, 0x84, 0xb3, 0xa8, 0x24, 0x49, 0xe8, 0x0a, 0x95,
+	0x08, 0xaa, 0x22, 0xdf, 0xbb, 0x44, 0x78, 0xed, 0x16, 0x82, 0x3a, 0x58, 0x64, 0xbc, 0xdd, 0x9d,
+	0xd5, 0x01, 0x88, 0xad, 0x71, 0x2d, 0xc6, 0x34, 0x8f, 0xad, 0x7f, 0x94, 0xc7, 0xd9, 0xd7, 0xd4,
+	0xfe, 0x9f, 0xaf, 0xe9, 0xc9, 0x08, 0x2c, 0x5d, 0x09, 0x00, 0xec, 0x02, 0x60, 0x97, 0x35, 0x77,
+	0xaf, 0x01, 0x01, 0x98, 0xb3, 0x4b, 0x3e, 0x54, 0x4f, 0xe9, 0xb7, 0x3f, 0x7d, 0xd3, 0x1a, 0xf6,
+	0xf6, 0xf1, 0x99, 0xa6, 0x9c, 0x9c, 0x69, 0xca, 0xaf, 0x33, 0x4d, 0x39, 0x3a, 0xd7, 0x1a, 0x27,
+	0xe7, 0x5a, 0xe3, 0xe7, 0xb9, 0xd6, 0xd8, 0xdd, 0x98, 0x79, 0x14, 0x55, 0xca, 0xd6, 0x23, 0xcf,
+	0x67, 0xf5, 0xc2, 0x3a, 0x18, 0x3d, 0xb7, 0x3e, 0xd6, 0xff, 0x85, 0xe2, 0x91, 0xf8, 0x73, 0xe2,
+	0x42, 0xcf, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xc7, 0xca, 0xaa, 0x2a, 0x05, 0x00, 0x00,
 }
 
 func (m *PeriodLock) Marshal() (dAtA []byte, err error) {
diff --git a/x/lockup/types/msgs_test.go b/x/lockup/types/msgs_test.go
index 88801ca19f4..b20b9169093 100644
--- a/x/lockup/types/msgs_test.go
+++ b/x/lockup/types/msgs_test.go
@@ -8,12 +8,12 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
 )
 
 func TestMsgLockTokens(t *testing.T) {
diff --git a/x/lockup/types/params.pb.go b/x/lockup/types/params.pb.go
index 9ea6d58f527..3d94c2ff3d6 100644
--- a/x/lockup/types/params.pb.go
+++ b/x/lockup/types/params.pb.go
@@ -86,9 +86,9 @@ var fileDescriptor_4595e58f5e17053c = []byte{
 	0x49, 0x47, 0x98, 0x59, 0x4e, 0x3e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0,
 	0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10,
 	0x65, 0x94, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xf5, 0x82, 0x6e,
-	0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x68, 0xaa, 0x5f, 0x01, 0xf3, 0x72, 0x49, 0x65,
-	0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x33, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xdb,
-	0x33, 0x59, 0x11, 0x01, 0x00, 0x00,
+	0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x68, 0xa6, 0x5f, 0x01, 0xf3, 0x72, 0x49, 0x65,
+	0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x33, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x24, 0x72,
+	0x2d, 0x01, 0x11, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/lockup/types/query.pb.go b/x/lockup/types/query.pb.go
index d1cf3711de1..a0b5207460c 100644
--- a/x/lockup/types/query.pb.go
+++ b/x/lockup/types/query.pb.go
@@ -1912,112 +1912,112 @@ func init() {
 func init() { proto.RegisterFile("osmosis/lockup/query.proto", fileDescriptor_e906fda01cffd91a) }
 
 var fileDescriptor_e906fda01cffd91a = []byte{
-	// 1676 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0x14, 0x47,
-	0x1a, 0x77, 0x19, 0xec, 0x5d, 0x3e, 0xd6, 0x86, 0x2d, 0x0c, 0x6b, 0xb7, 0xcd, 0x8c, 0x29, 0xc0,
-	0x78, 0x77, 0xed, 0x6e, 0x6c, 0xbc, 0x86, 0x65, 0x79, 0x0e, 0x86, 0x95, 0x89, 0x43, 0x60, 0x20,
-	0x41, 0x79, 0x69, 0xd4, 0x33, 0x53, 0x0c, 0x2d, 0x66, 0xba, 0x87, 0xe9, 0x1e, 0xc3, 0x04, 0x11,
-	0x14, 0xc8, 0x21, 0x87, 0x1c, 0x88, 0x72, 0x89, 0x72, 0x88, 0x92, 0xdc, 0x92, 0x48, 0x51, 0x2e,
-	0x39, 0xa0, 0xdc, 0x13, 0x94, 0x43, 0x84, 0x94, 0x4b, 0x94, 0x83, 0x89, 0x70, 0xfe, 0x02, 0x4e,
-	0x91, 0x72, 0x89, 0xba, 0xaa, 0xba, 0x3d, 0xfd, 0x9c, 0x1e, 0x4f, 0xb0, 0x7c, 0xb2, 0xa7, 0xbf,
-	0xd7, 0xef, 0xf7, 0xd5, 0xf3, 0x57, 0x20, 0x19, 0x66, 0xc5, 0x30, 0x35, 0x53, 0x29, 0x1b, 0x85,
-	0x6b, 0xf5, 0xaa, 0x72, 0xbd, 0x4e, 0x6b, 0x0d, 0xb9, 0x5a, 0x33, 0x2c, 0x03, 0xf7, 0x0b, 0x9b,
-	0xcc, 0x6d, 0xd2, 0x40, 0xc9, 0x28, 0x19, 0xcc, 0xa4, 0xd8, 0xff, 0x71, 0x2f, 0x29, 0x55, 0x60,
-	0x6e, 0x4a, 0x5e, 0x35, 0xa9, 0xb2, 0x38, 0x95, 0xa7, 0x96, 0x3a, 0xa5, 0x14, 0x0c, 0x4d, 0x17,
-	0xf6, 0x91, 0x92, 0x61, 0x94, 0xca, 0x54, 0x51, 0xab, 0x9a, 0xa2, 0xea, 0xba, 0x61, 0xa9, 0x96,
-	0x66, 0xe8, 0xa6, 0xb0, 0xa6, 0x85, 0x95, 0xfd, 0xca, 0xd7, 0xaf, 0x28, 0x96, 0x56, 0xa1, 0xa6,
-	0xa5, 0x56, 0xaa, 0x4e, 0x7a, 0xbf, 0x43, 0xb1, 0x5e, 0x63, 0x19, 0x84, 0x7d, 0xc8, 0x47, 0xc0,
-	0xfe, 0x23, 0x4c, 0xc3, 0x3e, 0x53, 0x55, 0xad, 0xa9, 0x15, 0x51, 0x98, 0xec, 0x80, 0x81, 0xe7,
-	0x8d, 0x62, 0xbd, 0x4c, 0x33, 0x6a, 0x59, 0xd5, 0x0b, 0x34, 0x4b, 0xaf, 0xd7, 0xa9, 0x69, 0x91,
-	0x37, 0x60, 0xbb, 0xef, 0xbb, 0x59, 0x35, 0x74, 0x93, 0x62, 0x15, 0x7a, 0x6c, 0x56, 0xe6, 0x20,
-	0x1a, 0xdd, 0x30, 0xbe, 0x79, 0x7a, 0x48, 0xe6, 0xbc, 0x65, 0x9b, 0xb7, 0x2c, 0x78, 0xcb, 0xa7,
-	0x0c, 0x4d, 0xcf, 0xec, 0x7f, 0xb8, 0x94, 0xee, 0xfa, 0xfc, 0x71, 0x7a, 0xbc, 0xa4, 0x59, 0x57,
-	0xeb, 0x79, 0xb9, 0x60, 0x54, 0x14, 0xd1, 0x24, 0xfe, 0x67, 0xd2, 0x2c, 0x5e, 0x53, 0xac, 0x46,
-	0x95, 0x9a, 0x2c, 0xc0, 0xcc, 0xf2, 0xcc, 0x64, 0x18, 0x86, 0x78, 0xed, 0x05, 0xa3, 0x70, 0x8d,
-	0x16, 0x4f, 0x56, 0x8c, 0xba, 0x6e, 0x39, 0xc0, 0xee, 0x80, 0x14, 0x66, 0x5c, 0x3b, 0x74, 0xff,
-	0x87, 0x9d, 0x27, 0x0b, 0x05, 0xbb, 0xea, 0x8b, 0xba, 0xdd, 0x51, 0x35, 0x5f, 0xa6, 0xdc, 0x81,
-	0x23, 0xc4, 0x63, 0xd0, 0x63, 0xdc, 0xd0, 0x69, 0x6d, 0x10, 0x8d, 0xa2, 0xf1, 0x4d, 0x99, 0xad,
-	0x4f, 0x97, 0xd2, 0x7f, 0x6b, 0xa8, 0x95, 0xf2, 0x61, 0xc2, 0x3e, 0x93, 0x2c, 0x37, 0x93, 0x7b,
-	0x08, 0x52, 0x51, 0x99, 0xd6, 0x8e, 0xce, 0x19, 0x18, 0xf1, 0x80, 0xd0, 0xf4, 0xd2, 0xaa, 0xd8,
-	0xdc, 0x45, 0xbe, 0xbe, 0xac, 0x24, 0x5a, 0x3b, 0x32, 0xa7, 0x60, 0x48, 0x60, 0xe0, 0xb3, 0x63,
-	0x55, 0x4c, 0xee, 0x80, 0x14, 0x96, 0x64, 0xed, 0x58, 0x7c, 0x84, 0xdc, 0x31, 0xe1, 0x08, 0xce,
-	0xab, 0xa6, 0x75, 0x49, 0xab, 0xd0, 0x36, 0x99, 0xe0, 0x97, 0x60, 0x93, 0xbb, 0x8f, 0x0c, 0x76,
-	0x8f, 0xa2, 0xf1, 0xcd, 0xd3, 0x92, 0xcc, 0x37, 0x12, 0xd9, 0xd9, 0x48, 0xe4, 0x4b, 0x8e, 0x47,
-	0x66, 0xc4, 0x06, 0xfc, 0x74, 0x29, 0xbd, 0x95, 0xe7, 0x72, 0x43, 0xc9, 0xfd, 0xc7, 0x69, 0x94,
-	0x5d, 0x49, 0x45, 0x2e, 0xbb, 0x43, 0xed, 0xc7, 0x27, 0x9a, 0x34, 0x0b, 0x3d, 0xf6, 0x14, 0x70,
-	0x9a, 0x24, 0xc9, 0xde, 0x2d, 0x54, 0x3e, 0x4f, 0x6b, 0x9a, 0x51, 0xb4, 0x83, 0x33, 0x1b, 0xed,
-	0xa2, 0x59, 0xee, 0x4e, 0xbe, 0x44, 0x30, 0x11, 0x9a, 0xf9, 0x9c, 0xb1, 0x32, 0xab, 0x5e, 0xd0,
-	0xcb, 0x8d, 0xf5, 0xd2, 0x89, 0x12, 0x4c, 0x26, 0xc4, 0xdb, 0x61, 0x67, 0x3e, 0x45, 0x30, 0xea,
-	0x59, 0x5e, 0xb4, 0x98, 0xa1, 0x57, 0x8c, 0x1a, 0x5d, 0x4f, 0xf3, 0xe2, 0x55, 0xd8, 0x15, 0x83,
-	0xb1, 0xc3, 0x0e, 0x3c, 0x40, 0x6e, 0x76, 0x6f, 0xaf, 0xe7, 0xa8, 0x6e, 0x54, 0xd6, 0x49, 0x0b,
-	0xf0, 0x00, 0xf4, 0x14, 0x6d, 0x3c, 0x83, 0x1b, 0xec, 0xfa, 0x59, 0xfe, 0x83, 0xbc, 0x06, 0x24,
-	0x0e, 0x7a, 0x87, 0x9d, 0x79, 0x13, 0x30, 0x4f, 0xeb, 0xe9, 0x84, 0x8b, 0x04, 0x35, 0x21, 0xc1,
-	0x59, 0xf8, 0xab, 0x73, 0x73, 0x10, 0xb4, 0x87, 0x02, 0xb4, 0xe7, 0x84, 0x43, 0x66, 0x58, 0xb0,
-	0xde, 0xc2, 0x59, 0x3b, 0x81, 0xe4, 0x03, 0x9b, 0xb4, 0x9b, 0x87, 0xe8, 0xb0, 0xcd, 0x53, 0x5f,
-	0xd0, 0xb9, 0x0c, 0xbd, 0x2a, 0x3b, 0x9d, 0xc5, 0x58, 0x1c, 0xb7, 0xb3, 0xfd, 0xbc, 0x94, 0x1e,
-	0x4b, 0xb0, 0x1f, 0xce, 0xeb, 0xd6, 0xd3, 0xa5, 0x74, 0x1f, 0xaf, 0xcb, 0xb3, 0x90, 0xac, 0x48,
-	0x47, 0xc6, 0xa1, 0x8f, 0xd7, 0x73, 0xa8, 0xfe, 0x03, 0xfe, 0x62, 0x77, 0x22, 0xa7, 0x15, 0x59,
-	0xa9, 0x8d, 0xd9, 0x5e, 0xfb, 0xe7, 0x7c, 0x91, 0x9c, 0x80, 0x7e, 0xc7, 0x53, 0x80, 0x92, 0x61,
-	0xa3, 0x6d, 0x63, 0x7e, 0xb1, 0x2d, 0xce, 0x32, 0x3f, 0x32, 0x03, 0x43, 0xec, 0x17, 0xbd, 0xa1,
-	0xd6, 0x8a, 0x59, 0x5a, 0xa0, 0xda, 0x22, 0xad, 0xb5, 0xac, 0x7b, 0x1a, 0xa4, 0xb0, 0x28, 0x81,
-	0x61, 0x1f, 0x6c, 0xa9, 0x31, 0x4b, 0xae, 0x26, 0x4c, 0x62, 0x8c, 0xfa, 0x6b, 0x9e, 0x00, 0xb2,
-	0x0d, 0xfe, 0x7e, 0x8e, 0xde, 0x64, 0x73, 0x66, 0x7e, 0xce, 0xb9, 0x00, 0x4d, 0x02, 0x6e, 0xfe,
-	0x28, 0x72, 0xc6, 0xb4, 0x60, 0xd7, 0xc5, 0x86, 0x6e, 0x5d, 0xa5, 0x96, 0x56, 0x58, 0x60, 0x24,
-	0xcd, 0x4c, 0x83, 0xff, 0xe3, 0xe6, 0x8c, 0x8c, 0x3e, 0xdc, 0x3d, 0x88, 0xc8, 0x22, 0x90, 0xb8,
-	0x0c, 0x02, 0xc0, 0x02, 0x6c, 0x31, 0x1d, 0xaf, 0x5c, 0xf3, 0x34, 0xde, 0xe9, 0xef, 0xb1, 0x27,
-	0x99, 0x98, 0xc9, 0xfd, 0x66, 0xf3, 0x47, 0x93, 0xd5, 0xfd, 0x1f, 0x8c, 0xfa, 0xea, 0x26, 0x07,
-	0x4e, 0x8c, 0x00, 0xed, 0x10, 0xcc, 0x67, 0xa1, 0xdf, 0x8b, 0x59, 0x4c, 0x8b, 0x44, 0x90, 0xfb,
-	0x3c, 0x90, 0xc9, 0xc7, 0xc8, 0xb7, 0xc6, 0x17, 0x0c, 0xbd, 0x44, 0x6b, 0xce, 0x5a, 0x6a, 0x77,
-	0x7f, 0x7a, 0x16, 0xeb, 0xf4, 0x75, 0xd8, 0x1d, 0x8b, 0xb0, 0xc3, 0x6d, 0xe8, 0x43, 0xff, 0xb5,
-	0x65, 0x3d, 0x71, 0xf7, 0x5f, 0x59, 0xfe, 0x34, 0xd6, 0x5f, 0x21, 0x98, 0x8e, 0xe9, 0x6a, 0xa7,
-	0x17, 0x97, 0x67, 0xd1, 0x8b, 0x0a, 0x1c, 0x68, 0x0b, 0x71, 0x87, 0x1d, 0xfa, 0x06, 0xc1, 0xbe,
-	0x98, 0x7a, 0xab, 0x3a, 0xbe, 0x9f, 0x41, 0x5b, 0x22, 0x8e, 0xee, 0x3c, 0x8c, 0xb7, 0x06, 0xdf,
-	0x61, 0x87, 0x06, 0x00, 0x5f, 0xa8, 0xd3, 0x5a, 0xe3, 0x3c, 0x53, 0xe6, 0xce, 0x46, 0xff, 0x1c,
-	0x6c, 0xf3, 0x7c, 0x15, 0x45, 0x66, 0xa0, 0x97, 0x2b, 0x78, 0xb1, 0x59, 0xed, 0x08, 0x54, 0x61,
-	0x56, 0x51, 0x41, 0xf8, 0x4e, 0xff, 0x3e, 0x02, 0x3d, 0x2c, 0x1b, 0x7e, 0x17, 0x41, 0x9f, 0x47,
-	0xda, 0xe3, 0x3d, 0xfe, 0x0c, 0x61, 0x2f, 0x02, 0xd2, 0xde, 0x16, 0x5e, 0x1c, 0x1e, 0x91, 0xef,
-	0xfe, 0xf8, 0xeb, 0xfb, 0xdd, 0xe3, 0x78, 0x4c, 0xf1, 0x3d, 0x3b, 0x38, 0x6f, 0x22, 0x15, 0x16,
-	0x96, 0xcb, 0x8b, 0xe2, 0x9f, 0x20, 0xc0, 0x41, 0x41, 0x8f, 0xff, 0x19, 0x5e, 0x2d, 0xe4, 0x45,
-	0x40, 0xfa, 0x57, 0x12, 0x57, 0x81, 0x6e, 0x86, 0xa1, 0x93, 0xf1, 0x44, 0x0b, 0x74, 0xfc, 0xf6,
-	0x9a, 0xe3, 0x17, 0x0e, 0xfc, 0x00, 0xc1, 0x8e, 0x70, 0xa5, 0x8e, 0x27, 0xfd, 0xc5, 0x63, 0xdf,
-	0x06, 0x24, 0x39, 0xa9, 0xbb, 0xc0, 0x7b, 0x82, 0xe1, 0x3d, 0x8c, 0x0f, 0x45, 0xe1, 0x55, 0x79,
-	0x7c, 0xae, 0xee, 0x26, 0xc8, 0x31, 0x11, 0xa9, 0xdc, 0x62, 0x0b, 0xe5, 0x36, 0xfe, 0x1a, 0xc1,
-	0xf6, 0x50, 0x5d, 0x8e, 0x27, 0x62, 0xb1, 0xf8, 0xde, 0x01, 0xa4, 0xc9, 0x84, 0xde, 0x02, 0xf8,
-	0x71, 0x06, 0xfc, 0xbf, 0xf8, 0x60, 0x32, 0xe0, 0x9a, 0x5e, 0xf2, 0xe1, 0xfe, 0x0c, 0x01, 0x0e,
-	0xca, 0xf0, 0xe0, 0xbc, 0x88, 0xd4, 0xfb, 0xc1, 0x79, 0x11, 0xad, 0xea, 0xc9, 0x11, 0x06, 0x77,
-	0x16, 0xcf, 0xb4, 0x82, 0x2b, 0x26, 0x46, 0x64, 0x8f, 0xbd, 0xf7, 0xfb, 0xc8, 0x1e, 0x87, 0xea,
-	0xfa, 0xc8, 0x1e, 0x87, 0xab, 0xec, 0xe4, 0x3d, 0x16, 0xa0, 0xab, 0xaa, 0x69, 0xd9, 0x4a, 0xc5,
-	0xc5, 0xfd, 0x1b, 0x82, 0xbd, 0x89, 0xe4, 0x2b, 0x3e, 0x92, 0x08, 0x59, 0xc4, 0x61, 0x27, 0x1d,
-	0x5d, 0x65, 0xb4, 0xe0, 0x99, 0x65, 0x3c, 0x17, 0xf0, 0xd9, 0x36, 0x79, 0xe6, 0x74, 0xa3, 0x79,
-	0x7e, 0x19, 0x7a, 0xb9, 0xe1, 0x52, 0xff, 0x16, 0xb9, 0x4f, 0x45, 0x41, 0xad, 0x8a, 0xf7, 0xc7,
-	0x4e, 0xf6, 0x10, 0xe9, 0x2d, 0x4d, 0xb5, 0x11, 0x21, 0x68, 0xcd, 0x31, 0x5a, 0xc7, 0xf0, 0x91,
-	0x64, 0x4b, 0x84, 0x16, 0x73, 0x79, 0x96, 0x24, 0xe7, 0x19, 0xc3, 0xef, 0x91, 0xef, 0xb9, 0xca,
-	0xa3, 0x2d, 0xf1, 0x54, 0xa2, 0xd6, 0x37, 0x9f, 0xc1, 0xd2, 0x74, 0x3b, 0x21, 0x82, 0xcb, 0x69,
-	0xc6, 0xe5, 0x38, 0x3e, 0xda, 0xee, 0x10, 0xb1, 0x43, 0xd6, 0x25, 0xf3, 0x36, 0x82, 0xcd, 0x4d,
-	0x52, 0x12, 0x13, 0x3f, 0x94, 0xa0, 0xce, 0x95, 0x76, 0xc7, 0xfa, 0x08, 0x7c, 0x13, 0x0c, 0xdf,
-	0x18, 0xde, 0x13, 0x85, 0x4f, 0xe0, 0xe2, 0x22, 0xf9, 0x1e, 0x02, 0xe0, 0x59, 0x32, 0x8d, 0xf9,
-	0x39, 0xbc, 0x33, 0xbc, 0x82, 0x03, 0x20, 0x15, 0x65, 0x16, 0xb5, 0x67, 0x59, 0xed, 0xfd, 0x58,
-	0x6e, 0x51, 0x3b, 0xdf, 0xc8, 0x69, 0x45, 0xe5, 0x96, 0xd0, 0x33, 0xb7, 0xf1, 0x17, 0x88, 0xeb,
-	0x7a, 0xaf, 0x8a, 0x0c, 0xee, 0x80, 0x91, 0xfa, 0x34, 0xb8, 0x03, 0x46, 0x8b, 0x52, 0x72, 0x8c,
-	0xa1, 0x3c, 0x84, 0x67, 0xe3, 0x50, 0xe6, 0x7c, 0xba, 0xb5, 0x09, 0xed, 0x5b, 0x08, 0x60, 0x45,
-	0x97, 0xe2, 0x5d, 0xfe, 0xd2, 0x01, 0x21, 0x2b, 0x91, 0x38, 0x97, 0xa4, 0xe3, 0xa6, 0xd3, 0x9b,
-	0x7c, 0x52, 0xe5, 0xb4, 0x22, 0xfe, 0x01, 0x81, 0x14, 0x2d, 0x55, 0x83, 0x6b, 0xa1, 0xa5, 0x30,
-	0x0e, 0xae, 0x85, 0xd6, 0x4a, 0x98, 0xcc, 0x33, 0xcc, 0x27, 0xf0, 0xb1, 0x28, 0xcc, 0x5e, 0xcd,
-	0x59, 0xaf, 0x9a, 0xf6, 0xd0, 0x0b, 0x0e, 0x2b, 0x1d, 0x7d, 0xa7, 0x1b, 0xe1, 0xef, 0x10, 0x0c,
-	0x45, 0xca, 0xd8, 0xe0, 0x2e, 0xd5, 0x4a, 0x2e, 0x4b, 0x53, 0x6d, 0x44, 0x24, 0x5d, 0xd9, 0x7e,
-	0x36, 0xa1, 0x64, 0xec, 0xa1, 0x19, 0x8e, 0xb9, 0x47, 0xe3, 0xf8, 0x4d, 0x27, 0x54, 0x4b, 0x4b,
-	0x07, 0xda, 0x8a, 0x11, 0x7c, 0xce, 0xb4, 0x1a, 0x1d, 0xdf, 0x4e, 0x55, 0x66, 0x69, 0x72, 0x8e,
-	0x4a, 0x88, 0x3e, 0xf3, 0x5d, 0x2a, 0xf1, 0x67, 0xbe, 0x9f, 0xc4, 0x64, 0x42, 0xef, 0x55, 0x9e,
-	0xf9, 0x01, 0xdc, 0xef, 0x75, 0xc3, 0xbf, 0xdb, 0x50, 0x7f, 0x38, 0xd3, 0x46, 0x93, 0xa3, 0xce,
-	0xff, 0x53, 0x1d, 0xe5, 0x10, 0xcc, 0x5f, 0x66, 0xcc, 0x2f, 0xe2, 0x0b, 0xab, 0x1b, 0xb8, 0xb8,
-	0xcb, 0xc0, 0xf2, 0xca, 0xe3, 0x7a, 0xa4, 0xc8, 0xc3, 0x07, 0xdb, 0x20, 0xe1, 0x39, 0xa0, 0x0e,
-	0xb5, 0x1f, 0x28, 0x28, 0x2f, 0x30, 0xca, 0x67, 0xf0, 0xdc, 0x2a, 0x29, 0x7b, 0x0f, 0xd7, 0x06,
-	0xf4, 0x72, 0x69, 0x18, 0x3c, 0x56, 0x83, 0xea, 0x33, 0x78, 0xac, 0x86, 0x68, 0x51, 0x32, 0xc6,
-	0x00, 0x8e, 0xe2, 0x54, 0x14, 0x40, 0xae, 0x3e, 0x33, 0x0b, 0x0f, 0x9f, 0xa4, 0xd0, 0xa3, 0x27,
-	0x29, 0xf4, 0xcb, 0x93, 0x14, 0xba, 0xbf, 0x9c, 0xea, 0x7a, 0xb4, 0x9c, 0xea, 0xfa, 0x69, 0x39,
-	0xd5, 0xf5, 0xca, 0x74, 0xd3, 0x63, 0xb0, 0xc8, 0x31, 0x59, 0x56, 0xf3, 0xa6, 0x9b, 0x70, 0x71,
-	0xea, 0x3f, 0xca, 0x4d, 0x27, 0x2d, 0x7b, 0x1c, 0xce, 0xf7, 0x32, 0x89, 0x7f, 0xe0, 0x8f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xa2, 0xf7, 0x38, 0x3b, 0xb5, 0x1f, 0x00, 0x00,
+	// 1675 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0x13, 0xd7,
+	0x1a, 0xcf, 0x09, 0x24, 0xf7, 0xf2, 0x71, 0x13, 0xb8, 0x87, 0xc0, 0x4d, 0x26, 0xc1, 0x0e, 0x07,
+	0x08, 0xb9, 0xf7, 0x26, 0x33, 0x24, 0x44, 0x81, 0xcb, 0xe5, 0x69, 0x02, 0x55, 0x68, 0x4a, 0xc1,
+	0xd0, 0xa2, 0xbe, 0x64, 0x8d, 0xed, 0x83, 0x19, 0x61, 0xcf, 0x18, 0xcf, 0x38, 0xe0, 0x22, 0x8a,
+	0x0a, 0x5d, 0x74, 0xd1, 0x05, 0x55, 0x37, 0x55, 0x17, 0x55, 0xdb, 0x5d, 0x5b, 0xa9, 0xea, 0xa6,
+	0x0b, 0xd4, 0x7d, 0x8b, 0xba, 0xa8, 0x90, 0xba, 0xa9, 0xba, 0x08, 0x15, 0xe9, 0x5f, 0xc0, 0xaa,
+	0x52, 0x37, 0xd5, 0x9c, 0x73, 0x66, 0xe2, 0x79, 0x7a, 0x1c, 0x97, 0x28, 0xab, 0xc4, 0xf3, 0xbd,
+	0x7e, 0xbf, 0xef, 0x3c, 0x7f, 0x07, 0x24, 0xc3, 0xac, 0x18, 0xa6, 0x66, 0x2a, 0x65, 0xa3, 0x70,
+	0xad, 0x5e, 0x55, 0xae, 0xd7, 0x69, 0xad, 0x21, 0x57, 0x6b, 0x86, 0x65, 0xe0, 0x7e, 0x61, 0x93,
+	0xb9, 0x4d, 0x1a, 0x28, 0x19, 0x25, 0x83, 0x99, 0x14, 0xfb, 0x3f, 0xee, 0x25, 0xa5, 0x0a, 0xcc,
+	0x4d, 0xc9, 0xab, 0x26, 0x55, 0x16, 0xa7, 0xf2, 0xd4, 0x52, 0xa7, 0x94, 0x82, 0xa1, 0xe9, 0xc2,
+	0x3e, 0x52, 0x32, 0x8c, 0x52, 0x99, 0x2a, 0x6a, 0x55, 0x53, 0x54, 0x5d, 0x37, 0x2c, 0xd5, 0xd2,
+	0x0c, 0xdd, 0x14, 0xd6, 0xb4, 0xb0, 0xb2, 0x5f, 0xf9, 0xfa, 0x15, 0xc5, 0xd2, 0x2a, 0xd4, 0xb4,
+	0xd4, 0x4a, 0xd5, 0x49, 0xef, 0x77, 0x28, 0xd6, 0x6b, 0x2c, 0x83, 0xb0, 0x0f, 0xf9, 0x08, 0xd8,
+	0x7f, 0x84, 0x69, 0xd8, 0x67, 0xaa, 0xaa, 0x35, 0xb5, 0x22, 0x0a, 0x93, 0x1d, 0x30, 0xf0, 0x82,
+	0x51, 0xac, 0x97, 0x69, 0x46, 0x2d, 0xab, 0x7a, 0x81, 0x66, 0xe9, 0xf5, 0x3a, 0x35, 0x2d, 0xf2,
+	0x26, 0x6c, 0xf7, 0x7d, 0x37, 0xab, 0x86, 0x6e, 0x52, 0xac, 0x42, 0x8f, 0xcd, 0xca, 0x1c, 0x44,
+	0xa3, 0x1b, 0xc6, 0x37, 0x4f, 0x0f, 0xc9, 0x9c, 0xb7, 0x6c, 0xf3, 0x96, 0x05, 0x6f, 0xf9, 0x94,
+	0xa1, 0xe9, 0x99, 0xfd, 0x0f, 0x97, 0xd2, 0x5d, 0x5f, 0x3c, 0x4e, 0x8f, 0x97, 0x34, 0xeb, 0x6a,
+	0x3d, 0x2f, 0x17, 0x8c, 0x8a, 0x22, 0x9a, 0xc4, 0xff, 0x4c, 0x9a, 0xc5, 0x6b, 0x8a, 0xd5, 0xa8,
+	0x52, 0x93, 0x05, 0x98, 0x59, 0x9e, 0x99, 0x0c, 0xc3, 0x10, 0xaf, 0xbd, 0x60, 0x14, 0xae, 0xd1,
+	0xe2, 0xc9, 0x8a, 0x51, 0xd7, 0x2d, 0x07, 0xd8, 0x1d, 0x90, 0xc2, 0x8c, 0x6b, 0x87, 0xee, 0x39,
+	0xd8, 0x79, 0xb2, 0x50, 0xb0, 0xab, 0xbe, 0xa4, 0xdb, 0x1d, 0x55, 0xf3, 0x65, 0xca, 0x1d, 0x38,
+	0x42, 0x3c, 0x06, 0x3d, 0xc6, 0x0d, 0x9d, 0xd6, 0x06, 0xd1, 0x28, 0x1a, 0xdf, 0x94, 0xd9, 0xfa,
+	0x74, 0x29, 0xfd, 0x8f, 0x86, 0x5a, 0x29, 0x1f, 0x26, 0xec, 0x33, 0xc9, 0x72, 0x33, 0xb9, 0x87,
+	0x20, 0x15, 0x95, 0x69, 0xed, 0xe8, 0x9c, 0x81, 0x11, 0x0f, 0x08, 0x4d, 0x2f, 0xad, 0x8a, 0xcd,
+	0x5d, 0xe4, 0xeb, 0xcb, 0x4a, 0xa2, 0xb5, 0x23, 0x73, 0x0a, 0x86, 0x04, 0x06, 0x3e, 0x3b, 0x56,
+	0xc5, 0xe4, 0x0e, 0x48, 0x61, 0x49, 0xd6, 0x8e, 0xc5, 0xc7, 0xc8, 0x1d, 0x13, 0x8e, 0xe0, 0xbc,
+	0x6a, 0x5a, 0x97, 0xb4, 0x0a, 0x6d, 0x93, 0x09, 0x7e, 0x19, 0x36, 0xb9, 0xfb, 0xc8, 0x60, 0xf7,
+	0x28, 0x1a, 0xdf, 0x3c, 0x2d, 0xc9, 0x7c, 0x23, 0x91, 0x9d, 0x8d, 0x44, 0xbe, 0xe4, 0x78, 0x64,
+	0x46, 0x6c, 0xc0, 0x4f, 0x97, 0xd2, 0x5b, 0x79, 0x2e, 0x37, 0x94, 0xdc, 0x7f, 0x9c, 0x46, 0xd9,
+	0x95, 0x54, 0xe4, 0xb2, 0x3b, 0xd4, 0x7e, 0x7c, 0xa2, 0x49, 0xb3, 0xd0, 0x63, 0x4f, 0x01, 0xa7,
+	0x49, 0x92, 0xec, 0xdd, 0x42, 0xe5, 0xf3, 0xb4, 0xa6, 0x19, 0x45, 0x3b, 0x38, 0xb3, 0xd1, 0x2e,
+	0x9a, 0xe5, 0xee, 0xe4, 0x2b, 0x04, 0x13, 0xa1, 0x99, 0xcf, 0x19, 0x2b, 0xb3, 0xea, 0x45, 0xbd,
+	0xdc, 0x58, 0x2f, 0x9d, 0x28, 0xc1, 0x64, 0x42, 0xbc, 0x1d, 0x76, 0xe6, 0x33, 0x04, 0xa3, 0x9e,
+	0xe5, 0x45, 0x8b, 0x19, 0x7a, 0xc5, 0xa8, 0xd1, 0xf5, 0x34, 0x2f, 0x5e, 0x83, 0x5d, 0x31, 0x18,
+	0x3b, 0xec, 0xc0, 0x03, 0xe4, 0x66, 0xf7, 0xf6, 0x7a, 0x8e, 0xea, 0x46, 0x65, 0x9d, 0xb4, 0x00,
+	0x0f, 0x40, 0x4f, 0xd1, 0xc6, 0x33, 0xb8, 0xc1, 0xae, 0x9f, 0xe5, 0x3f, 0xc8, 0xeb, 0x40, 0xe2,
+	0xa0, 0x77, 0xd8, 0x99, 0xb7, 0x00, 0xf3, 0xb4, 0x9e, 0x4e, 0xb8, 0x48, 0x50, 0x13, 0x12, 0x9c,
+	0x85, 0xbf, 0x3b, 0x37, 0x07, 0x41, 0x7b, 0x28, 0x40, 0x7b, 0x4e, 0x38, 0x64, 0x86, 0x05, 0xeb,
+	0x2d, 0x9c, 0xb5, 0x13, 0x48, 0x3e, 0xb4, 0x49, 0xbb, 0x79, 0x88, 0x0e, 0xdb, 0x3c, 0xf5, 0x05,
+	0x9d, 0xcb, 0xd0, 0xab, 0xb2, 0xd3, 0x59, 0x8c, 0xc5, 0x71, 0x3b, 0xdb, 0x2f, 0x4b, 0xe9, 0xb1,
+	0x04, 0xfb, 0xe1, 0xbc, 0x6e, 0x3d, 0x5d, 0x4a, 0xf7, 0xf1, 0xba, 0x3c, 0x0b, 0xc9, 0x8a, 0x74,
+	0x64, 0x1c, 0xfa, 0x78, 0x3d, 0x87, 0xea, 0xbf, 0xe0, 0x6f, 0x76, 0x27, 0x72, 0x5a, 0x91, 0x95,
+	0xda, 0x98, 0xed, 0xb5, 0x7f, 0xce, 0x17, 0xc9, 0x09, 0xe8, 0x77, 0x3c, 0x05, 0x28, 0x19, 0x36,
+	0xda, 0x36, 0xe6, 0x17, 0xdb, 0xe2, 0x2c, 0xf3, 0x23, 0x33, 0x30, 0xc4, 0x7e, 0xd1, 0x1b, 0x6a,
+	0xad, 0x98, 0xa5, 0x05, 0xaa, 0x2d, 0xd2, 0x5a, 0xcb, 0xba, 0xa7, 0x41, 0x0a, 0x8b, 0x12, 0x18,
+	0xf6, 0xc1, 0x96, 0x1a, 0xb3, 0xe4, 0x6a, 0xc2, 0x24, 0xc6, 0xa8, 0xbf, 0xe6, 0x09, 0x20, 0xdb,
+	0xe0, 0x9f, 0xe7, 0xe8, 0x4d, 0x36, 0x67, 0xe6, 0xe7, 0x9c, 0x0b, 0xd0, 0x24, 0xe0, 0xe6, 0x8f,
+	0x22, 0x67, 0x4c, 0x0b, 0x76, 0x5d, 0x6c, 0xe8, 0xd6, 0x55, 0x6a, 0x69, 0x85, 0x05, 0x46, 0xd2,
+	0xcc, 0x34, 0xf8, 0x3f, 0x6e, 0xce, 0xc8, 0xe8, 0xc3, 0xdd, 0x83, 0x88, 0x2c, 0x02, 0x89, 0xcb,
+	0x20, 0x00, 0x2c, 0xc0, 0x16, 0xd3, 0xf1, 0xca, 0x35, 0x4f, 0xe3, 0x9d, 0xfe, 0x1e, 0x7b, 0x92,
+	0x89, 0x99, 0xdc, 0x6f, 0x36, 0x7f, 0x34, 0x59, 0xdd, 0xff, 0xc3, 0xa8, 0xaf, 0x6e, 0x72, 0xe0,
+	0xc4, 0x08, 0xd0, 0x0e, 0xc1, 0x7c, 0x16, 0xfa, 0xbd, 0x98, 0xc5, 0xb4, 0x48, 0x04, 0xb9, 0xcf,
+	0x03, 0x99, 0x7c, 0x82, 0x7c, 0x6b, 0x7c, 0xc1, 0xd0, 0x4b, 0xb4, 0xe6, 0xac, 0xa5, 0x76, 0xf7,
+	0xa7, 0x67, 0xb1, 0x4e, 0xdf, 0x80, 0xdd, 0xb1, 0x08, 0x3b, 0xdc, 0x86, 0x3e, 0xf2, 0x5f, 0x5b,
+	0xd6, 0x13, 0x77, 0xff, 0x95, 0xe5, 0x2f, 0x63, 0xfd, 0x35, 0x82, 0xe9, 0x98, 0xae, 0x76, 0x7a,
+	0x71, 0x79, 0x16, 0xbd, 0xa8, 0xc0, 0x81, 0xb6, 0x10, 0x77, 0xd8, 0xa1, 0x6f, 0x11, 0xec, 0x8b,
+	0xa9, 0xb7, 0xaa, 0xe3, 0xfb, 0x19, 0xb4, 0x25, 0xe2, 0xe8, 0xce, 0xc3, 0x78, 0x6b, 0xf0, 0x1d,
+	0x76, 0x68, 0x00, 0xf0, 0x85, 0x3a, 0xad, 0x35, 0xce, 0x33, 0x65, 0xee, 0x6c, 0xf4, 0xcf, 0xc3,
+	0x36, 0xcf, 0x57, 0x51, 0x64, 0x06, 0x7a, 0xb9, 0x82, 0x17, 0x9b, 0xd5, 0x8e, 0x40, 0x15, 0x66,
+	0x15, 0x15, 0x84, 0xef, 0xf4, 0x1f, 0x23, 0xd0, 0xc3, 0xb2, 0xe1, 0xf7, 0x10, 0xf4, 0x79, 0xa4,
+	0x3d, 0xde, 0xe3, 0xcf, 0x10, 0xf6, 0x22, 0x20, 0xed, 0x6d, 0xe1, 0xc5, 0xe1, 0x11, 0xf9, 0xee,
+	0x4f, 0xbf, 0x7d, 0xd0, 0x3d, 0x8e, 0xc7, 0x14, 0xdf, 0xb3, 0x83, 0xf3, 0x26, 0x52, 0x61, 0x61,
+	0xb9, 0xbc, 0x28, 0xfe, 0x29, 0x02, 0x1c, 0x14, 0xf4, 0xf8, 0xdf, 0xe1, 0xd5, 0x42, 0x5e, 0x04,
+	0xa4, 0xff, 0x24, 0x71, 0x15, 0xe8, 0x66, 0x18, 0x3a, 0x19, 0x4f, 0xb4, 0x40, 0xc7, 0x6f, 0xaf,
+	0x39, 0x7e, 0xe1, 0xc0, 0x0f, 0x10, 0xec, 0x08, 0x57, 0xea, 0x78, 0xd2, 0x5f, 0x3c, 0xf6, 0x6d,
+	0x40, 0x92, 0x93, 0xba, 0x0b, 0xbc, 0x27, 0x18, 0xde, 0xc3, 0xf8, 0x50, 0x14, 0x5e, 0x95, 0xc7,
+	0xe7, 0xea, 0x6e, 0x82, 0x1c, 0x13, 0x91, 0xca, 0x2d, 0xb6, 0x50, 0x6e, 0xe3, 0x6f, 0x10, 0x6c,
+	0x0f, 0xd5, 0xe5, 0x78, 0x22, 0x16, 0x8b, 0xef, 0x1d, 0x40, 0x9a, 0x4c, 0xe8, 0x2d, 0x80, 0x1f,
+	0x67, 0xc0, 0xff, 0x87, 0x0f, 0x26, 0x03, 0xae, 0xe9, 0x25, 0x1f, 0xee, 0xcf, 0x11, 0xe0, 0xa0,
+	0x0c, 0x0f, 0xce, 0x8b, 0x48, 0xbd, 0x1f, 0x9c, 0x17, 0xd1, 0xaa, 0x9e, 0x1c, 0x61, 0x70, 0x67,
+	0xf1, 0x4c, 0x2b, 0xb8, 0x62, 0x62, 0x44, 0xf6, 0xd8, 0x7b, 0xbf, 0x8f, 0xec, 0x71, 0xa8, 0xae,
+	0x8f, 0xec, 0x71, 0xb8, 0xca, 0x4e, 0xde, 0x63, 0x01, 0xba, 0xaa, 0x9a, 0x96, 0xad, 0x54, 0x5c,
+	0xdc, 0xbf, 0x23, 0xd8, 0x9b, 0x48, 0xbe, 0xe2, 0x23, 0x89, 0x90, 0x45, 0x1c, 0x76, 0xd2, 0xd1,
+	0x55, 0x46, 0x0b, 0x9e, 0x59, 0xc6, 0x73, 0x01, 0x9f, 0x6d, 0x93, 0x67, 0x4e, 0x37, 0x9a, 0xe7,
+	0x97, 0xa1, 0x97, 0x1b, 0x2e, 0xf5, 0xef, 0x90, 0xfb, 0x54, 0x14, 0xd4, 0xaa, 0x78, 0x7f, 0xec,
+	0x64, 0x0f, 0x91, 0xde, 0xd2, 0x54, 0x1b, 0x11, 0x82, 0xd6, 0x1c, 0xa3, 0x75, 0x0c, 0x1f, 0x49,
+	0xb6, 0x44, 0x68, 0x31, 0x97, 0x67, 0x49, 0x72, 0x9e, 0x31, 0xfc, 0x01, 0xf9, 0x9e, 0xab, 0x3c,
+	0xda, 0x12, 0x4f, 0x25, 0x6a, 0x7d, 0xf3, 0x19, 0x2c, 0x4d, 0xb7, 0x13, 0x22, 0xb8, 0x9c, 0x66,
+	0x5c, 0x8e, 0xe3, 0xa3, 0xed, 0x0e, 0x11, 0x3b, 0x64, 0x5d, 0x32, 0xef, 0x20, 0xd8, 0xdc, 0x24,
+	0x25, 0x31, 0xf1, 0x43, 0x09, 0xea, 0x5c, 0x69, 0x77, 0xac, 0x8f, 0xc0, 0x37, 0xc1, 0xf0, 0x8d,
+	0xe1, 0x3d, 0x51, 0xf8, 0x04, 0x2e, 0x2e, 0x92, 0xef, 0x21, 0x00, 0x9e, 0x25, 0xd3, 0x98, 0x9f,
+	0xc3, 0x3b, 0xc3, 0x2b, 0x38, 0x00, 0x52, 0x51, 0x66, 0x51, 0x7b, 0x96, 0xd5, 0xde, 0x8f, 0xe5,
+	0x16, 0xb5, 0xf3, 0x8d, 0x9c, 0x56, 0x54, 0x6e, 0x09, 0x3d, 0x73, 0x1b, 0x7f, 0x89, 0xb8, 0xae,
+	0xf7, 0xaa, 0xc8, 0xe0, 0x0e, 0x18, 0xa9, 0x4f, 0x83, 0x3b, 0x60, 0xb4, 0x28, 0x25, 0xc7, 0x18,
+	0xca, 0x43, 0x78, 0x36, 0x0e, 0x65, 0xce, 0xa7, 0x5b, 0x9b, 0xd0, 0xbe, 0x8d, 0x00, 0x56, 0x74,
+	0x29, 0xde, 0xe5, 0x2f, 0x1d, 0x10, 0xb2, 0x12, 0x89, 0x73, 0x49, 0x3a, 0x6e, 0x3a, 0xbd, 0xc9,
+	0x27, 0x55, 0x4e, 0x2b, 0xe2, 0x1f, 0x11, 0x48, 0xd1, 0x52, 0x35, 0xb8, 0x16, 0x5a, 0x0a, 0xe3,
+	0xe0, 0x5a, 0x68, 0xad, 0x84, 0xc9, 0x3c, 0xc3, 0x7c, 0x02, 0x1f, 0x8b, 0xc2, 0xec, 0xd5, 0x9c,
+	0xf5, 0xaa, 0x69, 0x0f, 0xbd, 0xe0, 0xb0, 0xd2, 0xd1, 0x77, 0xbb, 0x11, 0xfe, 0x1e, 0xc1, 0x50,
+	0xa4, 0x8c, 0x0d, 0xee, 0x52, 0xad, 0xe4, 0xb2, 0x34, 0xd5, 0x46, 0x44, 0xd2, 0x95, 0xed, 0x67,
+	0x13, 0x4a, 0xc6, 0x1e, 0x9a, 0xe1, 0x98, 0x7b, 0x34, 0x8e, 0xdf, 0x74, 0x42, 0xb5, 0xb4, 0x74,
+	0xa0, 0xad, 0x18, 0xc1, 0xe7, 0x4c, 0xab, 0xd1, 0xf1, 0xed, 0x54, 0x65, 0x96, 0x26, 0xe7, 0xa8,
+	0x84, 0xe8, 0x33, 0xdf, 0xa5, 0x12, 0x7f, 0xe6, 0xfb, 0x49, 0x4c, 0x26, 0xf4, 0x5e, 0xe5, 0x99,
+	0x1f, 0xc0, 0xfd, 0x7e, 0x37, 0xfc, 0xb7, 0x0d, 0xf5, 0x87, 0x33, 0x6d, 0x34, 0x39, 0xea, 0xfc,
+	0x3f, 0xd5, 0x51, 0x0e, 0xc1, 0xfc, 0x15, 0xc6, 0xfc, 0x22, 0xbe, 0xb0, 0xba, 0x81, 0x8b, 0xbb,
+	0x0c, 0x2c, 0xaf, 0x3c, 0xae, 0x47, 0x8a, 0x3c, 0x7c, 0xb0, 0x0d, 0x12, 0x9e, 0x03, 0xea, 0x50,
+	0xfb, 0x81, 0x82, 0xf2, 0x02, 0xa3, 0x7c, 0x06, 0xcf, 0xad, 0x92, 0xb2, 0xf7, 0x70, 0x6d, 0x40,
+	0x2f, 0x97, 0x86, 0xc1, 0x63, 0x35, 0xa8, 0x3e, 0x83, 0xc7, 0x6a, 0x88, 0x16, 0x25, 0x63, 0x0c,
+	0xe0, 0x28, 0x4e, 0x45, 0x01, 0xe4, 0xea, 0x33, 0xb3, 0xf0, 0xf0, 0x49, 0x0a, 0x3d, 0x7a, 0x92,
+	0x42, 0xbf, 0x3e, 0x49, 0xa1, 0xfb, 0xcb, 0xa9, 0xae, 0x47, 0xcb, 0xa9, 0xae, 0x9f, 0x97, 0x53,
+	0x5d, 0xaf, 0x4e, 0x37, 0x3d, 0x06, 0x8b, 0x1c, 0x93, 0x65, 0x35, 0x6f, 0xba, 0x09, 0x17, 0xa7,
+	0x66, 0x95, 0x9b, 0x4e, 0x5a, 0xf6, 0x38, 0x9c, 0xef, 0x65, 0x12, 0xff, 0xc0, 0x9f, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x8a, 0x5e, 0x26, 0x63, 0xb5, 0x1f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/lockup/types/tx.pb.go b/x/lockup/types/tx.pb.go
index 7943929a818..173bd097646 100644
--- a/x/lockup/types/tx.pb.go
+++ b/x/lockup/types/tx.pb.go
@@ -680,54 +680,54 @@ var fileDescriptor_bcdad5af0d24735f = []byte{
 	// 791 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xd3, 0x48,
 	0x18, 0x8e, 0x93, 0x7e, 0xbe, 0xed, 0x26, 0x5b, 0xab, 0xdb, 0xa6, 0xde, 0x5d, 0xbb, 0xeb, 0xdd,
-	0x6d, 0xb2, 0xbb, 0x8d, 0xbd, 0x49, 0xe1, 0xd2, 0x0b, 0x6a, 0x5a, 0x90, 0x2a, 0x35, 0x12, 0x32,
-	0xad, 0x84, 0x38, 0x50, 0x39, 0xce, 0x30, 0xb5, 0x92, 0x78, 0x22, 0x8f, 0xdd, 0x0f, 0x89, 0x5f,
-	0xc0, 0x89, 0x23, 0x67, 0x24, 0x2e, 0x70, 0x41, 0xe2, 0x4f, 0xf4, 0x58, 0x6e, 0x1c, 0x50, 0x8a,
-	0xda, 0x03, 0x12, 0xc7, 0xfe, 0x02, 0xe4, 0xf1, 0x87, 0x9c, 0x8f, 0x26, 0x01, 0x09, 0xc4, 0xa5,
-	0xf6, 0xcc, 0xfb, 0xbc, 0xcf, 0x3c, 0xcf, 0xe3, 0x99, 0x69, 0x60, 0x91, 0xd0, 0x26, 0xa1, 0x26,
-	0x55, 0x1b, 0xc4, 0xa8, 0xbb, 0x2d, 0xd5, 0x39, 0x56, 0x5a, 0x36, 0x71, 0x08, 0x9f, 0x0e, 0x0a,
-	0x8a, 0x5f, 0x10, 0xe6, 0x31, 0xc1, 0x84, 0x95, 0x54, 0xef, 0xcd, 0x47, 0x09, 0x73, 0x7a, 0xd3,
-	0xb4, 0x88, 0xca, 0xfe, 0x06, 0x53, 0x22, 0x26, 0x04, 0x37, 0x90, 0xca, 0x46, 0x55, 0xf7, 0x91,
-	0x5a, 0x73, 0x6d, 0xdd, 0x31, 0x89, 0x15, 0xd6, 0x0d, 0xc6, 0xac, 0x56, 0x75, 0x8a, 0xd4, 0xc3,
-	0x62, 0x15, 0x39, 0x7a, 0x51, 0x35, 0x88, 0x19, 0xd6, 0x97, 0xba, 0x14, 0x79, 0x0f, 0xbf, 0x24,
-	0xbf, 0x48, 0xc2, 0x4f, 0x15, 0x8a, 0x77, 0x88, 0x51, 0xdf, 0x25, 0x75, 0x64, 0x51, 0x7e, 0x05,
-	0xc6, 0xc9, 0x91, 0x85, 0xec, 0x2c, 0xb7, 0xcc, 0xe5, 0xa7, 0xcb, 0x3f, 0x5f, 0xb5, 0xa5, 0xd9,
-	0x13, 0xbd, 0xd9, 0x58, 0x97, 0xd9, 0xb4, 0xac, 0xf9, 0x65, 0xfe, 0x00, 0xa6, 0x42, 0x19, 0xd9,
-	0xe4, 0x32, 0x97, 0x9f, 0x29, 0x2d, 0x29, 0xbe, 0x4e, 0x25, 0xd4, 0xa9, 0x6c, 0x05, 0x80, 0x72,
-	0xf1, 0xb4, 0x2d, 0x25, 0x3e, 0xb5, 0x25, 0x3e, 0x6c, 0x59, 0x25, 0x4d, 0xd3, 0x41, 0xcd, 0x96,
-	0x73, 0x72, 0xd5, 0x96, 0x32, 0x3e, 0x7f, 0x58, 0x93, 0x9f, 0x9d, 0x4b, 0x9c, 0x16, 0xb1, 0xf3,
-	0x3a, 0x8c, 0x7b, 0x66, 0x68, 0x36, 0xb5, 0x9c, 0x62, 0xcb, 0xf8, 0x76, 0x15, 0xcf, 0xae, 0x12,
-	0xd8, 0x55, 0x36, 0x89, 0x69, 0x95, 0xff, 0xf7, 0x96, 0x79, 0x79, 0x2e, 0xe5, 0xb1, 0xe9, 0x1c,
-	0xb8, 0x55, 0xc5, 0x20, 0x4d, 0x35, 0xc8, 0xc6, 0x7f, 0x14, 0x68, 0xad, 0xae, 0x3a, 0x27, 0x2d,
-	0x44, 0x59, 0x03, 0xd5, 0x7c, 0xe6, 0x75, 0xe9, 0xc9, 0xc7, 0xd7, 0xff, 0x0a, 0x7d, 0x62, 0x2a,
-	0x38, 0x2c, 0x15, 0x39, 0x07, 0xbf, 0x74, 0xc4, 0xa4, 0x21, 0xda, 0x22, 0x16, 0x45, 0x7c, 0x1a,
-	0x92, 0xdb, 0x5b, 0x2c, 0xab, 0x31, 0x2d, 0xb9, 0xbd, 0x25, 0x63, 0x98, 0xaf, 0x50, 0x5c, 0x46,
-	0xd8, 0xb4, 0xf6, 0x2c, 0x8f, 0xc1, 0xb4, 0xf0, 0x46, 0xa3, 0x31, 0x6a, 0xac, 0xeb, 0x39, 0x4f,
-	0x89, 0xdc, 0xa5, 0xa4, 0xea, 0xd1, 0x15, 0x5c, 0x2b, 0xae, 0x68, 0x17, 0x7e, 0xeb, 0xb7, 0x50,
-	0x24, 0xec, 0x06, 0x4c, 0xfa, 0x0d, 0x34, 0xcb, 0xb1, 0xdc, 0x04, 0xa5, 0x73, 0xff, 0x29, 0x77,
-	0x91, 0x6d, 0x92, 0x9a, 0xe7, 0x49, 0x0b, 0xa1, 0xf2, 0x7b, 0x0e, 0xe6, 0x7a, 0x68, 0x47, 0xde,
-	0x13, 0x7e, 0x18, 0xc9, 0x30, 0x8c, 0xef, 0xf1, 0xe5, 0x56, 0xbd, 0xbc, 0x72, 0x83, 0xf2, 0x6a,
-	0x31, 0x9b, 0x05, 0xef, 0x5d, 0xde, 0x87, 0xa5, 0x1e, 0x77, 0x51, 0x62, 0x59, 0x98, 0xa4, 0xae,
-	0x61, 0x20, 0x4a, 0x99, 0xcf, 0x29, 0x2d, 0x1c, 0xf2, 0x79, 0xc8, 0xb8, 0x21, 0xdc, 0xcb, 0x2b,
-	0x32, 0xd9, 0x3d, 0x2d, 0xbf, 0xe1, 0x20, 0x53, 0xa1, 0xf8, 0xf6, 0xb1, 0x83, 0x2c, 0x16, 0xad,
-	0xdb, 0xfa, 0xea, 0xf4, 0xe2, 0x27, 0x2c, 0xf5, 0x2d, 0x4f, 0x98, 0xbc, 0x06, 0x8b, 0x5d, 0xa2,
-	0x87, 0x87, 0x22, 0xbf, 0xe2, 0x20, 0x5d, 0xa1, 0xf8, 0x0e, 0xb1, 0x0d, 0xe4, 0x87, 0xf9, 0x03,
-	0xef, 0x13, 0xb9, 0x04, 0x0b, 0x9d, 0x62, 0x47, 0x70, 0xf8, 0x9c, 0x83, 0x5f, 0x2b, 0x14, 0xdf,
-	0x43, 0x8e, 0x86, 0x8e, 0x74, 0xbb, 0xa6, 0x21, 0x03, 0x99, 0x87, 0xc8, 0xde, 0xa8, 0xd5, 0x6c,
-	0x6f, 0x5b, 0x8c, 0x6a, 0x77, 0x01, 0x26, 0x1a, 0xf1, 0x5d, 0x13, 0x8c, 0xf8, 0x4d, 0xc8, 0xd8,
-	0x8c, 0x78, 0xdf, 0x0e, 0x98, 0xd9, 0x77, 0x9e, 0x2e, 0x0b, 0x57, 0x6d, 0x69, 0xc1, 0x67, 0xea,
-	0x02, 0xc8, 0x5a, 0xda, 0xee, 0xd0, 0x22, 0xdf, 0x82, 0x3f, 0x07, 0x68, 0x1c, 0xee, 0xb2, 0xf4,
-	0x76, 0x0c, 0x52, 0x15, 0x8a, 0x79, 0x0d, 0x20, 0xf6, 0x6f, 0xe0, 0xf7, 0xee, 0xdb, 0xa2, 0xe3,
-	0xfa, 0x13, 0xfe, 0x1e, 0x58, 0x8e, 0x56, 0xc5, 0x30, 0xd7, 0x7b, 0x15, 0xfe, 0xd5, 0xa7, 0xb7,
-	0x07, 0x25, 0xac, 0x8e, 0x82, 0x8a, 0x16, 0x7a, 0x08, 0xe9, 0xae, 0x3b, 0xeb, 0x8f, 0xa1, 0xfd,
-	0xc2, 0x3f, 0x43, 0x21, 0x11, 0xff, 0x7d, 0x98, 0xed, 0x38, 0xd3, 0x52, 0x9f, 0xd6, 0x38, 0x40,
-	0xc8, 0x0d, 0x01, 0x44, 0xcc, 0x7b, 0x30, 0x13, 0x3f, 0x42, 0x62, 0x9f, 0xbe, 0x58, 0x5d, 0x58,
-	0x19, 0x5c, 0x8f, 0x68, 0x1f, 0x43, 0xf6, 0xda, 0x7d, 0xfb, 0x5f, 0x1f, 0x8e, 0xeb, 0xc0, 0xc2,
-	0xda, 0x17, 0x80, 0xc3, 0xd5, 0xcb, 0x3b, 0xa7, 0x17, 0x22, 0x77, 0x76, 0x21, 0x72, 0x1f, 0x2e,
-	0x44, 0xee, 0xe9, 0xa5, 0x98, 0x38, 0xbb, 0x14, 0x13, 0xef, 0x2e, 0xc5, 0xc4, 0x83, 0x52, 0xec,
-	0xe0, 0x06, 0xc4, 0x85, 0x86, 0x5e, 0xa5, 0xe1, 0x40, 0x3d, 0x2c, 0xde, 0x54, 0x8f, 0xa3, 0xdf,
-	0x4e, 0xde, 0x41, 0xae, 0x4e, 0xb0, 0xeb, 0x6e, 0xed, 0x73, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88,
-	0xbd, 0xd0, 0x58, 0x5a, 0x09, 0x00, 0x00,
+	0x6d, 0xb2, 0xbb, 0x8d, 0xbd, 0x49, 0x11, 0x87, 0x5e, 0x50, 0xd3, 0x82, 0x54, 0xa9, 0x91, 0x90,
+	0x69, 0x25, 0xc4, 0x81, 0xca, 0x71, 0x86, 0xa9, 0x95, 0xc4, 0x13, 0x79, 0xec, 0x7e, 0x48, 0xfc,
+	0x02, 0x4e, 0x1c, 0x39, 0x23, 0x71, 0x81, 0x0b, 0x12, 0x7f, 0xa2, 0xc7, 0x72, 0xe3, 0x80, 0x52,
+	0xd4, 0x1e, 0x90, 0x38, 0xf6, 0x17, 0x20, 0x8f, 0x3f, 0xe4, 0x7c, 0x34, 0x09, 0x48, 0x20, 0x2e,
+	0xb5, 0x67, 0xde, 0xe7, 0x7d, 0xe6, 0x79, 0x1e, 0xcf, 0x4c, 0x03, 0x8b, 0x84, 0x36, 0x09, 0x35,
+	0xa9, 0xda, 0x20, 0x46, 0xdd, 0x6d, 0xa9, 0xce, 0xb1, 0xd2, 0xb2, 0x89, 0x43, 0xf8, 0x74, 0x50,
+	0x50, 0xfc, 0x82, 0x30, 0x8f, 0x09, 0x26, 0xac, 0xa4, 0x7a, 0x6f, 0x3e, 0x4a, 0x98, 0xd3, 0x9b,
+	0xa6, 0x45, 0x54, 0xf6, 0x37, 0x98, 0x12, 0x31, 0x21, 0xb8, 0x81, 0x54, 0x36, 0xaa, 0xba, 0x8f,
+	0xd4, 0x9a, 0x6b, 0xeb, 0x8e, 0x49, 0xac, 0xb0, 0x6e, 0x30, 0x66, 0xb5, 0xaa, 0x53, 0xa4, 0x1e,
+	0x16, 0xab, 0xc8, 0xd1, 0x8b, 0xaa, 0x41, 0xcc, 0xb0, 0xbe, 0xd4, 0xa5, 0xc8, 0x7b, 0xf8, 0x25,
+	0xf9, 0x45, 0x12, 0x7e, 0xaa, 0x50, 0xbc, 0x43, 0x8c, 0xfa, 0x2e, 0xa9, 0x23, 0x8b, 0xf2, 0x2b,
+	0x30, 0x4e, 0x8e, 0x2c, 0x64, 0x67, 0xb9, 0x65, 0x2e, 0x3f, 0x5d, 0xfe, 0xf9, 0xaa, 0x2d, 0xcd,
+	0x9e, 0xe8, 0xcd, 0xc6, 0xba, 0xcc, 0xa6, 0x65, 0xcd, 0x2f, 0xf3, 0x07, 0x30, 0x15, 0xca, 0xc8,
+	0x26, 0x97, 0xb9, 0xfc, 0x4c, 0x69, 0x49, 0xf1, 0x75, 0x2a, 0xa1, 0x4e, 0x65, 0x2b, 0x00, 0x94,
+	0x8b, 0xa7, 0x6d, 0x29, 0xf1, 0xa9, 0x2d, 0xf1, 0x61, 0xcb, 0x2a, 0x69, 0x9a, 0x0e, 0x6a, 0xb6,
+	0x9c, 0x93, 0xab, 0xb6, 0x94, 0xf1, 0xf9, 0xc3, 0x9a, 0xfc, 0xec, 0x5c, 0xe2, 0xb4, 0x88, 0x9d,
+	0xd7, 0x61, 0xdc, 0x33, 0x43, 0xb3, 0xa9, 0xe5, 0x14, 0x5b, 0xc6, 0xb7, 0xab, 0x78, 0x76, 0x95,
+	0xc0, 0xae, 0xb2, 0x49, 0x4c, 0xab, 0xfc, 0xbf, 0xb7, 0xcc, 0xcb, 0x73, 0x29, 0x8f, 0x4d, 0xe7,
+	0xc0, 0xad, 0x2a, 0x06, 0x69, 0xaa, 0x41, 0x36, 0xfe, 0xa3, 0x40, 0x6b, 0x75, 0xd5, 0x39, 0x69,
+	0x21, 0xca, 0x1a, 0xa8, 0xe6, 0x33, 0xaf, 0x4b, 0x4f, 0x3e, 0xbe, 0xfe, 0x57, 0xe8, 0x13, 0x53,
+	0xc1, 0x61, 0xa9, 0xc8, 0x39, 0xf8, 0xa5, 0x23, 0x26, 0x0d, 0xd1, 0x16, 0xb1, 0x28, 0xe2, 0xd3,
+	0x90, 0xdc, 0xde, 0x62, 0x59, 0x8d, 0x69, 0xc9, 0xed, 0x2d, 0x19, 0xc3, 0x7c, 0x85, 0xe2, 0x32,
+	0xc2, 0xa6, 0xb5, 0x67, 0x79, 0x0c, 0xa6, 0x85, 0x37, 0x1a, 0x8d, 0x51, 0x63, 0x5d, 0xcf, 0x79,
+	0x4a, 0xe4, 0x2e, 0x25, 0x55, 0x8f, 0xae, 0xe0, 0x5a, 0x71, 0x45, 0xbb, 0xf0, 0x5b, 0xbf, 0x85,
+	0x22, 0x61, 0x37, 0x60, 0xd2, 0x6f, 0xa0, 0x59, 0x8e, 0xe5, 0x26, 0x28, 0x9d, 0xfb, 0x4f, 0xb9,
+	0x8b, 0x6c, 0x93, 0xd4, 0x3c, 0x4f, 0x5a, 0x08, 0x95, 0xdf, 0x73, 0x30, 0xd7, 0x43, 0x3b, 0xf2,
+	0x9e, 0xf0, 0xc3, 0x48, 0x86, 0x61, 0x7c, 0x8f, 0x2f, 0xb7, 0xea, 0xe5, 0x95, 0x1b, 0x94, 0x57,
+	0x8b, 0xd9, 0x2c, 0x78, 0xef, 0xf2, 0x3e, 0x2c, 0xf5, 0xb8, 0x8b, 0x12, 0xcb, 0xc2, 0x24, 0x75,
+	0x0d, 0x03, 0x51, 0xca, 0x7c, 0x4e, 0x69, 0xe1, 0x90, 0xcf, 0x43, 0xc6, 0x0d, 0xe1, 0x5e, 0x5e,
+	0x91, 0xc9, 0xee, 0x69, 0xf9, 0x0d, 0x07, 0x99, 0x0a, 0xc5, 0xb7, 0x8f, 0x1d, 0x64, 0xb1, 0x68,
+	0xdd, 0xd6, 0x57, 0xa7, 0x17, 0x3f, 0x61, 0xa9, 0x6f, 0x79, 0xc2, 0xe4, 0x35, 0x58, 0xec, 0x12,
+	0x3d, 0x3c, 0x14, 0xf9, 0x15, 0x07, 0xe9, 0x0a, 0xc5, 0x77, 0x88, 0x6d, 0x20, 0x3f, 0xcc, 0x1f,
+	0x78, 0x9f, 0xc8, 0x25, 0x58, 0xe8, 0x14, 0x3b, 0x82, 0xc3, 0xe7, 0x1c, 0xfc, 0x5a, 0xa1, 0xf8,
+	0x1e, 0x72, 0x34, 0x74, 0xa4, 0xdb, 0x35, 0x0d, 0x19, 0xc8, 0x3c, 0x44, 0xf6, 0x46, 0xad, 0x66,
+	0x7b, 0xdb, 0x62, 0x54, 0xbb, 0x0b, 0x30, 0xd1, 0x88, 0xef, 0x9a, 0x60, 0xc4, 0x6f, 0x42, 0xc6,
+	0x66, 0xc4, 0xfb, 0x76, 0xc0, 0xcc, 0xbe, 0xf3, 0x74, 0x59, 0xb8, 0x6a, 0x4b, 0x0b, 0x3e, 0x53,
+	0x17, 0x40, 0xd6, 0xd2, 0x76, 0x87, 0x16, 0xf9, 0x16, 0xfc, 0x39, 0x40, 0xe3, 0x70, 0x97, 0xa5,
+	0xb7, 0x63, 0x90, 0xaa, 0x50, 0xcc, 0x6b, 0x00, 0xb1, 0x7f, 0x03, 0xbf, 0x77, 0xdf, 0x16, 0x1d,
+	0xd7, 0x9f, 0xf0, 0xf7, 0xc0, 0x72, 0xb4, 0x2a, 0x86, 0xb9, 0xde, 0xab, 0xf0, 0xaf, 0x3e, 0xbd,
+	0x3d, 0x28, 0x61, 0x75, 0x14, 0x54, 0xb4, 0xd0, 0x43, 0x48, 0x77, 0xdd, 0x59, 0x7f, 0x0c, 0xed,
+	0x17, 0xfe, 0x19, 0x0a, 0x89, 0xf8, 0xef, 0xc3, 0x6c, 0xc7, 0x99, 0x96, 0xfa, 0xb4, 0xc6, 0x01,
+	0x42, 0x6e, 0x08, 0x20, 0x62, 0xde, 0x83, 0x99, 0xf8, 0x11, 0x12, 0xfb, 0xf4, 0xc5, 0xea, 0xc2,
+	0xca, 0xe0, 0x7a, 0x44, 0xfb, 0x18, 0xb2, 0xd7, 0xee, 0xdb, 0xff, 0xfa, 0x70, 0x5c, 0x07, 0x16,
+	0xd6, 0xbe, 0x00, 0x1c, 0xae, 0x5e, 0xde, 0x39, 0xbd, 0x10, 0xb9, 0xb3, 0x0b, 0x91, 0xfb, 0x70,
+	0x21, 0x72, 0x4f, 0x2f, 0xc5, 0xc4, 0xd9, 0xa5, 0x98, 0x78, 0x77, 0x29, 0x26, 0x1e, 0x94, 0x62,
+	0x07, 0x37, 0x20, 0x2e, 0x34, 0xf4, 0x2a, 0x0d, 0x07, 0xea, 0x61, 0xf1, 0xa6, 0x7a, 0x1c, 0xfd,
+	0x76, 0xf2, 0x0e, 0x72, 0x75, 0x82, 0x5d, 0x77, 0x6b, 0x9f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa0,
+	0x14, 0xce, 0x00, 0x5a, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go
index 2c4926866c5..a2a94dfe3b6 100644
--- a/x/mint/client/cli/cli_test.go
+++ b/x/mint/client/cli/cli_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/suite"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/client/cli"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go
index efcfcf99200..90d71587487 100644
--- a/x/mint/client/cli/query.go
+++ b/x/mint/client/cli/query.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
diff --git a/x/mint/client/rest/query.go b/x/mint/client/rest/query.go
index 6acb8f8b90f..ecb25461c76 100644
--- a/x/mint/client/rest/query.go
+++ b/x/mint/client/rest/query.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gorilla/mux"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/types/rest"
diff --git a/x/mint/keeper/export_test.go b/x/mint/keeper/export_test.go
index 75f1349699a..405426d525b 100644
--- a/x/mint/keeper/export_test.go
+++ b/x/mint/keeper/export_test.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 type (
diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go
index dd8777806c8..d018a81af3a 100644
--- a/x/mint/keeper/genesis.go
+++ b/x/mint/keeper/genesis.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 const developerVestingAmount = 225_000_000_000_000
diff --git a/x/mint/keeper/genesis_test.go b/x/mint/keeper/genesis_test.go
index 46c1a50e5c4..ddf1c8cf4a8 100644
--- a/x/mint/keeper/genesis_test.go
+++ b/x/mint/keeper/genesis_test.go
@@ -5,8 +5,8 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 var customGenesis = types.NewGenesisState(
diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go
index f24c1b1e0c7..4cbc3620f2c 100644
--- a/x/mint/keeper/grpc_query.go
+++ b/x/mint/keeper/grpc_query.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go
index 4058e910119..c1393557b30 100644
--- a/x/mint/keeper/grpc_query_test.go
+++ b/x/mint/keeper/grpc_query_test.go
@@ -3,7 +3,7 @@ package keeper_test
 import (
 	"context"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 func (s *KeeperTestSuite) TestGRPCParams() {
diff --git a/x/mint/keeper/hooks.go b/x/mint/keeper/hooks.go
index 9a670c7c2dc..20ed2eee30e 100644
--- a/x/mint/keeper/hooks.go
+++ b/x/mint/keeper/hooks.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 
 	"github.com/cosmos/cosmos-sdk/telemetry"
diff --git a/x/mint/keeper/hooks_test.go b/x/mint/keeper/hooks_test.go
index 0ec12d94674..6d3b655b447 100644
--- a/x/mint/keeper/hooks_test.go
+++ b/x/mint/keeper/hooks_test.go
@@ -7,9 +7,9 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	osmoapp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	osmoapp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go
index af2787d3d3e..f88b441526c 100644
--- a/x/mint/keeper/keeper.go
+++ b/x/mint/keeper/keeper.go
@@ -8,8 +8,8 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go
index 9c10a20522d..978343415cc 100644
--- a/x/mint/keeper/keeper_test.go
+++ b/x/mint/keeper/keeper_test.go
@@ -15,10 +15,10 @@ import (
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/mint/module.go b/x/mint/module.go
index 2a078c3379c..9ace68c4eea 100644
--- a/x/mint/module.go
+++ b/x/mint/module.go
@@ -27,11 +27,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/client/rest"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 var (
diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go
index bd3d1ec8487..0f6fdd07ce6 100644
--- a/x/mint/simulation/decoder.go
+++ b/x/mint/simulation/decoder.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/kv"
diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go
index 5c537cd6ecd..eacc38ad144 100644
--- a/x/mint/simulation/decoder_test.go
+++ b/x/mint/simulation/decoder_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	simapp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	simapp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/kv"
diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go
index 27710f67869..19b95ba81c2 100644
--- a/x/mint/simulation/genesis.go
+++ b/x/mint/simulation/genesis.go
@@ -5,7 +5,7 @@ package simulation
 import (
 	"math/rand"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go
index dd463f1119c..e045c8b2544 100644
--- a/x/mint/simulation/genesis_test.go
+++ b/x/mint/simulation/genesis_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go
index b28c4729096..6a37e6c9e41 100644
--- a/x/mint/types/genesis.pb.go
+++ b/x/mint/types/genesis.pb.go
@@ -113,9 +113,9 @@ var fileDescriptor_12e6a5511ad3feeb = []byte{
 	0xa2, 0x70, 0x99, 0x60, 0x88, 0x84, 0x2b, 0x48, 0xdc, 0xc9, 0xeb, 0xc4, 0x23, 0x39, 0xc6, 0x0b,
 	0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86,
 	0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x0c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73,
-	0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0x4d, 0xf5, 0x2b,
+	0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0xcd, 0xf4, 0x2b,
 	0x20, 0xa1, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x37, 0x63, 0x40, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x8c, 0x14, 0xea, 0x92, 0xaa, 0x01, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xcc, 0xb9, 0x92, 0xab, 0xaa, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go
index 7829e2494d9..68db3120ea6 100644
--- a/x/mint/types/mint.pb.go
+++ b/x/mint/types/mint.pb.go
@@ -279,52 +279,52 @@ var fileDescriptor_ccb38f8335e0f45b = []byte{
 	// 769 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xf3, 0x44,
 	0x14, 0x8d, 0x49, 0x49, 0xf9, 0xa6, 0x6a, 0x53, 0xac, 0xd2, 0x98, 0x22, 0xe2, 0xd6, 0x6a, 0x51,
-	0x90, 0x68, 0x4c, 0x5b, 0xb1, 0xe9, 0x06, 0x88, 0x42, 0x21, 0x95, 0x90, 0xc2, 0xb0, 0xa8, 0xd4,
-	0x8d, 0xe5, 0xd8, 0x53, 0x77, 0xd4, 0x78, 0xc6, 0xcc, 0x4c, 0x12, 0xb2, 0xe1, 0x05, 0xd8, 0xb0,
-	0xec, 0x12, 0xde, 0xa6, 0xcb, 0xb2, 0x43, 0x2c, 0x22, 0xd4, 0xbe, 0x41, 0x5e, 0x00, 0x34, 0x3f,
-	0x4e, 0x5a, 0xb7, 0x91, 0x88, 0xbe, 0x55, 0x3c, 0xe7, 0x9e, 0x9c, 0x73, 0x7d, 0xe7, 0xde, 0x6b,
-	0xe0, 0x52, 0x9e, 0x52, 0x8e, 0xb9, 0x9f, 0x62, 0x22, 0xfc, 0xe1, 0x51, 0x0f, 0x89, 0xf0, 0x48,
-	0x1d, 0x9a, 0x19, 0xa3, 0x82, 0xda, 0x5b, 0x86, 0xd0, 0x54, 0x98, 0x21, 0xec, 0x6c, 0x25, 0x34,
-	0xa1, 0x8a, 0xe0, 0xcb, 0x27, 0xcd, 0xdd, 0x71, 0x13, 0x4a, 0x93, 0x3e, 0xf2, 0xd5, 0xa9, 0x37,
-	0xb8, 0xf2, 0x05, 0x4e, 0x11, 0x17, 0x61, 0x9a, 0x19, 0xc2, 0x87, 0x45, 0x42, 0x48, 0xc6, 0x26,
-	0x54, 0x2f, 0x86, 0xe2, 0x01, 0x0b, 0x05, 0xa6, 0x44, 0xc7, 0xbd, 0x5f, 0x40, 0xe5, 0x7b, 0x4c,
-	0x04, 0x62, 0xb6, 0x00, 0x9b, 0x28, 0xa3, 0xd1, 0x75, 0x90, 0x31, 0x3a, 0xc4, 0x1c, 0x53, 0xc2,
-	0x1d, 0x6b, 0xd7, 0x6a, 0xbc, 0x69, 0x75, 0xee, 0x26, 0x6e, 0xe9, 0xef, 0x89, 0xfb, 0x49, 0x82,
-	0xc5, 0xf5, 0xa0, 0xd7, 0x8c, 0x68, 0xea, 0x47, 0x2a, 0x7f, 0xf3, 0x73, 0xc8, 0xe3, 0x1b, 0x5f,
-	0x8c, 0x33, 0xc4, 0x9b, 0x6d, 0x14, 0x4d, 0x27, 0x6e, 0x6d, 0x1c, 0xa6, 0xfd, 0x53, 0xaf, 0xa8,
-	0xe7, 0xc1, 0xaa, 0x82, 0xba, 0x73, 0xe4, 0xd6, 0x02, 0xd5, 0x0b, 0x84, 0x93, 0x6b, 0x81, 0xe2,
-	0xaf, 0xe3, 0x98, 0x21, 0xce, 0xed, 0xcf, 0xc0, 0x6a, 0xa8, 0x1f, 0x4d, 0x02, 0xf6, 0x74, 0xe2,
-	0x6e, 0x68, 0x49, 0x13, 0xf0, 0x60, 0x4e, 0xb1, 0x2f, 0x40, 0x65, 0xa4, 0x04, 0x9c, 0x77, 0x14,
-	0xf9, 0xcb, 0xa5, 0xb3, 0x5d, 0xd7, 0xd2, 0x5a, 0xc5, 0x83, 0x46, 0xce, 0xfb, 0xb3, 0x0c, 0x6a,
-	0x6d, 0xcc, 0x05, 0xc3, 0xbd, 0x81, 0xac, 0x58, 0x97, 0xd1, 0x8c, 0x32, 0xf9, 0xc4, 0xed, 0x4b,
-	0xb0, 0xca, 0x45, 0x78, 0x83, 0x49, 0x62, 0x52, 0xfc, 0x6a, 0x69, 0x57, 0xf3, 0x42, 0x46, 0xc6,
-	0x83, 0xb9, 0xa0, 0xfd, 0x13, 0xa8, 0x66, 0x94, 0xf6, 0x03, 0x4c, 0x22, 0x44, 0x04, 0x1e, 0x22,
-	0x6e, 0xde, 0xec, 0xbb, 0xa5, 0x3d, 0xb6, 0xb5, 0x47, 0x41, 0xce, 0x83, 0x1b, 0x12, 0xe9, 0xcc,
-	0x00, 0x7b, 0x04, 0xde, 0x8f, 0xd1, 0x10, 0xf5, 0x69, 0x86, 0x58, 0xc0, 0xd0, 0x28, 0x64, 0x31,
-	0x77, 0xca, 0xca, 0xf4, 0x7c, 0x69, 0x53, 0x47, 0x9b, 0xbe, 0x10, 0xf4, 0xe0, 0xe6, 0x0c, 0x83,
-	0x1a, 0xb2, 0x09, 0xd8, 0x88, 0x68, 0x9a, 0x0e, 0x08, 0x16, 0xe3, 0x40, 0x26, 0xe5, 0xac, 0x28,
-	0xd7, 0x6f, 0x97, 0x76, 0xfd, 0x40, 0xbb, 0x3e, 0x57, 0xf3, 0xe0, 0xfa, 0x0c, 0xe8, 0xca, 0xf3,
-	0xbf, 0x15, 0x50, 0xe9, 0x86, 0x2c, 0x4c, 0xb9, 0xfd, 0x31, 0x00, 0x72, 0xf6, 0x82, 0x18, 0x11,
-	0x9a, 0xea, 0x5b, 0x84, 0x6f, 0x24, 0xd2, 0x96, 0x80, 0xfd, 0xab, 0x05, 0x9c, 0x04, 0x11, 0xc4,
-	0x31, 0x0f, 0x5e, 0xcc, 0x85, 0xbe, 0x8f, 0x1f, 0x96, 0x4e, 0xd2, 0xd5, 0x49, 0x2e, 0xd2, 0xf5,
-	0xe0, 0xb6, 0x09, 0x7d, 0xf3, 0x7c, 0x4c, 0xec, 0xb3, 0x7c, 0x38, 0x71, 0x2c, 0xef, 0xec, 0x0a,
-	0x23, 0x66, 0xee, 0xe7, 0xa3, 0xe2, 0xb8, 0xcd, 0x19, 0xf9, 0xb8, 0x75, 0x66, 0x88, 0xdd, 0x03,
-	0x3b, 0x0c, 0xc5, 0x83, 0x48, 0x76, 0x71, 0x90, 0x21, 0x86, 0x69, 0x1c, 0x60, 0xa2, 0x13, 0xe1,
-	0xaa, 0xf6, 0xe5, 0xd6, 0xc1, 0x74, 0xe2, 0xee, 0x69, 0xc5, 0xc5, 0x5c, 0x0f, 0xd6, 0x66, 0xc1,
-	0xae, 0x8a, 0x75, 0x88, 0x4a, 0x9a, 0xcb, 0x45, 0x32, 0xff, 0xdf, 0x55, 0x18, 0x09, 0xca, 0x9c,
-	0x77, 0xdf, 0x6e, 0x91, 0x14, 0xf5, 0x3c, 0x58, 0x9d, 0x41, 0x67, 0x0a, 0xb1, 0x09, 0x70, 0xe2,
-	0x27, 0xc3, 0x2a, 0xab, 0x9a, 0x4f, 0xab, 0x53, 0xd9, 0xb5, 0x1a, 0x6b, 0xc7, 0x87, 0xcd, 0xd7,
-	0x76, 0x6e, 0x73, 0xc1, 0x88, 0xb7, 0x56, 0x64, 0xb2, 0xb0, 0x16, 0x2f, 0xd8, 0x00, 0x7f, 0x58,
-	0x60, 0x7f, 0x64, 0x16, 0x57, 0xf0, 0xa2, 0xd7, 0x03, 0x86, 0x22, 0x84, 0x87, 0x88, 0x71, 0x67,
-	0x75, 0xb7, 0xdc, 0x58, 0x3b, 0x3e, 0x78, 0xdd, 0xbc, 0xb0, 0xfa, 0x5a, 0x9f, 0x4a, 0xd3, 0x79,
-	0xfd, 0x17, 0xeb, 0x7a, 0x70, 0x2f, 0x77, 0x6f, 0x17, 0x86, 0x0a, 0xe6, 0xd6, 0xb2, 0x87, 0x1b,
-	0xd2, 0x0e, 0x93, 0x64, 0x26, 0xf0, 0xac, 0x48, 0x5c, 0x84, 0x4c, 0xe8, 0x1b, 0x75, 0xde, 0x53,
-	0x97, 0x7f, 0x32, 0x9d, 0xb8, 0xbe, 0x36, 0xff, 0xbf, 0xff, 0xf4, 0xe0, 0xbe, 0xa1, 0x9a, 0x04,
-	0x9e, 0x56, 0xf4, 0x47, 0xc9, 0x53, 0x8d, 0x71, 0xba, 0x72, 0xfb, 0xbb, 0x5b, 0x6a, 0x9d, 0xdf,
-	0x3d, 0xd4, 0xad, 0xfb, 0x87, 0xba, 0xf5, 0xcf, 0x43, 0xdd, 0xfa, 0xed, 0xb1, 0x5e, 0xba, 0x7f,
-	0xac, 0x97, 0xfe, 0x7a, 0xac, 0x97, 0x2e, 0x3f, 0x7f, 0xd2, 0x15, 0xa6, 0x58, 0x87, 0xfd, 0xb0,
-	0xc7, 0xf3, 0x83, 0x3f, 0x3c, 0xfa, 0xc2, 0xff, 0x59, 0x7f, 0x51, 0x55, 0x8f, 0xf4, 0x2a, 0xea,
-	0x1b, 0x76, 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x6b, 0x8a, 0xe9, 0x6e, 0x07, 0x00,
+	0x90, 0x68, 0x4c, 0x5b, 0x89, 0x45, 0x37, 0x40, 0x14, 0x0a, 0xa9, 0x84, 0x14, 0x86, 0x45, 0xa5,
+	0x6e, 0x2c, 0xc7, 0x9e, 0xba, 0xa3, 0xc6, 0x33, 0x66, 0x66, 0x92, 0x90, 0x0d, 0x2f, 0xc0, 0x86,
+	0x65, 0x97, 0xf0, 0x36, 0x5d, 0x96, 0x1d, 0x62, 0x11, 0xa1, 0xf6, 0x0d, 0xf2, 0x02, 0xa0, 0xf9,
+	0x71, 0xd2, 0xba, 0x8d, 0x44, 0xf4, 0xad, 0xe2, 0x39, 0xf7, 0xe4, 0x9c, 0xeb, 0x3b, 0xf7, 0x5e,
+	0x03, 0x97, 0xf2, 0x94, 0x72, 0xcc, 0xfd, 0x14, 0x13, 0xe1, 0x0f, 0x8f, 0x7a, 0x48, 0x84, 0x47,
+	0xea, 0xd0, 0xcc, 0x18, 0x15, 0xd4, 0xde, 0x32, 0x84, 0xa6, 0xc2, 0x0c, 0x61, 0x67, 0x2b, 0xa1,
+	0x09, 0x55, 0x04, 0x5f, 0x3e, 0x69, 0xee, 0x8e, 0x9b, 0x50, 0x9a, 0xf4, 0x91, 0xaf, 0x4e, 0xbd,
+	0xc1, 0x95, 0x2f, 0x70, 0x8a, 0xb8, 0x08, 0xd3, 0xcc, 0x10, 0x3e, 0x2c, 0x12, 0x42, 0x32, 0x36,
+	0xa1, 0x7a, 0x31, 0x14, 0x0f, 0x58, 0x28, 0x30, 0x25, 0x3a, 0xee, 0xfd, 0x02, 0x2a, 0xdf, 0x63,
+	0x22, 0x10, 0xb3, 0x05, 0xd8, 0x44, 0x19, 0x8d, 0xae, 0x83, 0x8c, 0xd1, 0x21, 0xe6, 0x98, 0x12,
+	0xee, 0x58, 0xbb, 0x56, 0xe3, 0x4d, 0xab, 0x73, 0x37, 0x71, 0x4b, 0x7f, 0x4f, 0xdc, 0x4f, 0x12,
+	0x2c, 0xae, 0x07, 0xbd, 0x66, 0x44, 0x53, 0x3f, 0x52, 0xf9, 0x9b, 0x9f, 0x43, 0x1e, 0xdf, 0xf8,
+	0x62, 0x9c, 0x21, 0xde, 0x6c, 0xa3, 0x68, 0x3a, 0x71, 0x6b, 0xe3, 0x30, 0xed, 0x9f, 0x7a, 0x45,
+	0x3d, 0x0f, 0x56, 0x15, 0xd4, 0x9d, 0x23, 0xb7, 0x16, 0xa8, 0x5e, 0x20, 0x9c, 0x5c, 0x0b, 0x14,
+	0x7f, 0x1d, 0xc7, 0x0c, 0x71, 0x6e, 0x7f, 0x06, 0x56, 0x43, 0xfd, 0x68, 0x12, 0xb0, 0xa7, 0x13,
+	0x77, 0x43, 0x4b, 0x9a, 0x80, 0x07, 0x73, 0x8a, 0x7d, 0x01, 0x2a, 0x23, 0x25, 0xe0, 0xbc, 0xa3,
+	0xc8, 0x5f, 0x2e, 0x9d, 0xed, 0xba, 0x96, 0xd6, 0x2a, 0x1e, 0x34, 0x72, 0xde, 0x9f, 0x65, 0x50,
+	0x6b, 0x63, 0x2e, 0x18, 0xee, 0x0d, 0x64, 0xc5, 0xba, 0x8c, 0x66, 0x94, 0xc9, 0x27, 0x6e, 0x5f,
+	0x82, 0x55, 0x2e, 0xc2, 0x1b, 0x4c, 0x12, 0x93, 0xe2, 0x57, 0x4b, 0xbb, 0x9a, 0x17, 0x32, 0x32,
+	0x1e, 0xcc, 0x05, 0xed, 0x9f, 0x40, 0x35, 0xa3, 0xb4, 0x1f, 0x60, 0x12, 0x21, 0x22, 0xf0, 0x10,
+	0x71, 0xf3, 0x66, 0xdf, 0x2d, 0xed, 0xb1, 0xad, 0x3d, 0x0a, 0x72, 0x1e, 0xdc, 0x90, 0x48, 0x67,
+	0x06, 0xd8, 0x23, 0xf0, 0x7e, 0x8c, 0x86, 0xa8, 0x4f, 0x33, 0xc4, 0x02, 0x86, 0x46, 0x21, 0x8b,
+	0xb9, 0x53, 0x56, 0xa6, 0xe7, 0x4b, 0x9b, 0x3a, 0xda, 0xf4, 0x85, 0xa0, 0x07, 0x37, 0x67, 0x18,
+	0xd4, 0x90, 0x4d, 0xc0, 0x46, 0x44, 0xd3, 0x74, 0x40, 0xb0, 0x18, 0x07, 0x32, 0x29, 0x67, 0x45,
+	0xb9, 0x7e, 0xbb, 0xb4, 0xeb, 0x07, 0xda, 0xf5, 0xb9, 0x9a, 0x07, 0xd7, 0x67, 0x40, 0x57, 0x9e,
+	0xff, 0xad, 0x80, 0x4a, 0x37, 0x64, 0x61, 0xca, 0xed, 0x8f, 0x01, 0x90, 0xb3, 0x17, 0xc4, 0x88,
+	0xd0, 0x54, 0xdf, 0x22, 0x7c, 0x23, 0x91, 0xb6, 0x04, 0xec, 0x5f, 0x2d, 0xe0, 0x24, 0x88, 0x20,
+	0x8e, 0x79, 0xf0, 0x62, 0x2e, 0xf4, 0x7d, 0xfc, 0xb0, 0x74, 0x92, 0xae, 0x4e, 0x72, 0x91, 0xae,
+	0x07, 0xb7, 0x4d, 0xe8, 0x9b, 0xe7, 0x63, 0x62, 0x9f, 0xe5, 0xc3, 0x89, 0x63, 0x79, 0x67, 0x57,
+	0x18, 0x31, 0x73, 0x3f, 0x1f, 0x15, 0xc7, 0x6d, 0xce, 0xc8, 0xc7, 0xad, 0x33, 0x43, 0xec, 0x1e,
+	0xd8, 0x61, 0x28, 0x1e, 0x44, 0xb2, 0x8b, 0x83, 0x0c, 0x31, 0x4c, 0xe3, 0x00, 0x13, 0x9d, 0x08,
+	0x57, 0xb5, 0x2f, 0xb7, 0x0e, 0xa6, 0x13, 0x77, 0x4f, 0x2b, 0x2e, 0xe6, 0x7a, 0xb0, 0x36, 0x0b,
+	0x76, 0x55, 0xac, 0x43, 0x54, 0xd2, 0x5c, 0x2e, 0x92, 0xf9, 0xff, 0xae, 0xc2, 0x48, 0x50, 0xe6,
+	0xbc, 0xfb, 0x76, 0x8b, 0xa4, 0xa8, 0xe7, 0xc1, 0xea, 0x0c, 0x3a, 0x53, 0x88, 0x4d, 0x80, 0x13,
+	0x3f, 0x19, 0x56, 0x59, 0xd5, 0x7c, 0x5a, 0x9d, 0xca, 0xae, 0xd5, 0x58, 0x3b, 0x3e, 0x6c, 0xbe,
+	0xb6, 0x73, 0x9b, 0x0b, 0x46, 0xbc, 0xb5, 0x22, 0x93, 0x85, 0xb5, 0x78, 0xc1, 0x06, 0xf8, 0xc3,
+	0x02, 0xfb, 0x23, 0xb3, 0xb8, 0x82, 0x17, 0xbd, 0x1e, 0x30, 0x14, 0x21, 0x3c, 0x44, 0x8c, 0x3b,
+	0xab, 0xbb, 0xe5, 0xc6, 0xda, 0xf1, 0xc1, 0xeb, 0xe6, 0x85, 0xd5, 0xd7, 0xfa, 0x54, 0x9a, 0xce,
+	0xeb, 0xbf, 0x58, 0xd7, 0x83, 0x7b, 0xb9, 0x7b, 0xbb, 0x30, 0x54, 0x30, 0xb7, 0x96, 0x3d, 0xdc,
+	0x90, 0x76, 0x98, 0x24, 0x33, 0x81, 0x67, 0x45, 0xe2, 0x22, 0x64, 0x42, 0xdf, 0xa8, 0xf3, 0x9e,
+	0xba, 0xfc, 0x93, 0xe9, 0xc4, 0xf5, 0xb5, 0xf9, 0xff, 0xfd, 0xa7, 0x07, 0xf7, 0x0d, 0xd5, 0x24,
+	0xf0, 0xb4, 0xa2, 0x3f, 0x4a, 0x9e, 0x6a, 0x8c, 0xd3, 0x95, 0xdb, 0xdf, 0xdd, 0x52, 0xeb, 0xfc,
+	0xee, 0xa1, 0x6e, 0xdd, 0x3f, 0xd4, 0xad, 0x7f, 0x1e, 0xea, 0xd6, 0x6f, 0x8f, 0xf5, 0xd2, 0xfd,
+	0x63, 0xbd, 0xf4, 0xd7, 0x63, 0xbd, 0x74, 0xf9, 0xf9, 0x93, 0xae, 0x30, 0xc5, 0x3a, 0xec, 0x87,
+	0x3d, 0x9e, 0x1f, 0xfc, 0xe1, 0xd1, 0x17, 0xfe, 0xcf, 0xfa, 0x8b, 0xaa, 0x7a, 0xa4, 0x57, 0x51,
+	0xdf, 0xb0, 0x93, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xc6, 0xf2, 0xd0, 0x6e, 0x07, 0x00,
 	0x00,
 }
 
diff --git a/x/mint/types/minter_test.go b/x/mint/types/minter_test.go
index 08f4e05147e..0fe1a798a0a 100644
--- a/x/mint/types/minter_test.go
+++ b/x/mint/types/minter_test.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
diff --git a/x/mint/types/params_test.go b/x/mint/types/params_test.go
index 20f276124d8..7cfb2a7d21a 100644
--- a/x/mint/types/params_test.go
+++ b/x/mint/types/params_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 // TestGetInflationProportion sanity checks that inflation
diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go
index 9e0789199f6..1ca774a4446 100644
--- a/x/mint/types/query.pb.go
+++ b/x/mint/types/query.pb.go
@@ -204,29 +204,29 @@ var fileDescriptor_cd2f42111e753fbb = []byte{
 	// 395 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4e, 0xea, 0x40,
 	0x14, 0x86, 0x5b, 0x72, 0x2f, 0x8b, 0xb9, 0x37, 0xc1, 0x8c, 0x2c, 0x4c, 0xad, 0x85, 0x34, 0x86,
-	0xe0, 0x82, 0x19, 0x8b, 0x71, 0xe3, 0x92, 0xe8, 0xc6, 0x15, 0xb0, 0xd3, 0x8d, 0x69, 0xeb, 0xa4,
-	0x34, 0xd2, 0x4e, 0xe9, 0x0c, 0x44, 0xb6, 0xfa, 0x02, 0x26, 0xbe, 0x84, 0x8f, 0xe0, 0x23, 0xb0,
-	0x24, 0x71, 0x63, 0x5c, 0x10, 0x03, 0x3e, 0x88, 0xe9, 0x74, 0x24, 0x82, 0x13, 0xa3, 0xab, 0x36,
-	0x73, 0xfe, 0xf3, 0xff, 0xdf, 0x9c, 0x33, 0xa0, 0x4a, 0x59, 0x44, 0x59, 0xc8, 0x70, 0x14, 0xc6,
-	0x1c, 0x8f, 0x1c, 0x8f, 0x70, 0xd7, 0xc1, 0x83, 0x21, 0x49, 0xc7, 0x28, 0x49, 0x29, 0xa7, 0xb0,
-	0x2c, 0x15, 0x28, 0x53, 0x20, 0xa9, 0x30, 0xca, 0x01, 0x0d, 0xa8, 0x10, 0xe0, 0xec, 0x2f, 0xd7,
-	0x1a, 0x66, 0x40, 0x69, 0xd0, 0x27, 0xd8, 0x4d, 0x42, 0xec, 0xc6, 0x31, 0xe5, 0x2e, 0x0f, 0x69,
-	0xcc, 0x64, 0xb5, 0xa2, 0xcc, 0x12, 0xb6, 0x42, 0x60, 0x97, 0x01, 0xec, 0x64, 0xc9, 0x6d, 0x37,
-	0x75, 0x23, 0xd6, 0x25, 0x83, 0x21, 0x61, 0xdc, 0xee, 0x80, 0xcd, 0x95, 0x53, 0x96, 0xd0, 0x98,
-	0x11, 0x78, 0x04, 0x8a, 0x89, 0x38, 0xd9, 0xd2, 0xab, 0x7a, 0xfd, 0x5f, 0xd3, 0x44, 0x2a, 0x50,
-	0x94, 0x77, 0xb5, 0xfe, 0x4c, 0x66, 0x15, 0xad, 0x2b, 0x3b, 0xec, 0x1d, 0xb0, 0x2d, 0x2c, 0x4f,
-	0x12, 0xea, 0xf7, 0xda, 0x29, 0x1d, 0x85, 0x2c, 0xe3, 0xfc, 0x48, 0x1c, 0x03, 0x53, 0x5d, 0x96,
-	0xd1, 0x67, 0x60, 0x83, 0x64, 0xa5, 0x8b, 0x64, 0x59, 0x13, 0x10, 0xff, 0x5b, 0x28, 0x8b, 0x79,
-	0x99, 0x55, 0x6a, 0x41, 0xc8, 0x7b, 0x43, 0x0f, 0xf9, 0x34, 0xc2, 0xbe, 0xe0, 0x92, 0x9f, 0x06,
-	0xbb, 0xbc, 0xc2, 0x7c, 0x9c, 0x10, 0x86, 0x8e, 0x89, 0xdf, 0x2d, 0x91, 0xd5, 0x88, 0xe6, 0x63,
-	0x01, 0xfc, 0x15, 0xd9, 0xf0, 0x56, 0x07, 0xc5, 0x1c, 0x1e, 0xd6, 0xd5, 0x57, 0xfb, 0x3a, 0x2b,
-	0x63, 0xef, 0x07, 0xca, 0xfc, 0x12, 0xf6, 0xee, 0xcd, 0xd3, 0xdb, 0x7d, 0xc1, 0x82, 0x26, 0x56,
-	0xae, 0x25, 0x9f, 0x14, 0x7c, 0xd0, 0x41, 0x69, 0x6d, 0x0c, 0xd0, 0xf9, 0x26, 0x44, 0x3d, 0x51,
-	0xa3, 0xf9, 0x9b, 0x16, 0x09, 0x88, 0x04, 0x60, 0x1d, 0xd6, 0xd4, 0x80, 0xeb, 0x1b, 0x68, 0x9d,
-	0x4e, 0xe6, 0x96, 0x3e, 0x9d, 0x5b, 0xfa, 0xeb, 0xdc, 0xd2, 0xef, 0x16, 0x96, 0x36, 0x5d, 0x58,
-	0xda, 0xf3, 0xc2, 0xd2, 0xce, 0xf7, 0x3f, 0x6d, 0x43, 0x7a, 0x35, 0xfa, 0xae, 0xc7, 0x96, 0xc6,
-	0x23, 0xe7, 0x10, 0x5f, 0xe7, 0xf6, 0x62, 0x37, 0x5e, 0x51, 0x3c, 0xc8, 0x83, 0xf7, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x40, 0x03, 0xf6, 0x99, 0x1f, 0x03, 0x00, 0x00,
+	0xe0, 0x82, 0x19, 0x8b, 0x89, 0x0b, 0x97, 0x44, 0x37, 0xae, 0x80, 0x9d, 0x6e, 0x4c, 0x5b, 0x27,
+	0xa5, 0x91, 0x76, 0x4a, 0x67, 0x20, 0xb2, 0xd5, 0x17, 0x30, 0xf1, 0x25, 0x7c, 0x04, 0x1f, 0x81,
+	0x25, 0x89, 0x1b, 0xe3, 0x82, 0x18, 0xf0, 0x41, 0x4c, 0xa7, 0x23, 0x11, 0x9c, 0x18, 0x5d, 0xb5,
+	0x99, 0xf3, 0x9f, 0xff, 0xff, 0xe6, 0x9c, 0x01, 0x55, 0xca, 0x22, 0xca, 0x42, 0x86, 0xa3, 0x30,
+	0xe6, 0x78, 0xe4, 0x78, 0x84, 0xbb, 0x0e, 0x1e, 0x0c, 0x49, 0x3a, 0x46, 0x49, 0x4a, 0x39, 0x85,
+	0x65, 0xa9, 0x40, 0x99, 0x02, 0x49, 0x85, 0x51, 0x0e, 0x68, 0x40, 0x85, 0x00, 0x67, 0x7f, 0xb9,
+	0xd6, 0x30, 0x03, 0x4a, 0x83, 0x3e, 0xc1, 0x6e, 0x12, 0x62, 0x37, 0x8e, 0x29, 0x77, 0x79, 0x48,
+	0x63, 0x26, 0xab, 0x15, 0x65, 0x96, 0xb0, 0x15, 0x02, 0xbb, 0x0c, 0x60, 0x27, 0x4b, 0x6e, 0xbb,
+	0xa9, 0x1b, 0xb1, 0x2e, 0x19, 0x0c, 0x09, 0xe3, 0x76, 0x07, 0x6c, 0xae, 0x9c, 0xb2, 0x84, 0xc6,
+	0x8c, 0xc0, 0x23, 0x50, 0x4c, 0xc4, 0xc9, 0x96, 0x5e, 0xd5, 0xeb, 0xff, 0x9a, 0x26, 0x52, 0x81,
+	0xa2, 0xbc, 0xab, 0xf5, 0x67, 0x32, 0xab, 0x68, 0x5d, 0xd9, 0x61, 0xef, 0x80, 0x6d, 0x61, 0x79,
+	0x92, 0x50, 0xbf, 0xd7, 0x4e, 0xe9, 0x28, 0x64, 0x19, 0xe7, 0x47, 0xe2, 0x18, 0x98, 0xea, 0xb2,
+	0x8c, 0x3e, 0x03, 0x1b, 0x24, 0x2b, 0x5d, 0x24, 0xcb, 0x9a, 0x80, 0xf8, 0xdf, 0x42, 0x59, 0xcc,
+	0xcb, 0xac, 0x52, 0x0b, 0x42, 0xde, 0x1b, 0x7a, 0xc8, 0xa7, 0x11, 0xf6, 0x05, 0x97, 0xfc, 0x34,
+	0xd8, 0xe5, 0x15, 0xe6, 0xe3, 0x84, 0x30, 0x74, 0x4c, 0xfc, 0x6e, 0x89, 0xac, 0x46, 0x34, 0x1f,
+	0x0b, 0xe0, 0xaf, 0xc8, 0x86, 0xb7, 0x3a, 0x28, 0xe6, 0xf0, 0xb0, 0xae, 0xbe, 0xda, 0xd7, 0x59,
+	0x19, 0x7b, 0x3f, 0x50, 0xe6, 0x97, 0xb0, 0x77, 0x6f, 0x9e, 0xde, 0xee, 0x0b, 0x16, 0x34, 0xb1,
+	0x72, 0x2d, 0xf9, 0xa4, 0xe0, 0x83, 0x0e, 0x4a, 0x6b, 0x63, 0x80, 0xce, 0x37, 0x21, 0xea, 0x89,
+	0x1a, 0xcd, 0xdf, 0xb4, 0x48, 0x40, 0x24, 0x00, 0xeb, 0xb0, 0xa6, 0x06, 0x5c, 0xdf, 0x40, 0xeb,
+	0x74, 0x32, 0xb7, 0xf4, 0xe9, 0xdc, 0xd2, 0x5f, 0xe7, 0x96, 0x7e, 0xb7, 0xb0, 0xb4, 0xe9, 0xc2,
+	0xd2, 0x9e, 0x17, 0x96, 0x76, 0xbe, 0xff, 0x69, 0x1b, 0xd2, 0xab, 0xd1, 0x77, 0x3d, 0xb6, 0x34,
+	0x1e, 0x39, 0x87, 0xf8, 0x3a, 0xb7, 0x17, 0xbb, 0xf1, 0x8a, 0xe2, 0x41, 0x1e, 0xbc, 0x07, 0x00,
+	0x00, 0xff, 0xff, 0x00, 0xae, 0x8e, 0xa0, 0x1f, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/pool-incentives/client/cli/query.go b/x/pool-incentives/client/cli/query.go
index da3eda0fbf9..df546690de1 100644
--- a/x/pool-incentives/client/cli/query.go
+++ b/x/pool-incentives/client/cli/query.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/pool-incentives/client/cli/query_test.go b/x/pool-incentives/client/cli/query_test.go
index 6d483820ad9..d64c982dfeb 100644
--- a/x/pool-incentives/client/cli/query_test.go
+++ b/x/pool-incentives/client/cli/query_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/pool-incentives/client/cli/tx.go b/x/pool-incentives/client/cli/tx.go
index 3072033a2bd..70985a8be8e 100644
--- a/x/pool-incentives/client/cli/tx.go
+++ b/x/pool-incentives/client/cli/tx.go
@@ -13,7 +13,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 func NewCmdSubmitUpdatePoolIncentivesProposal() *cobra.Command {
diff --git a/x/pool-incentives/client/proposal_handler.go b/x/pool-incentives/client/proposal_handler.go
index 83d62bd5110..922110f7654 100644
--- a/x/pool-incentives/client/proposal_handler.go
+++ b/x/pool-incentives/client/proposal_handler.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/client/rest"
 
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
diff --git a/x/pool-incentives/client/rest/tx.go b/x/pool-incentives/client/rest/tx.go
index efd9e1f64f8..d8727f75b8b 100644
--- a/x/pool-incentives/client/rest/tx.go
+++ b/x/pool-incentives/client/rest/tx.go
@@ -10,7 +10,7 @@ import (
 	govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 type UpdatePoolIncentivesRequest struct {
diff --git a/x/pool-incentives/handler.go b/x/pool-incentives/handler.go
index 6acae137ea8..02936a52ade 100644
--- a/x/pool-incentives/handler.go
+++ b/x/pool-incentives/handler.go
@@ -7,8 +7,8 @@ import (
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 // NewPoolIncentivesProposalHandler is a handler for governance proposals on new pool incentives.
diff --git a/x/pool-incentives/keeper/distr.go b/x/pool-incentives/keeper/distr.go
index 5d8a98db5ac..d7b32e3eeda 100644
--- a/x/pool-incentives/keeper/distr.go
+++ b/x/pool-incentives/keeper/distr.go
@@ -7,7 +7,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/pool-incentives/keeper/distr_test.go b/x/pool-incentives/keeper/distr_test.go
index 18d87b263e2..b49aeed950c 100644
--- a/x/pool-incentives/keeper/distr_test.go
+++ b/x/pool-incentives/keeper/distr_test.go
@@ -1,7 +1,7 @@
 package keeper_test
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/pool-incentives/keeper/genesis.go b/x/pool-incentives/keeper/genesis.go
index d44883f13e9..2d48a2f4c61 100644
--- a/x/pool-incentives/keeper/genesis.go
+++ b/x/pool-incentives/keeper/genesis.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) {
diff --git a/x/pool-incentives/keeper/genesis_test.go b/x/pool-incentives/keeper/genesis_test.go
index d2f3f930571..c86de1ddd54 100644
--- a/x/pool-incentives/keeper/genesis_test.go
+++ b/x/pool-incentives/keeper/genesis_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	pool_incentives "github.com/osmosis-labs/osmosis/v15/x/pool-incentives"
+	pool_incentives "github.com/osmosis-labs/osmosis/v16/x/pool-incentives"
 
-	simapp "github.com/osmosis-labs/osmosis/v15/app"
+	simapp "github.com/osmosis-labs/osmosis/v16/app"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var (
diff --git a/x/pool-incentives/keeper/gov.go b/x/pool-incentives/keeper/gov.go
index 4136b41e920..dc92e6f8555 100644
--- a/x/pool-incentives/keeper/gov.go
+++ b/x/pool-incentives/keeper/gov.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 func (k Keeper) HandleReplacePoolIncentivesProposal(ctx sdk.Context, p *types.ReplacePoolIncentivesProposal) error {
diff --git a/x/pool-incentives/keeper/grpc_query.go b/x/pool-incentives/keeper/grpc_query.go
index a471665da02..f8b5ea7e36a 100644
--- a/x/pool-incentives/keeper/grpc_query.go
+++ b/x/pool-incentives/keeper/grpc_query.go
@@ -9,8 +9,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	incentivetypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	incentivetypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/pool-incentives/keeper/grpc_query_test.go b/x/pool-incentives/keeper/grpc_query_test.go
index f208134c68a..e963c422d02 100644
--- a/x/pool-incentives/keeper/grpc_query_test.go
+++ b/x/pool-incentives/keeper/grpc_query_test.go
@@ -7,8 +7,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var (
diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go
index fe3d5494154..7be39ec2a03 100644
--- a/x/pool-incentives/keeper/hooks.go
+++ b/x/pool-incentives/keeper/hooks.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
 )
 
 type Hooks struct {
diff --git a/x/pool-incentives/keeper/keeper.go b/x/pool-incentives/keeper/keeper.go
index 48ece964e9c..0ce1db2067c 100644
--- a/x/pool-incentives/keeper/keeper.go
+++ b/x/pool-incentives/keeper/keeper.go
@@ -7,16 +7,16 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type Keeper struct {
diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go
index 100ae8e2be6..015ee9edd06 100644
--- a/x/pool-incentives/keeper/keeper_test.go
+++ b/x/pool-incentives/keeper/keeper_test.go
@@ -7,13 +7,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/pool-incentives/keeper/params.go b/x/pool-incentives/keeper/params.go
index b61d724b652..470237af420 100644
--- a/x/pool-incentives/keeper/params.go
+++ b/x/pool-incentives/keeper/params.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
diff --git a/x/pool-incentives/module.go b/x/pool-incentives/module.go
index 3cc9df35d24..709105370d9 100644
--- a/x/pool-incentives/module.go
+++ b/x/pool-incentives/module.go
@@ -29,9 +29,9 @@ import (
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/gov/simulation"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 var (
diff --git a/x/pool-incentives/types/expected_keepers.go b/x/pool-incentives/types/expected_keepers.go
index d364814146d..626bd427feb 100644
--- a/x/pool-incentives/types/expected_keepers.go
+++ b/x/pool-incentives/types/expected_keepers.go
@@ -7,9 +7,9 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/pool-incentives/types/genesis.pb.go b/x/pool-incentives/types/genesis.pb.go
index 05b76a02a9e..5384ba5bf01 100644
--- a/x/pool-incentives/types/genesis.pb.go
+++ b/x/pool-incentives/types/genesis.pb.go
@@ -109,29 +109,29 @@ var fileDescriptor_cc1f078212600632 = []byte{
 	// 393 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcd, 0xaa, 0xd3, 0x40,
 	0x14, 0xc7, 0x13, 0x7b, 0xb9, 0x60, 0xee, 0x45, 0xb8, 0x41, 0x21, 0x2d, 0x38, 0x29, 0x01, 0xa5,
-	0x82, 0x9d, 0xb1, 0x15, 0x37, 0xba, 0x0b, 0x85, 0xe2, 0x4e, 0xa2, 0x6e, 0xdc, 0x84, 0x49, 0x3a,
-	0x1d, 0x07, 0x93, 0x9c, 0x98, 0x99, 0x14, 0xfb, 0x16, 0x2e, 0xdd, 0xf8, 0x3e, 0x5d, 0x76, 0xe9,
-	0x2a, 0x4a, 0xfb, 0x06, 0x7d, 0x02, 0xc9, 0x24, 0xa1, 0x95, 0x82, 0xdd, 0x65, 0x38, 0xbf, 0xff,
-	0xc7, 0x39, 0xc4, 0x1a, 0x83, 0x4c, 0x41, 0x0a, 0x49, 0x72, 0x80, 0x64, 0x2c, 0xb2, 0x98, 0x65,
-	0x4a, 0xac, 0x98, 0x24, 0xab, 0x49, 0xc4, 0x14, 0x9d, 0x10, 0xce, 0x32, 0x26, 0x85, 0xc4, 0x79,
-	0x01, 0x0a, 0x6c, 0xd4, 0xe2, 0xb8, 0xc6, 0x8f, 0x34, 0x6e, 0xe9, 0xc1, 0x43, 0x0e, 0x1c, 0x34,
-	0x4a, 0xea, 0xaf, 0x46, 0x35, 0x40, 0x1c, 0x80, 0x27, 0x8c, 0xe8, 0x57, 0x54, 0x2e, 0xc9, 0xa2,
-	0x2c, 0xa8, 0x12, 0x90, 0xb5, 0xf3, 0x17, 0x97, 0x4a, 0x9c, 0x24, 0x69, 0x85, 0xf7, 0xb3, 0x67,
-	0xdd, 0xce, 0x9b, 0x66, 0xef, 0x15, 0x55, 0xcc, 0x9e, 0x59, 0xd7, 0x39, 0x2d, 0x68, 0x2a, 0x1d,
-	0x73, 0x68, 0x8e, 0x6e, 0xa6, 0x4f, 0xf1, 0xff, 0x9b, 0xe2, 0x77, 0x9a, 0xf6, 0xaf, 0x36, 0x95,
-	0x6b, 0x04, 0xad, 0xd6, 0x06, 0xcb, 0x4e, 0x20, 0xfe, 0x42, 0xa3, 0x84, 0x85, 0x5d, 0x47, 0xe9,
-	0xdc, 0x1b, 0xf6, 0x46, 0x37, 0xd3, 0x3e, 0x6e, 0xb6, 0xc0, 0xdd, 0x16, 0x78, 0xd6, 0x12, 0xfe,
-	0x93, 0xda, 0xe4, 0x50, 0xb9, 0xfd, 0x35, 0x4d, 0x93, 0xd7, 0xde, 0xb9, 0x85, 0xf7, 0xe3, 0xb7,
-	0x6b, 0x06, 0x77, 0xdd, 0xa0, 0x13, 0x4a, 0x3b, 0xb6, 0xac, 0x85, 0x90, 0xaa, 0x08, 0x45, 0xb6,
-	0x04, 0xa7, 0xa7, 0xab, 0x3f, 0xbb, 0x54, 0x7d, 0x56, 0x2b, 0xde, 0x66, 0x4b, 0xf0, 0xfb, 0x9b,
-	0xca, 0x35, 0x0f, 0x95, 0x7b, 0xd7, 0x04, 0x1f, 0xad, 0xbc, 0xe0, 0xfe, 0xa2, 0xa3, 0xec, 0xaf,
-	0xd6, 0x83, 0xda, 0x29, 0x54, 0x10, 0x72, 0x5a, 0x72, 0x26, 0x9d, 0x2b, 0x1d, 0xf4, 0xfc, 0xe2,
-	0x8d, 0x00, 0x92, 0x0f, 0x30, 0xd7, 0x1a, 0xff, 0x71, 0x9b, 0xf5, 0xa8, 0xc9, 0xfa, 0xd7, 0xd1,
-	0x0b, 0x6e, 0xf3, 0x53, 0xf8, 0xe3, 0x66, 0x87, 0xcc, 0xed, 0x0e, 0x99, 0x7f, 0x76, 0xc8, 0xfc,
-	0xbe, 0x47, 0xc6, 0x76, 0x8f, 0x8c, 0x5f, 0x7b, 0x64, 0x7c, 0x7a, 0xc3, 0x85, 0xfa, 0x5c, 0x46,
-	0x38, 0x86, 0x94, 0xb4, 0xf1, 0xe3, 0x84, 0x46, 0xb2, 0x7b, 0x90, 0xd5, 0xe4, 0x15, 0xf9, 0x76,
-	0xf6, 0x27, 0xa8, 0x75, 0xce, 0x64, 0x74, 0xad, 0x6f, 0xff, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0xaf, 0x6b, 0x14, 0x4b, 0xb6, 0x02, 0x00, 0x00,
+	0x82, 0x9d, 0xb1, 0x15, 0x5c, 0xe8, 0x2e, 0x14, 0x8a, 0x3b, 0x89, 0xba, 0x71, 0x13, 0x26, 0xe9,
+	0x74, 0x1c, 0x4c, 0x72, 0x62, 0x66, 0x52, 0xec, 0x5b, 0xb8, 0x74, 0xe3, 0xfb, 0x74, 0xd9, 0xa5,
+	0xab, 0x28, 0xed, 0x1b, 0xf4, 0x09, 0x24, 0x93, 0x84, 0x56, 0x0a, 0x76, 0x97, 0xe1, 0xfc, 0xfe,
+	0x1f, 0xe7, 0x10, 0x6b, 0x0c, 0x32, 0x05, 0x29, 0x24, 0xc9, 0x01, 0x92, 0xb1, 0xc8, 0x62, 0x96,
+	0x29, 0xb1, 0x62, 0x92, 0xac, 0x26, 0x11, 0x53, 0x74, 0x42, 0x38, 0xcb, 0x98, 0x14, 0x12, 0xe7,
+	0x05, 0x28, 0xb0, 0x51, 0x8b, 0xe3, 0x1a, 0x3f, 0xd2, 0xb8, 0xa5, 0x07, 0x0f, 0x39, 0x70, 0xd0,
+	0x28, 0xa9, 0xbf, 0x1a, 0xd5, 0x00, 0x71, 0x00, 0x9e, 0x30, 0xa2, 0x5f, 0x51, 0xb9, 0x24, 0x8b,
+	0xb2, 0xa0, 0x4a, 0x40, 0xd6, 0xce, 0x5f, 0x5c, 0x2a, 0x71, 0x92, 0xa4, 0x15, 0xde, 0xcf, 0x9e,
+	0x75, 0x3b, 0x6f, 0x9a, 0xbd, 0x57, 0x54, 0x31, 0x7b, 0x66, 0x5d, 0xe7, 0xb4, 0xa0, 0xa9, 0x74,
+	0xcc, 0xa1, 0x39, 0xba, 0x99, 0x3e, 0xc5, 0xff, 0x6f, 0x8a, 0xdf, 0x69, 0xda, 0xbf, 0xda, 0x54,
+	0xae, 0x11, 0xb4, 0x5a, 0x1b, 0x2c, 0x3b, 0x81, 0xf8, 0x0b, 0x8d, 0x12, 0x16, 0x76, 0x1d, 0xa5,
+	0x73, 0x6f, 0xd8, 0x1b, 0xdd, 0x4c, 0xfb, 0xb8, 0xd9, 0x02, 0x77, 0x5b, 0xe0, 0x59, 0x4b, 0xf8,
+	0x4f, 0x6a, 0x93, 0x43, 0xe5, 0xf6, 0xd7, 0x34, 0x4d, 0x5e, 0x7b, 0xe7, 0x16, 0xde, 0x8f, 0xdf,
+	0xae, 0x19, 0xdc, 0x75, 0x83, 0x4e, 0x28, 0xed, 0xd8, 0xb2, 0x16, 0x42, 0xaa, 0x22, 0x14, 0xd9,
+	0x12, 0x9c, 0x9e, 0xae, 0xfe, 0xec, 0x52, 0xf5, 0x59, 0xad, 0x78, 0x9b, 0x2d, 0xc1, 0xef, 0x6f,
+	0x2a, 0xd7, 0x3c, 0x54, 0xee, 0x5d, 0x13, 0x7c, 0xb4, 0xf2, 0x82, 0xfb, 0x8b, 0x8e, 0xb2, 0xbf,
+	0x5a, 0x0f, 0x6a, 0xa7, 0x50, 0x41, 0xc8, 0x69, 0xc9, 0x99, 0x74, 0xae, 0x74, 0xd0, 0xf3, 0x8b,
+	0x37, 0x02, 0x48, 0x3e, 0xc0, 0x5c, 0x6b, 0xfc, 0xc7, 0x6d, 0xd6, 0xa3, 0x26, 0xeb, 0x5f, 0x47,
+	0x2f, 0xb8, 0xcd, 0x4f, 0xe1, 0x8f, 0x9b, 0x1d, 0x32, 0xb7, 0x3b, 0x64, 0xfe, 0xd9, 0x21, 0xf3,
+	0xfb, 0x1e, 0x19, 0xdb, 0x3d, 0x32, 0x7e, 0xed, 0x91, 0xf1, 0xe9, 0x0d, 0x17, 0xea, 0x73, 0x19,
+	0xe1, 0x18, 0x52, 0xd2, 0xc6, 0x8f, 0x13, 0x1a, 0xc9, 0xee, 0x41, 0x56, 0x93, 0x57, 0xe4, 0xdb,
+	0xd9, 0x9f, 0xa0, 0xd6, 0x39, 0x93, 0xd1, 0xb5, 0xbe, 0xfd, 0xcb, 0xbf, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0xba, 0xda, 0x03, 0x10, 0xb6, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/pool-incentives/types/genesis_test.go b/x/pool-incentives/types/genesis_test.go
index 97122bdcaae..fb36582c0ae 100644
--- a/x/pool-incentives/types/genesis_test.go
+++ b/x/pool-incentives/types/genesis_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	proto "github.com/gogo/protobuf/proto"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/pool-incentives/types/gov.pb.go b/x/pool-incentives/types/gov.pb.go
index 5acf8c0d50a..f964c6d0362 100644
--- a/x/pool-incentives/types/gov.pb.go
+++ b/x/pool-incentives/types/gov.pb.go
@@ -146,9 +146,9 @@ var fileDescriptor_96caede426ba9516 = []byte{
 	0x9a, 0xdf, 0x55, 0x60, 0x7e, 0xc7, 0xe7, 0x33, 0xa7, 0xd0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c,
 	0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e,
 	0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
-	0x87, 0x1a, 0xa5, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xea, 0x57, 0x60,
+	0x87, 0x1a, 0xa5, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xe9, 0x57, 0x60,
 	0xa4, 0xb0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xaa, 0x32, 0x06, 0x04, 0x00, 0x00,
-	0xff, 0xff, 0xe0, 0xab, 0x86, 0x80, 0x18, 0x03, 0x00, 0x00,
+	0xff, 0xff, 0xf5, 0x1a, 0x91, 0xdb, 0x18, 0x03, 0x00, 0x00,
 }
 
 func (this *ReplacePoolIncentivesProposal) Equal(that interface{}) bool {
diff --git a/x/pool-incentives/types/gov_test.go b/x/pool-incentives/types/gov_test.go
index 70c5b9e8120..6cc9dd7eba8 100644
--- a/x/pool-incentives/types/gov_test.go
+++ b/x/pool-incentives/types/gov_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	proto "github.com/gogo/protobuf/proto"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/pool-incentives/types/incentives.pb.go b/x/pool-incentives/types/incentives.pb.go
index c944f547097..4ff05ae2751 100644
--- a/x/pool-incentives/types/incentives.pb.go
+++ b/x/pool-incentives/types/incentives.pb.go
@@ -327,43 +327,43 @@ func init() {
 }
 
 var fileDescriptor_a8153bad03e553d1 = []byte{
-	// 565 bytes of a gzipped FileDescriptorProto
+	// 566 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xbf, 0x6f, 0xd3, 0x40,
 	0x14, 0xc7, 0x73, 0x6d, 0x94, 0xb4, 0xe7, 0xf0, 0xcb, 0x05, 0x91, 0x16, 0xc9, 0x8e, 0x4e, 0x02,
-	0x55, 0x8a, 0x62, 0x13, 0x10, 0x4b, 0xd8, 0xa2, 0x00, 0x0a, 0x30, 0x54, 0x16, 0x15, 0x12, 0x4b,
-	0x64, 0xc7, 0x57, 0xc7, 0xaa, 0xed, 0x17, 0xf9, 0x2e, 0x81, 0xfe, 0x07, 0x48, 0x2c, 0x8c, 0x1d,
-	0xfb, 0x7f, 0xb0, 0x31, 0x75, 0xec, 0x88, 0x18, 0x0c, 0x4a, 0x16, 0xe6, 0xfc, 0x05, 0xc8, 0xe7,
-	0x33, 0x39, 0x51, 0xa9, 0x82, 0x29, 0xf7, 0xfc, 0xee, 0xfb, 0xde, 0xe7, 0xfb, 0xde, 0x29, 0xf8,
-	0x21, 0xb0, 0x18, 0x58, 0xc8, 0xec, 0x29, 0x40, 0xd4, 0x09, 0x93, 0x31, 0x4d, 0x78, 0x38, 0xa7,
-	0xcc, 0x9e, 0x77, 0x3d, 0xca, 0xdd, 0xae, 0xbd, 0xfe, 0x64, 0x4d, 0x53, 0xe0, 0xa0, 0x1b, 0x52,
-	0x61, 0xe5, 0x0a, 0x25, 0x2b, 0x05, 0x7b, 0xb7, 0x03, 0x08, 0x40, 0x5c, 0xb5, 0xf3, 0x53, 0xa1,
-	0xda, 0x33, 0x02, 0x80, 0x20, 0xa2, 0xb6, 0x88, 0xbc, 0xd9, 0x91, 0xed, 0xcf, 0x52, 0x97, 0x87,
-	0x90, 0x14, 0x79, 0xf2, 0x12, 0xd7, 0x0e, 0xdc, 0xd4, 0x8d, 0x99, 0xde, 0xc3, 0x8d, 0x38, 0x4c,
-	0x38, 0xf5, 0x47, 0x3e, 0x4d, 0x20, 0x6e, 0xa2, 0x16, 0xda, 0xdf, 0xee, 0xdf, 0x5d, 0x65, 0xe6,
-	0xce, 0x89, 0x1b, 0x47, 0x3d, 0xa2, 0x66, 0x89, 0xa3, 0x15, 0xe1, 0x20, 0x8f, 0x7a, 0xd5, 0xd3,
-	0x33, 0xb3, 0x42, 0x3e, 0x22, 0x7c, 0xe7, 0x35, 0x8c, 0x8f, 0x5d, 0x2f, 0xa2, 0x03, 0xd9, 0x86,
-	0x0d, 0x93, 0x23, 0xd0, 0x01, 0xeb, 0x91, 0x4c, 0x8c, 0x4a, 0x00, 0xd6, 0x44, 0xad, 0xcd, 0x7d,
-	0xed, 0xd1, 0xae, 0x55, 0x20, 0x5a, 0x25, 0xa2, 0x55, 0x6a, 0xfb, 0xf7, 0xcf, 0x33, 0xb3, 0xb2,
-	0xca, 0xcc, 0xdd, 0x02, 0xe0, 0x72, 0x09, 0x72, 0xfa, 0xc3, 0x44, 0xce, 0xad, 0xe8, 0xef, 0xa6,
-	0xe4, 0x2b, 0xc2, 0xdb, 0x83, 0x90, 0xf1, 0x54, 0xb4, 0x9f, 0xe0, 0x06, 0x07, 0xee, 0x46, 0xa3,
-	0xf7, 0x34, 0x0c, 0x26, 0x5c, 0x5a, 0x7b, 0x96, 0x57, 0xff, 0x9e, 0x99, 0x0f, 0x82, 0x90, 0x4f,
-	0x66, 0x9e, 0x35, 0x86, 0xd8, 0x1e, 0x8b, 0x21, 0xcb, 0x9f, 0x0e, 0xf3, 0x8f, 0x6d, 0x7e, 0x32,
-	0xa5, 0xcc, 0x1a, 0x26, 0x7c, 0x3d, 0x08, 0xb5, 0x16, 0x71, 0x34, 0x11, 0xbe, 0x15, 0x91, 0xfe,
-	0x0a, 0xd7, 0x53, 0x3a, 0x86, 0xd4, 0x67, 0xcd, 0x0d, 0xe1, 0xae, 0x6d, 0x5d, 0xbd, 0x36, 0x4b,
-	0x50, 0x3a, 0x42, 0xd3, 0xaf, 0xe6, 0x44, 0x4e, 0x59, 0x81, 0x7c, 0x42, 0x58, 0x53, 0xd2, 0xba,
-	0x85, 0xb7, 0x02, 0x77, 0x16, 0xd0, 0x51, 0xe8, 0x0b, 0x0b, 0xd5, 0xfe, 0xce, 0x2a, 0x33, 0x6f,
-	0x14, 0x50, 0x65, 0x86, 0x38, 0x75, 0x71, 0x1c, 0xfa, 0xfa, 0x73, 0x5c, 0x93, 0x86, 0x37, 0x84,
-	0x61, 0xeb, 0xff, 0x0c, 0x3b, 0x52, 0xdd, 0xab, 0xfe, 0x3a, 0x33, 0x11, 0xf9, 0x82, 0xb0, 0x76,
-	0x00, 0x10, 0xbd, 0x81, 0x17, 0x79, 0x7d, 0xbd, 0x8d, 0xeb, 0xb9, 0xa5, 0x35, 0x8c, 0xbe, 0xca,
-	0xcc, 0xeb, 0x05, 0x8c, 0x4c, 0x10, 0xa7, 0x96, 0x9f, 0x86, 0xbe, 0xde, 0x56, 0xd0, 0x37, 0xc4,
-	0xed, 0x9b, 0xab, 0xcc, 0x6c, 0x28, 0xe8, 0x0a, 0xb7, 0x83, 0xb7, 0xca, 0x0d, 0x37, 0x37, 0x5b,
-	0xe8, 0xea, 0x37, 0x72, 0x4f, 0xbe, 0x11, 0x39, 0x86, 0x52, 0x58, 0xbc, 0x8c, 0x3f, 0x75, 0x08,
-	0xc5, 0x0d, 0x05, 0x9e, 0xe9, 0x87, 0xf8, 0x9a, 0x80, 0xe4, 0x30, 0x12, 0x6d, 0xff, 0x75, 0x5d,
-	0x4a, 0x11, 0xb9, 0x2e, 0x6d, 0xaa, 0x7c, 0x3a, 0x3c, 0x5f, 0x18, 0xe8, 0x62, 0x61, 0xa0, 0x9f,
-	0x0b, 0x03, 0x7d, 0x5e, 0x1a, 0x95, 0x8b, 0xa5, 0x51, 0xf9, 0xb6, 0x34, 0x2a, 0xef, 0x9e, 0x2a,
-	0x43, 0x97, 0x3d, 0x3a, 0x91, 0xeb, 0xb1, 0x32, 0xb0, 0xe7, 0xdd, 0x27, 0xf6, 0x87, 0x4b, 0x7f,
-	0x07, 0x62, 0x1b, 0x5e, 0x4d, 0xf8, 0x7e, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x5a, 0x9e,
-	0x3b, 0x36, 0x04, 0x00, 0x00,
+	0x55, 0x8a, 0x62, 0x13, 0x90, 0x18, 0xc2, 0x16, 0x05, 0x50, 0x80, 0xa1, 0xb2, 0xa8, 0x90, 0x58,
+	0x22, 0x3b, 0xbe, 0x3a, 0x56, 0x6d, 0xbf, 0xc8, 0x77, 0x09, 0xf4, 0x3f, 0x40, 0x62, 0x61, 0xec,
+	0xd8, 0xff, 0x83, 0x8d, 0xa9, 0x63, 0x47, 0xc4, 0x60, 0x50, 0xb2, 0x30, 0xe7, 0x2f, 0x40, 0x3e,
+	0x9f, 0xc9, 0x89, 0x4a, 0x15, 0x4c, 0xb9, 0xe7, 0x77, 0xdf, 0xf7, 0x3e, 0xdf, 0xf7, 0x4e, 0xc1,
+	0x0f, 0x81, 0xc5, 0xc0, 0x42, 0x66, 0x4f, 0x01, 0xa2, 0x4e, 0x98, 0x8c, 0x69, 0xc2, 0xc3, 0x39,
+	0x65, 0xf6, 0xbc, 0xeb, 0x51, 0xee, 0x76, 0xed, 0xf5, 0x27, 0x6b, 0x9a, 0x02, 0x07, 0xdd, 0x90,
+	0x0a, 0x2b, 0x57, 0x28, 0x59, 0x29, 0xd8, 0xbb, 0x1d, 0x40, 0x00, 0xe2, 0xaa, 0x9d, 0x9f, 0x0a,
+	0xd5, 0x9e, 0x11, 0x00, 0x04, 0x11, 0xb5, 0x45, 0xe4, 0xcd, 0x8e, 0x6c, 0x7f, 0x96, 0xba, 0x3c,
+	0x84, 0xa4, 0xc8, 0x93, 0x97, 0xb8, 0x76, 0xe0, 0xa6, 0x6e, 0xcc, 0xf4, 0x1e, 0x6e, 0xc4, 0x61,
+	0xc2, 0xa9, 0x3f, 0xf2, 0x69, 0x02, 0x71, 0x13, 0xb5, 0xd0, 0xfe, 0x76, 0xff, 0xee, 0x2a, 0x33,
+	0x77, 0x4e, 0xdc, 0x38, 0xea, 0x11, 0x35, 0x4b, 0x1c, 0xad, 0x08, 0x07, 0x79, 0xd4, 0xab, 0x9e,
+	0x9e, 0x99, 0x15, 0xf2, 0x11, 0xe1, 0x3b, 0xaf, 0x61, 0x7c, 0xec, 0x7a, 0x11, 0x1d, 0xc8, 0x36,
+	0x6c, 0x98, 0x1c, 0x81, 0x0e, 0x58, 0x8f, 0x64, 0x62, 0x54, 0x02, 0xb0, 0x26, 0x6a, 0x6d, 0xee,
+	0x6b, 0x8f, 0x76, 0xad, 0x02, 0xd1, 0x2a, 0x11, 0xad, 0x52, 0xdb, 0xbf, 0x7f, 0x9e, 0x99, 0x95,
+	0x55, 0x66, 0xee, 0x16, 0x00, 0x97, 0x4b, 0x90, 0xd3, 0x1f, 0x26, 0x72, 0x6e, 0x45, 0x7f, 0x37,
+	0x25, 0x5f, 0x11, 0xde, 0x1e, 0x84, 0x8c, 0xa7, 0xa2, 0xfd, 0x04, 0x37, 0x38, 0x70, 0x37, 0x1a,
+	0xbd, 0xa7, 0x61, 0x30, 0xe1, 0xd2, 0xda, 0xb3, 0xbc, 0xfa, 0xf7, 0xcc, 0x7c, 0x10, 0x84, 0x7c,
+	0x32, 0xf3, 0xac, 0x31, 0xc4, 0xf6, 0x58, 0x0c, 0x59, 0xfe, 0x74, 0x98, 0x7f, 0x6c, 0xf3, 0x93,
+	0x29, 0x65, 0xd6, 0x30, 0xe1, 0xeb, 0x41, 0xa8, 0xb5, 0x88, 0xa3, 0x89, 0xf0, 0xad, 0x88, 0xf4,
+	0x57, 0xb8, 0x9e, 0xd2, 0x31, 0xa4, 0x3e, 0x6b, 0x6e, 0x08, 0x77, 0x6d, 0xeb, 0xea, 0xb5, 0x59,
+	0x82, 0xd2, 0x11, 0x9a, 0x7e, 0x35, 0x27, 0x72, 0xca, 0x0a, 0xe4, 0x13, 0xc2, 0x9a, 0x92, 0xd6,
+	0x2d, 0xbc, 0x15, 0xb8, 0xb3, 0x80, 0x8e, 0x42, 0x5f, 0x58, 0xa8, 0xf6, 0x77, 0x56, 0x99, 0x79,
+	0xa3, 0x80, 0x2a, 0x33, 0xc4, 0xa9, 0x8b, 0xe3, 0xd0, 0xd7, 0x9f, 0xe3, 0x9a, 0x34, 0xbc, 0x21,
+	0x0c, 0x5b, 0xff, 0x67, 0xd8, 0x91, 0xea, 0x5e, 0xf5, 0xd7, 0x99, 0x89, 0xc8, 0x17, 0x84, 0xb5,
+	0x03, 0x80, 0xe8, 0x0d, 0xbc, 0xc8, 0xeb, 0xeb, 0x6d, 0x5c, 0xcf, 0x2d, 0xad, 0x61, 0xf4, 0x55,
+	0x66, 0x5e, 0x2f, 0x60, 0x64, 0x82, 0x38, 0xb5, 0xfc, 0x34, 0xf4, 0xf5, 0xb6, 0x82, 0xbe, 0x21,
+	0x6e, 0xdf, 0x5c, 0x65, 0x66, 0x43, 0x41, 0x57, 0xb8, 0x1d, 0xbc, 0x55, 0x6e, 0xb8, 0xb9, 0xd9,
+	0x42, 0x57, 0xbf, 0x91, 0x7b, 0xf2, 0x8d, 0xc8, 0x31, 0x94, 0xc2, 0xe2, 0x65, 0xfc, 0xa9, 0x43,
+	0x28, 0x6e, 0x28, 0xf0, 0x4c, 0x3f, 0xc4, 0xd7, 0x04, 0x24, 0x87, 0x91, 0x68, 0xfb, 0xaf, 0xeb,
+	0x52, 0x8a, 0xc8, 0x75, 0x69, 0x53, 0xe5, 0xd3, 0xe1, 0xf9, 0xc2, 0x40, 0x17, 0x0b, 0x03, 0xfd,
+	0x5c, 0x18, 0xe8, 0xf3, 0xd2, 0xa8, 0x5c, 0x2c, 0x8d, 0xca, 0xb7, 0xa5, 0x51, 0x79, 0xf7, 0x54,
+	0x19, 0xba, 0xec, 0xd1, 0x89, 0x5c, 0x8f, 0x95, 0x81, 0x3d, 0xef, 0x3e, 0xb1, 0x3f, 0x5c, 0xfa,
+	0x3b, 0x10, 0xdb, 0xf0, 0x6a, 0xc2, 0xf7, 0xe3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xef, 0xeb,
+	0x89, 0x60, 0x36, 0x04, 0x00, 0x00,
 }
 
 func (this *DistrRecord) Equal(that interface{}) bool {
diff --git a/x/pool-incentives/types/incentives_test.go b/x/pool-incentives/types/incentives_test.go
index 2c56ff07c31..136cd604145 100644
--- a/x/pool-incentives/types/incentives_test.go
+++ b/x/pool-incentives/types/incentives_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	proto "github.com/gogo/protobuf/proto"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/pool-incentives/types/query.pb.go b/x/pool-incentives/types/query.pb.go
index 13b1c4bbf32..d3ecac3d174 100644
--- a/x/pool-incentives/types/query.pb.go
+++ b/x/pool-incentives/types/query.pb.go
@@ -11,7 +11,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -671,7 +671,7 @@ var fileDescriptor_302873ecccbc7636 = []byte{
 	// 923 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x41, 0x6f, 0x1b, 0x45,
 	0x14, 0xce, 0x34, 0x21, 0x4d, 0x26, 0x12, 0xd4, 0x93, 0x40, 0x9c, 0x15, 0xac, 0xc3, 0xd0, 0x42,
-	0xaa, 0x28, 0xbb, 0x8d, 0xdd, 0xf4, 0xd0, 0x06, 0x90, 0xdc, 0x20, 0x14, 0x89, 0x43, 0x58, 0x09,
+	0xaa, 0x28, 0xbb, 0x8d, 0xdd, 0xe6, 0xd0, 0x06, 0x90, 0xdc, 0x20, 0x14, 0x89, 0x43, 0x58, 0x09,
 	0x21, 0xc1, 0xc1, 0x5a, 0x67, 0x27, 0x9b, 0x11, 0xeb, 0x1d, 0xd7, 0xb3, 0x0e, 0x0d, 0xa8, 0x97,
 	0x4a, 0xdc, 0x41, 0x5c, 0x38, 0x23, 0x7a, 0xe6, 0xc4, 0x3f, 0xe0, 0xd0, 0x1b, 0x95, 0xb8, 0x70,
 	0xc1, 0xa0, 0x84, 0x03, 0x67, 0xff, 0x02, 0xb4, 0xb3, 0x6f, 0x36, 0xf6, 0x6e, 0xec, 0xb5, 0xc3,
@@ -711,14 +711,14 @@ var fileDescriptor_302873ecccbc7636 = []byte{
 	0x85, 0xdf, 0x52, 0x34, 0x3f, 0x78, 0x1c, 0xb1, 0x4e, 0xe8, 0x06, 0xe9, 0x63, 0x54, 0x26, 0x32,
 	0xb0, 0xe1, 0x37, 0xc7, 0xa7, 0x81, 0xa6, 0x1a, 0x9e, 0xf3, 0xdc, 0xc8, 0x4d, 0x57, 0x4b, 0x8b,
 	0x18, 0x10, 0xa0, 0x2a, 0x60, 0xc7, 0x55, 0x72, 0xf5, 0xd9, 0x22, 0x7e, 0x49, 0xa1, 0x93, 0x5f,
-	0x10, 0x5e, 0xd0, 0x06, 0x49, 0xee, 0x4e, 0xe9, 0xa7, 0x8a, 0xa9, 0xb1, 0x73, 0x25, 0x17, 0xa6,
-	0xbb, 0x4f, 0x7f, 0xff, 0xe7, 0xfb, 0x6b, 0xf7, 0xc8, 0x5d, 0xbb, 0xe8, 0x87, 0x47, 0x4d, 0x78,
+	0x10, 0x5e, 0xd0, 0x06, 0x49, 0xee, 0x4e, 0xe9, 0xa7, 0x8a, 0xa9, 0x71, 0xef, 0x4a, 0x2e, 0x4c,
+	0x77, 0x9f, 0xfe, 0xfe, 0xcf, 0xf7, 0xd7, 0x76, 0xc8, 0x5d, 0xbb, 0xe8, 0x87, 0x47, 0x4d, 0x78,
 	0x8b, 0x7b, 0xd2, 0xfe, 0x1a, 0x76, 0xf2, 0x09, 0xf9, 0x19, 0xe1, 0xc5, 0xd4, 0x4a, 0xc8, 0x64,
-	0x14, 0xb2, 0xd6, 0x66, 0xdc, 0x9b, 0xb6, 0x0c, 0xa8, 0xd7, 0x14, 0xf5, 0x2d, 0xb2, 0x59, 0x48,
-	0xfd, 0xc2, 0xd4, 0xc8, 0x8f, 0x08, 0xcf, 0x27, 0x76, 0x43, 0xaa, 0x13, 0xf5, 0x1d, 0x72, 0x3c,
-	0xa3, 0x36, 0x55, 0x0d, 0x10, 0xb5, 0x15, 0xd1, 0xdb, 0xe4, 0x9d, 0x42, 0xa2, 0x89, 0xf5, 0x91,
-	0xdf, 0x10, 0x2e, 0xe5, 0x4c, 0x8d, 0xbc, 0x3b, 0x51, 0xef, 0x51, 0x76, 0x69, 0xbc, 0x77, 0xd5,
-	0x72, 0x50, 0xf1, 0x40, 0xa9, 0xd8, 0x21, 0xb5, 0x42, 0x15, 0x79, 0xbf, 0x54, 0x8a, 0x72, 0x8e,
+	0x14, 0xb2, 0xd6, 0x66, 0xec, 0x4c, 0x5b, 0x06, 0xd4, 0x6b, 0x8a, 0xfa, 0x16, 0xd9, 0x2c, 0xa4,
+	0x7e, 0x61, 0x6a, 0xe4, 0x47, 0x84, 0xe7, 0x13, 0xbb, 0x21, 0xd5, 0x89, 0xfa, 0x0e, 0x39, 0x9e,
+	0x51, 0x9b, 0xaa, 0x06, 0x88, 0xda, 0x8a, 0xe8, 0x6d, 0xf2, 0x4e, 0x21, 0xd1, 0xc4, 0xfa, 0xc8,
+	0x6f, 0x08, 0x97, 0x72, 0xa6, 0x46, 0xde, 0x9d, 0xa8, 0xf7, 0x28, 0xbb, 0x34, 0xde, 0xbb, 0x6a,
+	0x39, 0xa8, 0x78, 0xa0, 0x54, 0xdc, 0x23, 0xb5, 0x42, 0x15, 0x79, 0xbf, 0x54, 0x8a, 0x72, 0x8e,
 	0x30, 0xa1, 0xa2, 0x51, 0x5e, 0x3a, 0xa1, 0xa2, 0x91, 0x46, 0x34, 0x85, 0xa2, 0xbc, 0xa9, 0x90,
 	0x7f, 0x11, 0x5e, 0x1d, 0xe1, 0x0a, 0xe4, 0xe1, 0x44, 0xc4, 0xc6, 0x5b, 0x8f, 0xb1, 0xf7, 0xff,
 	0x40, 0x40, 0x63, 0x5d, 0x69, 0xdc, 0x25, 0xf7, 0x0b, 0x35, 0x32, 0x40, 0x1a, 0xf8, 0xc7, 0x45,
@@ -726,7 +726,7 @@ var fileDescriptor_302873ecccbc7636 = []byte{
 	0x7b, 0x6e, 0xce, 0xbc, 0x38, 0x37, 0x67, 0xfe, 0x38, 0x37, 0x67, 0x3e, 0x7b, 0xe0, 0xf3, 0xe8,
 	0xb8, 0xdb, 0xb4, 0x0e, 0x45, 0x4b, 0xe3, 0x6f, 0x05, 0x6e, 0x53, 0xa6, 0xcd, 0x4e, 0xb6, 0x77,
 	0xec, 0xc7, 0xb9, 0x96, 0xd1, 0x69, 0x9b, 0xc9, 0xe6, 0xbc, 0xfa, 0x95, 0xaa, 0xfd, 0x17, 0x00,
-	0x00, 0xff, 0xff, 0xef, 0x47, 0x06, 0xfd, 0xb4, 0x0b, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xfa, 0xf6, 0x11, 0xa6, 0xb4, 0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/pool-incentives/types/query_test.go b/x/pool-incentives/types/query_test.go
index 4f50de49be7..d5a0c39042e 100644
--- a/x/pool-incentives/types/query_test.go
+++ b/x/pool-incentives/types/query_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	proto "github.com/gogo/protobuf/proto"
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/x/pool-incentives/types/record_test.go b/x/pool-incentives/types/record_test.go
index 6844ed5e775..e861f3b92f2 100644
--- a/x/pool-incentives/types/record_test.go
+++ b/x/pool-incentives/types/record_test.go
@@ -7,7 +7,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
 )
 
 // TestDistrRecord is a test on the weights of distribution gauges.
diff --git a/x/poolmanager/client/cli/cli_test.go b/x/poolmanager/client/cli/cli_test.go
index 09cabb96cd3..8535f1ab45e 100644
--- a/x/poolmanager/client/cli/cli_test.go
+++ b/x/poolmanager/client/cli/cli_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	poolmanagertestutil "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/testutil"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	poolmanagertestutil "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/testutil"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
diff --git a/x/poolmanager/client/cli/common.go b/x/poolmanager/client/cli/common.go
index 897fe741e3a..22fabdd7f19 100644
--- a/x/poolmanager/client/cli/common.go
+++ b/x/poolmanager/client/cli/common.go
@@ -7,7 +7,7 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func swapAmountInRoutes(fs *flag.FlagSet) ([]types.SwapAmountInRoute, error) {
diff --git a/x/poolmanager/client/cli/flags.go b/x/poolmanager/client/cli/flags.go
index 1705eeee869..a9a5390cab7 100644
--- a/x/poolmanager/client/cli/flags.go
+++ b/x/poolmanager/client/cli/flags.go
@@ -3,7 +3,7 @@ package cli
 import (
 	flag "github.com/spf13/pflag"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 const (
diff --git a/x/poolmanager/client/cli/query.go b/x/poolmanager/client/cli/query.go
index 1a49ed9f89c..e0da35d206a 100644
--- a/x/poolmanager/client/cli/query.go
+++ b/x/poolmanager/client/cli/query.go
@@ -8,8 +8,8 @@ import (
 	flag "github.com/spf13/pflag"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var customRouterFlagOverride = map[string]string{
diff --git a/x/poolmanager/client/cli/query_test.go b/x/poolmanager/client/cli/query_test.go
index fa595f95e9a..9c638103ef2 100644
--- a/x/poolmanager/client/cli/query_test.go
+++ b/x/poolmanager/client/cli/query_test.go
@@ -4,12 +4,12 @@ import (
 	gocontext "context"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
 )
 
 type QueryTestSuite struct {
diff --git a/x/poolmanager/client/cli/tx.go b/x/poolmanager/client/cli/tx.go
index ccdbdeecd12..3cc303ab92b 100644
--- a/x/poolmanager/client/cli/tx.go
+++ b/x/poolmanager/client/cli/tx.go
@@ -19,9 +19,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func NewTxCmd() *cobra.Command {
diff --git a/x/poolmanager/client/cli/tx_test.go b/x/poolmanager/client/cli/tx_test.go
index 9a499757490..01e1154bf70 100644
--- a/x/poolmanager/client/cli/tx_test.go
+++ b/x/poolmanager/client/cli/tx_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/cli"
 )
 
 func TestParseCoinsNoSort(t *testing.T) {
diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index 4beabcf36fc..8b05703b9fe 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/poolmanager/client/query_proto_wrap.go b/x/poolmanager/client/query_proto_wrap.go
index 4e83ac16977..dbbf25b412e 100644
--- a/x/poolmanager/client/query_proto_wrap.go
+++ b/x/poolmanager/client/query_proto_wrap.go
@@ -7,9 +7,9 @@ import (
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // This file should evolve to being code gen'd, off of `proto/poolmanager/v1beta/query.yml`
diff --git a/x/poolmanager/client/queryproto/query.pb.go b/x/poolmanager/client/queryproto/query.pb.go
index 35dcd685410..c512f7dcdea 100644
--- a/x/poolmanager/client/queryproto/query.pb.go
+++ b/x/poolmanager/client/queryproto/query.pb.go
@@ -15,7 +15,7 @@ import (
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
-	types "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -916,91 +916,91 @@ func init() {
 }
 
 var fileDescriptor_6256a4106f701b7d = []byte{
-	// 1335 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcd, 0x6f, 0x1b, 0xc5,
+	// 1336 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0x1b, 0xc5,
 	0x1b, 0xce, 0x26, 0x6e, 0x1a, 0x4f, 0x9b, 0xc4, 0x99, 0x5f, 0xdb, 0x5f, 0xb2, 0xad, 0xbc, 0x61,
-	0x5a, 0x8a, 0xdb, 0x34, 0xbb, 0x4a, 0x3f, 0x40, 0xaa, 0x04, 0x55, 0x9c, 0x86, 0xc6, 0xa8, 0xd0,
-	0xb0, 0x05, 0x81, 0x90, 0x8a, 0xb5, 0x49, 0x06, 0xb3, 0xea, 0xee, 0xcc, 0xc6, 0x33, 0xdb, 0x36,
-	0x42, 0xbd, 0x70, 0xe2, 0x84, 0x8a, 0x90, 0x00, 0x89, 0x03, 0x77, 0xce, 0xfc, 0x11, 0x15, 0x52,
-	0x51, 0x24, 0x2e, 0x88, 0x83, 0x41, 0x2d, 0x07, 0x0e, 0xbd, 0xe0, 0xbf, 0x00, 0xcd, 0xc7, 0xae,
-	0x63, 0x37, 0x59, 0x6f, 0x1c, 0x4e, 0xde, 0x9d, 0xf7, 0x79, 0x3f, 0x9e, 0x77, 0x9e, 0x9d, 0x79,
-	0x65, 0xf0, 0x0a, 0x65, 0x21, 0x65, 0x3e, 0x73, 0x22, 0x4a, 0x83, 0xd0, 0x23, 0x5e, 0x03, 0x37,
-	0x9d, 0x7b, 0x0b, 0x6b, 0x98, 0x7b, 0x0b, 0xce, 0x66, 0x8c, 0x9b, 0x5b, 0x76, 0xd4, 0xa4, 0x9c,
-	0xc2, 0x93, 0x1a, 0x68, 0xef, 0x00, 0xda, 0x1a, 0x68, 0x1e, 0x6b, 0xd0, 0x06, 0x95, 0x38, 0x47,
-	0x3c, 0x29, 0x17, 0xf3, 0x5c, 0x56, 0xec, 0x06, 0x26, 0x58, 0x86, 0x93, 0xd0, 0x33, 0x59, 0x50,
-	0xfe, 0x40, 0xa3, 0x2e, 0x64, 0xa1, 0xd8, 0x7d, 0x2f, 0xaa, 0x37, 0x69, 0xcc, 0xb1, 0x46, 0x97,
-	0xd7, 0x25, 0xdc, 0x59, 0xf3, 0x18, 0x4e, 0x51, 0xeb, 0xd4, 0x27, 0xda, 0x7e, 0x7e, 0xa7, 0x5d,
-	0x52, 0x4d, 0x51, 0x91, 0xd7, 0xf0, 0x89, 0xc7, 0x7d, 0x9a, 0x60, 0x4f, 0x35, 0x28, 0x6d, 0x04,
-	0xd8, 0xf1, 0x22, 0xdf, 0xf1, 0x08, 0xa1, 0x5c, 0x1a, 0x93, 0xea, 0x67, 0xb4, 0x55, 0xbe, 0xad,
-	0xc5, 0x9f, 0x38, 0x1e, 0xd9, 0x4a, 0x4c, 0x2a, 0x49, 0x5d, 0x35, 0x47, 0xbd, 0x68, 0x93, 0xd5,
-	0xeb, 0xc5, 0xfd, 0x10, 0x33, 0xee, 0x85, 0x91, 0x02, 0xa0, 0x49, 0x30, 0xbe, 0xea, 0x35, 0xbd,
-	0x90, 0xb9, 0x78, 0x33, 0xc6, 0x8c, 0xa3, 0xdb, 0x60, 0x22, 0x59, 0x60, 0x11, 0x25, 0x0c, 0xc3,
-	0x45, 0x30, 0x1a, 0xc9, 0x95, 0x69, 0x63, 0xd6, 0xa8, 0x1c, 0xb9, 0x78, 0xda, 0xce, 0xd8, 0x26,
-	0x5b, 0x39, 0x57, 0x0b, 0x8f, 0x5b, 0xd6, 0x90, 0xab, 0x1d, 0xd1, 0x73, 0x03, 0xcc, 0x2e, 0x33,
-	0xee, 0x87, 0x1e, 0xc7, 0xb7, 0xef, 0x7b, 0xd1, 0xf2, 0x03, 0x6f, 0x9d, 0x2f, 0x86, 0x34, 0x26,
-	0xbc, 0x46, 0x74, 0x66, 0x38, 0x07, 0x0e, 0x8b, 0x80, 0x75, 0x7f, 0x63, 0x7a, 0x78, 0xd6, 0xa8,
-	0x14, 0xaa, 0xb0, 0xdd, 0xb2, 0x26, 0xb6, 0xbc, 0x30, 0xb8, 0x8a, 0xb4, 0x01, 0xb9, 0xa3, 0xe2,
-	0xa9, 0xb6, 0x01, 0x6d, 0x30, 0xc6, 0xe9, 0x5d, 0x4c, 0xea, 0x3e, 0x99, 0x1e, 0x99, 0x35, 0x2a,
-	0xc5, 0xea, 0xff, 0xda, 0x2d, 0x6b, 0x52, 0xa1, 0x13, 0x0b, 0x72, 0x0f, 0xcb, 0xc7, 0x1a, 0x81,
-	0x77, 0xc0, 0xa8, 0xdc, 0x37, 0x36, 0x5d, 0x98, 0x1d, 0xa9, 0x1c, 0xb9, 0x68, 0x67, 0x92, 0x10,
-	0x35, 0xa6, 0xe5, 0x09, 0xb7, 0xea, 0x71, 0xc1, 0xa7, 0xdd, 0xb2, 0xc6, 0x55, 0x06, 0x15, 0x0b,
-	0xb9, 0x3a, 0xe8, 0x5b, 0x85, 0x31, 0xa3, 0x34, 0xec, 0x8e, 0x32, 0x4c, 0x36, 0x70, 0x13, 0x3d,
-	0x31, 0xc0, 0xf9, 0x94, 0xae, 0x4f, 0x1a, 0x01, 0x5e, 0xa5, 0x34, 0xc8, 0x43, 0xdc, 0xd8, 0x17,
-	0xf1, 0xe1, 0x1c, 0xc4, 0xab, 0x60, 0x52, 0xad, 0xd2, 0x98, 0xd7, 0x37, 0x30, 0xa1, 0xa1, 0xee,
-	0x97, 0xd9, 0x6e, 0x59, 0x27, 0x76, 0xba, 0xa5, 0x00, 0xe4, 0x8e, 0xcb, 0x95, 0x5b, 0x31, 0xbf,
-	0x2e, 0xdf, 0xbf, 0x33, 0xc0, 0x4b, 0x19, 0xdb, 0xa7, 0x75, 0xc2, 0x40, 0xa9, 0x13, 0xc8, 0x93,
-	0x56, 0xc9, 0xa7, 0x58, 0xad, 0x89, 0xe6, 0xfd, 0xde, 0xb2, 0xce, 0x36, 0x7c, 0xfe, 0x69, 0xbc,
-	0x66, 0xaf, 0xd3, 0x50, 0xcb, 0x54, 0xff, 0xcc, 0xb3, 0x8d, 0xbb, 0x0e, 0xdf, 0x8a, 0x30, 0xb3,
-	0x6b, 0x84, 0xb7, 0x5b, 0xd6, 0xff, 0x7b, 0x0b, 0x53, 0xf1, 0x90, 0x3b, 0x91, 0x54, 0xa6, 0xd2,
-	0xa3, 0x7f, 0xf6, 0x2e, 0xed, 0x56, 0xcc, 0x07, 0x92, 0xd6, 0xc7, 0xa9, 0x54, 0x46, 0xa4, 0x54,
-	0x9c, 0x9c, 0x52, 0x11, 0xf9, 0x72, 0x68, 0x05, 0x2e, 0x80, 0x62, 0xca, 0x6b, 0xba, 0x20, 0x1b,
-	0x74, 0xac, 0xdd, 0xb2, 0x4a, 0x3d, 0x94, 0x91, 0x3b, 0x96, 0x70, 0xed, 0x91, 0xd7, 0x2f, 0x06,
-	0x98, 0xeb, 0x2b, 0xaf, 0xdd, 0xd9, 0xf7, 0xd7, 0xd7, 0x35, 0x30, 0x91, 0xa8, 0x48, 0xcb, 0x45,
-	0xa9, 0x6c, 0xa6, 0xdd, 0xb2, 0x8e, 0x77, 0xab, 0x2c, 0x51, 0xcb, 0x51, 0xad, 0x35, 0x29, 0x96,
-	0x6e, 0x7a, 0x23, 0x79, 0xe8, 0xa1, 0x6f, 0x0c, 0x80, 0xb2, 0x36, 0x51, 0x0b, 0x2c, 0x4a, 0xa4,
-	0xec, 0x93, 0x6e, 0x7d, 0xad, 0xec, 0x5b, 0x5f, 0x27, 0x7a, 0x98, 0x24, 0xf2, 0x1a, 0xd7, 0x54,
-	0xb4, 0xba, 0xa6, 0xc0, 0xe4, 0x3b, 0x71, 0x28, 0xba, 0x9b, 0x9e, 0x8f, 0xcb, 0xa0, 0xd4, 0x59,
-	0xd2, 0x85, 0x2d, 0x80, 0x22, 0x89, 0xc3, 0xba, 0xe8, 0x20, 0xd3, 0x2d, 0xde, 0x41, 0x39, 0x35,
-	0x21, 0x77, 0x8c, 0x68, 0x57, 0x74, 0x15, 0x1c, 0x11, 0x0f, 0x83, 0x6c, 0x11, 0x5a, 0x02, 0x47,
-	0x95, 0xaf, 0x4e, 0x7f, 0x09, 0x14, 0x84, 0x45, 0x1f, 0xcf, 0xc7, 0x6c, 0x75, 0xe6, 0xdb, 0xc9,
-	0x99, 0x6f, 0x2f, 0x92, 0xad, 0x6a, 0xf1, 0xe7, 0x9f, 0xe6, 0x0f, 0x09, 0xaf, 0x9a, 0x2b, 0xc1,
-	0x82, 0xda, 0x62, 0x10, 0x74, 0x51, 0xab, 0x81, 0x52, 0x67, 0x49, 0xc7, 0xbe, 0x02, 0x0e, 0x25,
-	0xb4, 0x46, 0xf2, 0x04, 0x57, 0x68, 0xb4, 0x6d, 0x80, 0xd2, 0xed, 0x88, 0xf2, 0xd5, 0xa6, 0xbf,
-	0x8e, 0x07, 0xd2, 0xe1, 0x32, 0x28, 0x89, 0x4b, 0xb3, 0xee, 0x31, 0x86, 0x79, 0x97, 0x12, 0x4f,
-	0x76, 0xce, 0x87, 0x5e, 0x04, 0x72, 0x27, 0xc4, 0xd2, 0xa2, 0x58, 0x51, 0x6a, 0x5c, 0x01, 0x53,
-	0x9b, 0x31, 0xe5, 0xdd, 0x71, 0x94, 0x2a, 0x4f, 0xb5, 0x5b, 0xd6, 0xb4, 0x8a, 0xf3, 0x02, 0x04,
-	0xb9, 0x93, 0x72, 0xad, 0x13, 0x09, 0xd5, 0xc0, 0xd4, 0x0e, 0x46, 0xba, 0x3d, 0x97, 0x01, 0x60,
-	0x11, 0xe5, 0xf5, 0x48, 0xac, 0x6a, 0x35, 0x1e, 0x6f, 0xb7, 0xac, 0x29, 0x15, 0xb7, 0x63, 0x43,
-	0x6e, 0x91, 0x25, 0xde, 0x68, 0x05, 0xcc, 0xbc, 0x47, 0xb9, 0x27, 0x5b, 0x7d, 0xd3, 0xdf, 0x8c,
-	0xfd, 0x0d, 0x9f, 0x6f, 0x0d, 0x24, 0x85, 0xef, 0x0d, 0x60, 0xee, 0x16, 0x4a, 0x97, 0xf7, 0x10,
-	0x14, 0x83, 0x64, 0x51, 0xef, 0xe0, 0x8c, 0xad, 0x07, 0x04, 0xd1, 0xa8, 0xf4, 0x14, 0x5b, 0xa2,
-	0x3e, 0xa9, 0x5e, 0xd7, 0xe7, 0x96, 0xd6, 0x6d, 0xea, 0x89, 0x7e, 0xfc, 0xc3, 0xaa, 0xe4, 0xf8,
-	0xb4, 0x44, 0x10, 0xe6, 0x76, 0x32, 0x5e, 0x7c, 0x32, 0x09, 0x0e, 0xbd, 0x2b, 0x86, 0x1e, 0xf8,
-	0xa5, 0x01, 0x46, 0xd5, 0x64, 0x00, 0xcf, 0xe7, 0x18, 0x1f, 0x74, 0x2f, 0xcc, 0xb9, 0x5c, 0x58,
-	0x45, 0x16, 0xcd, 0x7d, 0xfe, 0xeb, 0x5f, 0x5f, 0x0f, 0xbf, 0x0c, 0x4f, 0x3b, 0x59, 0x23, 0x9c,
-	0xae, 0xe2, 0x6f, 0x03, 0xcc, 0xec, 0x79, 0xa5, 0xc1, 0xd7, 0x33, 0xf3, 0xf6, 0x9b, 0x64, 0xcc,
-	0x37, 0x06, 0x75, 0xd7, 0x4c, 0x6e, 0x4a, 0x26, 0x6f, 0xc2, 0xeb, 0x99, 0x4c, 0x3e, 0xd3, 0x6a,
-	0x78, 0xe8, 0x60, 0x1d, 0x51, 0xcd, 0xa7, 0x58, 0xc4, 0xd4, 0x27, 0x5a, 0xdd, 0x27, 0xf0, 0x8b,
-	0x61, 0x70, 0x3a, 0xc7, 0x34, 0x02, 0x6f, 0xe4, 0xab, 0xba, 0xef, 0x3c, 0x73, 0x60, 0xfa, 0x1f,
-	0x4a, 0xfa, 0x2e, 0x5c, 0xdd, 0x37, 0x7d, 0x59, 0x9b, 0x3c, 0x6c, 0xeb, 0xbb, 0xb6, 0xe2, 0xb9,
-	0x01, 0xcc, 0xbd, 0x2f, 0x1a, 0x38, 0x50, 0xe1, 0x9d, 0x8b, 0xd6, 0xbc, 0x36, 0xb0, 0xbf, 0x66,
-	0xfe, 0xb6, 0x64, 0x7e, 0x03, 0x2e, 0x1f, 0x7c, 0xe3, 0x69, 0xcc, 0xe1, 0xa3, 0x61, 0x70, 0x26,
-	0xcf, 0xa0, 0x00, 0x57, 0x0e, 0xb6, 0xf5, 0xff, 0x65, 0x0b, 0xee, 0xc8, 0x16, 0x7c, 0x00, 0xdf,
-	0xdf, 0x67, 0x0b, 0x04, 0xe1, 0x3e, 0x02, 0x10, 0x2d, 0xf9, 0xd6, 0x00, 0x63, 0xc9, 0xfd, 0x0d,
-	0x2f, 0x64, 0x16, 0xdb, 0x73, 0xf3, 0x9b, 0xf3, 0x39, 0xd1, 0x9a, 0x88, 0x2d, 0x89, 0x54, 0xe0,
-	0xd9, 0x4c, 0x22, 0xe9, 0x70, 0x00, 0xbf, 0x32, 0x40, 0x41, 0x44, 0x80, 0x95, 0xec, 0x43, 0xaf,
-	0x33, 0x35, 0x98, 0xe7, 0x72, 0x20, 0x75, 0x35, 0x97, 0x65, 0x35, 0x36, 0xbc, 0x90, 0x59, 0x8d,
-	0xac, 0xa4, 0xd3, 0x5c, 0xd9, 0xad, 0x64, 0x24, 0xe8, 0xd3, 0xad, 0x9e, 0x61, 0xa2, 0x4f, 0xb7,
-	0x7a, 0xe7, 0x8c, 0x9c, 0xdd, 0xf2, 0x82, 0x60, 0x5e, 0x75, 0xeb, 0x07, 0x03, 0x14, 0xd3, 0xeb,
-	0x18, 0x66, 0x27, 0xeb, 0x1d, 0x44, 0x4c, 0x3b, 0x2f, 0x5c, 0x17, 0x77, 0x49, 0x16, 0x37, 0x0f,
-	0xe7, 0x76, 0x2d, 0xae, 0xa7, 0x69, 0x8e, 0xbc, 0xef, 0x19, 0xdc, 0x36, 0x00, 0x7c, 0xf1, 0x6a,
-	0x86, 0xaf, 0x66, 0xe6, 0xde, 0x73, 0x2c, 0x30, 0x5f, 0xdb, 0xb7, 0x9f, 0x2e, 0xbe, 0x26, 0x8b,
-	0x5f, 0x82, 0x8b, 0xfb, 0xd9, 0x79, 0x87, 0x8b, 0x80, 0xea, 0x43, 0x4a, 0xef, 0xf3, 0xea, 0x9d,
-	0xc7, 0x4f, 0xcb, 0xc6, 0xf6, 0xd3, 0xb2, 0xf1, 0xe7, 0xd3, 0xb2, 0xf1, 0xe8, 0x59, 0x79, 0x68,
-	0xfb, 0x59, 0x79, 0xe8, 0xb7, 0x67, 0xe5, 0xa1, 0x8f, 0x96, 0x76, 0x8c, 0x07, 0x3a, 0xcd, 0x7c,
-	0xe0, 0xad, 0xb1, 0x34, 0xe7, 0xbd, 0x85, 0x2b, 0xce, 0x83, 0xae, 0xcc, 0xeb, 0x81, 0x8f, 0x09,
-	0x57, 0x7f, 0x8a, 0xa8, 0x69, 0x72, 0x54, 0xfe, 0x5c, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xcd,
-	0x94, 0x7a, 0x82, 0x30, 0x12, 0x00, 0x00,
+	0x5a, 0x8a, 0xdb, 0x34, 0xbb, 0x4a, 0x5b, 0x8a, 0x54, 0x09, 0xaa, 0x38, 0x0d, 0x8d, 0x51, 0xa1,
+	0x61, 0x0b, 0x02, 0x21, 0x15, 0x6b, 0x93, 0x0c, 0x66, 0xd5, 0xdd, 0x99, 0x8d, 0x67, 0xb6, 0x6d,
+	0x84, 0x7a, 0xe1, 0xc4, 0x09, 0x15, 0x21, 0x01, 0x12, 0x07, 0xee, 0x9c, 0xf9, 0x10, 0x15, 0x52,
+	0x51, 0x24, 0x2e, 0x88, 0x83, 0x41, 0x2d, 0x07, 0x0e, 0xbd, 0xe0, 0x4f, 0x80, 0xe6, 0xcf, 0xae,
+	0x63, 0x37, 0x59, 0x6f, 0x1c, 0x4e, 0xde, 0x9d, 0xf7, 0x79, 0xff, 0x3c, 0xef, 0x3c, 0x3b, 0xf3,
+	0xca, 0xe0, 0x15, 0xca, 0x42, 0xca, 0x7c, 0xe6, 0x44, 0x94, 0x06, 0xa1, 0x47, 0xbc, 0x06, 0x6e,
+	0x3a, 0xf7, 0x16, 0xd6, 0x30, 0xf7, 0x16, 0x9c, 0xcd, 0x18, 0x37, 0xb7, 0xec, 0xa8, 0x49, 0x39,
+	0x85, 0x27, 0x35, 0xd0, 0xde, 0x01, 0xb4, 0x35, 0xd0, 0x3c, 0xd6, 0xa0, 0x0d, 0x2a, 0x71, 0x8e,
+	0x78, 0x52, 0x2e, 0xe6, 0xb9, 0xac, 0xd8, 0x0d, 0x4c, 0xb0, 0x0c, 0x27, 0xa1, 0x67, 0xb2, 0xa0,
+	0xfc, 0x81, 0x46, 0x5d, 0xc8, 0x42, 0xb1, 0xfb, 0x5e, 0x54, 0x6f, 0xd2, 0x98, 0x63, 0x8d, 0x2e,
+	0xaf, 0x4b, 0xb8, 0xb3, 0xe6, 0x31, 0x9c, 0xa2, 0xd6, 0xa9, 0x4f, 0xb4, 0xfd, 0xfc, 0x4e, 0xbb,
+	0xa4, 0x9a, 0xa2, 0x22, 0xaf, 0xe1, 0x13, 0x8f, 0xfb, 0x34, 0xc1, 0x9e, 0x6a, 0x50, 0xda, 0x08,
+	0xb0, 0xe3, 0x45, 0xbe, 0xe3, 0x11, 0x42, 0xb9, 0x34, 0x26, 0xd5, 0xcf, 0x68, 0xab, 0x7c, 0x5b,
+	0x8b, 0x3f, 0x71, 0x3c, 0xb2, 0x95, 0x98, 0x54, 0x92, 0xba, 0x6a, 0x8e, 0x7a, 0xd1, 0x26, 0xab,
+	0xd7, 0x8b, 0xfb, 0x21, 0x66, 0xdc, 0x0b, 0x23, 0x05, 0x40, 0x93, 0x60, 0x7c, 0xd5, 0x6b, 0x7a,
+	0x21, 0x73, 0xf1, 0x66, 0x8c, 0x19, 0x47, 0xb7, 0xc1, 0x44, 0xb2, 0xc0, 0x22, 0x4a, 0x18, 0x86,
+	0x8b, 0x60, 0x34, 0x92, 0x2b, 0xd3, 0xc6, 0xac, 0x51, 0x39, 0x72, 0xf1, 0xb4, 0x9d, 0xb1, 0x4d,
+	0xb6, 0x72, 0xae, 0x16, 0x1e, 0xb7, 0xac, 0x21, 0x57, 0x3b, 0xa2, 0xe7, 0x06, 0x98, 0x5d, 0x66,
+	0xdc, 0x0f, 0x3d, 0x8e, 0x6f, 0xdf, 0xf7, 0xa2, 0xe5, 0x07, 0xde, 0x3a, 0x5f, 0x0c, 0x69, 0x4c,
+	0x78, 0x8d, 0xe8, 0xcc, 0x70, 0x0e, 0x1c, 0x16, 0x01, 0xeb, 0xfe, 0xc6, 0xf4, 0xf0, 0xac, 0x51,
+	0x29, 0x54, 0x61, 0xbb, 0x65, 0x4d, 0x6c, 0x79, 0x61, 0x70, 0x15, 0x69, 0x03, 0x72, 0x47, 0xc5,
+	0x53, 0x6d, 0x03, 0xda, 0x60, 0x8c, 0xd3, 0xbb, 0x98, 0xd4, 0x7d, 0x32, 0x3d, 0x32, 0x6b, 0x54,
+	0x8a, 0xd5, 0xff, 0xb5, 0x5b, 0xd6, 0xa4, 0x42, 0x27, 0x16, 0xe4, 0x1e, 0x96, 0x8f, 0x35, 0x02,
+	0xef, 0x80, 0x51, 0xb9, 0x6f, 0x6c, 0xba, 0x30, 0x3b, 0x52, 0x39, 0x72, 0xd1, 0xce, 0x24, 0x21,
+	0x6a, 0x4c, 0xcb, 0x13, 0x6e, 0xd5, 0xe3, 0x82, 0x4f, 0xbb, 0x65, 0x8d, 0xab, 0x0c, 0x2a, 0x16,
+	0x72, 0x75, 0xd0, 0xb7, 0x0a, 0x63, 0x46, 0x69, 0xd8, 0x1d, 0x65, 0x98, 0x6c, 0xe0, 0x26, 0x7a,
+	0x62, 0x80, 0xf3, 0x29, 0x5d, 0x9f, 0x34, 0x02, 0xbc, 0x4a, 0x69, 0x90, 0x87, 0xb8, 0xb1, 0x2f,
+	0xe2, 0xc3, 0x39, 0x88, 0x57, 0xc1, 0xa4, 0x5a, 0xa5, 0x31, 0xaf, 0x6f, 0x60, 0x42, 0x43, 0xdd,
+	0x2f, 0xb3, 0xdd, 0xb2, 0x4e, 0xec, 0x74, 0x4b, 0x01, 0xc8, 0x1d, 0x97, 0x2b, 0xb7, 0x62, 0x7e,
+	0x5d, 0xbe, 0x7f, 0x67, 0x80, 0x97, 0x32, 0xb6, 0x4f, 0xeb, 0x84, 0x81, 0x52, 0x27, 0x90, 0x27,
+	0xad, 0x92, 0x4f, 0xb1, 0x5a, 0x13, 0xcd, 0xfb, 0xbd, 0x65, 0x9d, 0x6d, 0xf8, 0xfc, 0xd3, 0x78,
+	0xcd, 0x5e, 0xa7, 0xa1, 0x96, 0xa9, 0xfe, 0x99, 0x67, 0x1b, 0x77, 0x1d, 0xbe, 0x15, 0x61, 0x66,
+	0xd7, 0x08, 0x6f, 0xb7, 0xac, 0xff, 0xf7, 0x16, 0xa6, 0xe2, 0x21, 0x77, 0x22, 0xa9, 0x4c, 0xa5,
+	0x47, 0xff, 0xec, 0x5d, 0xda, 0xad, 0x98, 0x0f, 0x24, 0xad, 0x8f, 0x53, 0xa9, 0x8c, 0x48, 0xa9,
+	0x38, 0x39, 0xa5, 0x22, 0xf2, 0xe5, 0xd0, 0x0a, 0x5c, 0x00, 0xc5, 0x94, 0xd7, 0x74, 0x41, 0x36,
+	0xe8, 0x58, 0xbb, 0x65, 0x95, 0x7a, 0x28, 0x23, 0x77, 0x2c, 0xe1, 0xda, 0x23, 0xaf, 0x5f, 0x0c,
+	0x30, 0xd7, 0x57, 0x5e, 0xbb, 0xb3, 0xef, 0xaf, 0xaf, 0x6b, 0x60, 0x22, 0x51, 0x91, 0x96, 0x8b,
+	0x52, 0xd9, 0x4c, 0xbb, 0x65, 0x1d, 0xef, 0x56, 0x59, 0xa2, 0x96, 0xa3, 0x5a, 0x6b, 0x52, 0x2c,
+	0xdd, 0xf4, 0x46, 0xf2, 0xd0, 0x43, 0xdf, 0x18, 0x00, 0x65, 0x6d, 0xa2, 0x16, 0x58, 0x94, 0x48,
+	0xd9, 0x27, 0xdd, 0xfa, 0x5a, 0xd9, 0xb7, 0xbe, 0x4e, 0xf4, 0x30, 0x49, 0xe4, 0x35, 0xae, 0xa9,
+	0x68, 0x75, 0x4d, 0x81, 0xc9, 0x77, 0xe2, 0x50, 0x74, 0x37, 0x3d, 0x1f, 0x97, 0x41, 0xa9, 0xb3,
+	0xa4, 0x0b, 0x5b, 0x00, 0x45, 0x12, 0x87, 0x75, 0xd1, 0x41, 0xa6, 0x5b, 0xbc, 0x83, 0x72, 0x6a,
+	0x42, 0xee, 0x18, 0xd1, 0xae, 0xe8, 0x2a, 0x38, 0x22, 0x1e, 0x06, 0xd9, 0x22, 0xb4, 0x04, 0x8e,
+	0x2a, 0x5f, 0x9d, 0xfe, 0x12, 0x28, 0x08, 0x8b, 0x3e, 0x9e, 0x8f, 0xd9, 0xea, 0xcc, 0xb7, 0x93,
+	0x33, 0xdf, 0x5e, 0x24, 0x5b, 0xd5, 0xe2, 0xcf, 0x3f, 0xcd, 0x1f, 0x12, 0x5e, 0x35, 0x57, 0x82,
+	0x05, 0xb5, 0xc5, 0x20, 0xe8, 0xa2, 0x56, 0x03, 0xa5, 0xce, 0x92, 0x8e, 0xfd, 0x2a, 0x38, 0x94,
+	0xd0, 0x1a, 0xc9, 0x13, 0x5c, 0xa1, 0xd1, 0xb6, 0x01, 0x4a, 0xb7, 0x23, 0xca, 0x57, 0x9b, 0xfe,
+	0x3a, 0x1e, 0x48, 0x87, 0xcb, 0xa0, 0x24, 0x2e, 0xcd, 0xba, 0xc7, 0x18, 0xe6, 0x5d, 0x4a, 0x3c,
+	0xd9, 0x39, 0x1f, 0x7a, 0x11, 0xc8, 0x9d, 0x10, 0x4b, 0x8b, 0x62, 0x45, 0xa9, 0x71, 0x05, 0x4c,
+	0x6d, 0xc6, 0x94, 0x77, 0xc7, 0x51, 0xaa, 0x3c, 0xd5, 0x6e, 0x59, 0xd3, 0x2a, 0xce, 0x0b, 0x10,
+	0xe4, 0x4e, 0xca, 0xb5, 0x4e, 0x24, 0x54, 0x03, 0x53, 0x3b, 0x18, 0xe9, 0xf6, 0x5c, 0x06, 0x80,
+	0x45, 0x94, 0xd7, 0x23, 0xb1, 0xaa, 0xd5, 0x78, 0xbc, 0xdd, 0xb2, 0xa6, 0x54, 0xdc, 0x8e, 0x0d,
+	0xb9, 0x45, 0x96, 0x78, 0xa3, 0x15, 0x30, 0xf3, 0x1e, 0xe5, 0x9e, 0x6c, 0xf5, 0x4d, 0x7f, 0x33,
+	0xf6, 0x37, 0x7c, 0xbe, 0x35, 0x90, 0x14, 0xbe, 0x37, 0x80, 0xb9, 0x5b, 0x28, 0x5d, 0xde, 0x43,
+	0x50, 0x0c, 0x92, 0x45, 0xbd, 0x83, 0x33, 0xb6, 0x1e, 0x10, 0x44, 0xa3, 0xd2, 0x53, 0x6c, 0x89,
+	0xfa, 0xa4, 0x7a, 0x5d, 0x9f, 0x5b, 0x5a, 0xb7, 0xa9, 0x27, 0xfa, 0xf1, 0x0f, 0xab, 0x92, 0xe3,
+	0xd3, 0x12, 0x41, 0x98, 0xdb, 0xc9, 0x78, 0xf1, 0xc9, 0x24, 0x38, 0xf4, 0xae, 0x18, 0x7a, 0xe0,
+	0x97, 0x06, 0x18, 0x55, 0x93, 0x01, 0x3c, 0x9f, 0x63, 0x7c, 0xd0, 0xbd, 0x30, 0xe7, 0x72, 0x61,
+	0x15, 0x59, 0x34, 0xf7, 0xf9, 0xaf, 0x7f, 0x7d, 0x3d, 0xfc, 0x32, 0x3c, 0xed, 0x64, 0x8d, 0x70,
+	0xba, 0x8a, 0xbf, 0x0d, 0x30, 0xb3, 0xe7, 0x95, 0x06, 0x5f, 0xcf, 0xcc, 0xdb, 0x6f, 0x92, 0x31,
+	0xdf, 0x18, 0xd4, 0x5d, 0x33, 0xb9, 0x29, 0x99, 0xbc, 0x09, 0xaf, 0x67, 0x32, 0xf9, 0x4c, 0xab,
+	0xe1, 0xa1, 0x83, 0x75, 0x44, 0x35, 0x9f, 0x62, 0x11, 0x53, 0x9f, 0x68, 0x75, 0x9f, 0xc0, 0x2f,
+	0x86, 0xc1, 0xe9, 0x1c, 0xd3, 0x08, 0xbc, 0x91, 0xaf, 0xea, 0xbe, 0xf3, 0xcc, 0x81, 0xe9, 0x7f,
+	0x28, 0xe9, 0xbb, 0x70, 0x75, 0xdf, 0xf4, 0x65, 0x6d, 0xf2, 0xb0, 0xad, 0xef, 0xda, 0x8a, 0xe7,
+	0x06, 0x30, 0xf7, 0xbe, 0x68, 0xe0, 0x40, 0x85, 0x77, 0x2e, 0x5a, 0xf3, 0xda, 0xc0, 0xfe, 0x9a,
+	0xf9, 0xdb, 0x92, 0xf9, 0x0d, 0xb8, 0x7c, 0xf0, 0x8d, 0xa7, 0x31, 0x87, 0x8f, 0x86, 0xc1, 0x99,
+	0x3c, 0x83, 0x02, 0x5c, 0x39, 0xd8, 0xd6, 0xff, 0x97, 0x2d, 0xb8, 0x23, 0x5b, 0xf0, 0x01, 0x7c,
+	0x7f, 0x9f, 0x2d, 0x10, 0x84, 0xfb, 0x08, 0x40, 0xb4, 0xe4, 0x5b, 0x03, 0x8c, 0x25, 0xf7, 0x37,
+	0xbc, 0x90, 0x59, 0x6c, 0xcf, 0xcd, 0x6f, 0xce, 0xe7, 0x44, 0x6b, 0x22, 0xb6, 0x24, 0x52, 0x81,
+	0x67, 0x33, 0x89, 0xa4, 0xc3, 0x01, 0xfc, 0xca, 0x00, 0x05, 0x11, 0x01, 0x56, 0xb2, 0x0f, 0xbd,
+	0xce, 0xd4, 0x60, 0x9e, 0xcb, 0x81, 0xd4, 0xd5, 0x5c, 0x96, 0xd5, 0xd8, 0xf0, 0x42, 0x66, 0x35,
+	0xb2, 0x92, 0x4e, 0x73, 0x65, 0xb7, 0x92, 0x91, 0xa0, 0x4f, 0xb7, 0x7a, 0x86, 0x89, 0x3e, 0xdd,
+	0xea, 0x9d, 0x33, 0x72, 0x76, 0xcb, 0x0b, 0x82, 0x79, 0xd5, 0xad, 0x1f, 0x0c, 0x50, 0x4c, 0xaf,
+	0x63, 0x98, 0x9d, 0xac, 0x77, 0x10, 0x31, 0xed, 0xbc, 0x70, 0x5d, 0xdc, 0x25, 0x59, 0xdc, 0x3c,
+	0x9c, 0xdb, 0xb5, 0xb8, 0x9e, 0xa6, 0x39, 0xf2, 0xbe, 0x67, 0x70, 0xdb, 0x00, 0xf0, 0xc5, 0xab,
+	0x19, 0x5e, 0xc9, 0xcc, 0xbd, 0xe7, 0x58, 0x60, 0xbe, 0xb6, 0x6f, 0x3f, 0x5d, 0x7c, 0x4d, 0x16,
+	0xbf, 0x04, 0x17, 0xf7, 0xb3, 0xf3, 0x0e, 0x17, 0x01, 0xd5, 0x87, 0x94, 0xde, 0xe7, 0xd5, 0x3b,
+	0x8f, 0x9f, 0x96, 0x8d, 0xed, 0xa7, 0x65, 0xe3, 0xcf, 0xa7, 0x65, 0xe3, 0xd1, 0xb3, 0xf2, 0xd0,
+	0xf6, 0xb3, 0xf2, 0xd0, 0x6f, 0xcf, 0xca, 0x43, 0x1f, 0x2d, 0xed, 0x18, 0x0f, 0x74, 0x9a, 0xf9,
+	0xc0, 0x5b, 0x63, 0x69, 0xce, 0x7b, 0x0b, 0x57, 0x9c, 0x07, 0x5d, 0x99, 0xd7, 0x03, 0x1f, 0x13,
+	0xae, 0xfe, 0x14, 0x51, 0xd3, 0xe4, 0xa8, 0xfc, 0xb9, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x6f, 0x23, 0x33, 0x61, 0x30, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/poolmanager/client/testutil/test_helpers.go b/x/poolmanager/client/testutil/test_helpers.go
index 15db7730229..56e87b7c31b 100644
--- a/x/poolmanager/client/testutil/test_helpers.go
+++ b/x/poolmanager/client/testutil/test_helpers.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/osmosis-labs/osmosis/v15/app"
-	poolmanagercli "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/cli"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app"
+	poolmanagercli "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/cli"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
diff --git a/x/poolmanager/create_pool.go b/x/poolmanager/create_pool.go
index 20d5891ee4b..8f7534a4473 100644
--- a/x/poolmanager/create_pool.go
+++ b/x/poolmanager/create_pool.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // validateCreatedPool checks that the pool was created with the correct pool ID and address.
diff --git a/x/poolmanager/create_pool_test.go b/x/poolmanager/create_pool_test.go
index 6b0a5a1df26..443e0f4dd6c 100644
--- a/x/poolmanager/create_pool_test.go
+++ b/x/poolmanager/create_pool_test.go
@@ -6,13 +6,13 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	clmodel "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	cwmodel "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	stableswap "github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	clmodel "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	cwmodel "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	stableswap "github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 func (s *KeeperTestSuite) TestPoolCreationFee() {
diff --git a/x/poolmanager/events/emit.go b/x/poolmanager/events/emit.go
index a93ebdc32d8..ce555beecac 100644
--- a/x/poolmanager/events/emit.go
+++ b/x/poolmanager/events/emit.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func EmitSwapEvent(ctx sdk.Context, sender sdk.AccAddress, poolId uint64, input sdk.Coins, output sdk.Coins) {
diff --git a/x/poolmanager/events/emit_test.go b/x/poolmanager/events/emit_test.go
index 1dfdd4c7184..573d7ba5059 100644
--- a/x/poolmanager/events/emit_test.go
+++ b/x/poolmanager/events/emit_test.go
@@ -7,9 +7,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/events"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/events"
 )
 
 type PoolManagerEventsTestSuite struct {
diff --git a/x/poolmanager/export_test.go b/x/poolmanager/export_test.go
index e0498ec4f97..2a59d27772d 100644
--- a/x/poolmanager/export_test.go
+++ b/x/poolmanager/export_test.go
@@ -3,7 +3,7 @@ package poolmanager
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var IntMaxValue = intMaxValue
diff --git a/x/poolmanager/keeper.go b/x/poolmanager/keeper.go
index bbdf3be773f..a1e15e63669 100644
--- a/x/poolmanager/keeper.go
+++ b/x/poolmanager/keeper.go
@@ -5,7 +5,7 @@ import (
 	gogotypes "github.com/gogo/protobuf/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )
diff --git a/x/poolmanager/keeper_test.go b/x/poolmanager/keeper_test.go
index a43f1e7a231..7e0e2fc8929 100644
--- a/x/poolmanager/keeper_test.go
+++ b/x/poolmanager/keeper_test.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/poolmanager/module/module.go b/x/poolmanager/module/module.go
index d4c53d89f87..f0fdce40001 100644
--- a/x/poolmanager/module/module.go
+++ b/x/poolmanager/module/module.go
@@ -15,14 +15,14 @@ import (
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	gammsimulation "github.com/osmosis-labs/osmosis/v15/x/gamm/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	pmclient "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	gammsimulation "github.com/osmosis-labs/osmosis/v16/x/gamm/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	pmclient "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/poolmanager/msg_server.go b/x/poolmanager/msg_server.go
index 493be2facd6..8e5cddd3987 100644
--- a/x/poolmanager/msg_server.go
+++ b/x/poolmanager/msg_server.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type msgServer struct {
diff --git a/x/poolmanager/msg_server_test.go b/x/poolmanager/msg_server_test.go
index ad5eb056366..b2f7f4725f5 100644
--- a/x/poolmanager/msg_server_test.go
+++ b/x/poolmanager/msg_server_test.go
@@ -3,8 +3,8 @@ package poolmanager_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagerKeeper "github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagerKeeper "github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/poolmanager/router.go b/x/poolmanager/router.go
index d86fae920b0..6788d5b8f10 100644
--- a/x/poolmanager/router.go
+++ b/x/poolmanager/router.go
@@ -8,8 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // 1 << 256 - 1 where 256 is the max bit length defined for sdk.Int
diff --git a/x/poolmanager/router_test.go b/x/poolmanager/router_test.go
index 6fb61647221..138e71d5796 100644
--- a/x/poolmanager/router_test.go
+++ b/x/poolmanager/router_test.go
@@ -9,17 +9,17 @@ import (
 	"github.com/golang/mock/gomock"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/tests/mocks"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	cwpool "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool"
-	cwmodel "github.com/osmosis-labs/osmosis/v15/x/cosmwasmpool/model"
-	gamm "github.com/osmosis-labs/osmosis/v15/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	poolincentivestypes "github.com/osmosis-labs/osmosis/v15/x/pool-incentives/types"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/tests/mocks"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	cwpool "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool"
+	cwmodel "github.com/osmosis-labs/osmosis/v16/x/cosmwasmpool/model"
+	gamm "github.com/osmosis-labs/osmosis/v16/x/gamm/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/v16/x/pool-incentives/types"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type poolSetup struct {
diff --git a/x/poolmanager/types/genesis.pb.go b/x/poolmanager/types/genesis.pb.go
index d46a9f0aabf..bb0bc328818 100644
--- a/x/poolmanager/types/genesis.pb.go
+++ b/x/poolmanager/types/genesis.pb.go
@@ -150,7 +150,7 @@ var fileDescriptor_aa099d9fbdf68b35 = []byte{
 	// 421 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xc1, 0x8a, 0xd4, 0x40,
 	0x10, 0x4d, 0xbb, 0xcb, 0x1c, 0x7a, 0x16, 0xc4, 0xe0, 0x21, 0xbb, 0x42, 0x26, 0xc4, 0x4b, 0x3c,
-	0x6c, 0x37, 0xb3, 0x22, 0x82, 0x37, 0x67, 0x41, 0x11, 0x14, 0xd7, 0x78, 0xf3, 0x12, 0x3a, 0x49,
+	0x6c, 0x37, 0xb3, 0x82, 0x82, 0x37, 0x67, 0x41, 0x11, 0x14, 0xd7, 0x78, 0xf3, 0x12, 0x3a, 0x49,
 	0x6d, 0x0c, 0x26, 0xa9, 0x90, 0xee, 0x2c, 0x3b, 0x7f, 0x21, 0x78, 0xf7, 0x03, 0xfc, 0x0e, 0x0f,
 	0x7b, 0x9c, 0xa3, 0xa7, 0x51, 0x66, 0xfe, 0xc0, 0x2f, 0x90, 0xee, 0x74, 0x64, 0x74, 0x61, 0x4e,
 	0x49, 0x75, 0xbd, 0xf7, 0xaa, 0xde, 0x2b, 0xfa, 0x08, 0x65, 0x8d, 0xb2, 0x94, 0xbc, 0x45, 0xac,
@@ -173,8 +173,8 @@ var fileDescriptor_aa099d9fbdf68b35 = []byte{
 	0x04, 0x2b, 0x46, 0x35, 0xcc, 0x3c, 0xc8, 0xc5, 0xbb, 0x9b, 0x8d, 0x4f, 0x56, 0x1b, 0x9f, 0xfc,
 	0xda, 0xf8, 0xe4, 0xf3, 0xd6, 0x77, 0x56, 0x5b, 0xdf, 0xf9, 0xb1, 0xf5, 0x9d, 0x0f, 0x4f, 0x77,
 	0xb2, 0xb1, 0xfa, 0xa7, 0x95, 0x48, 0xe5, 0x58, 0xf0, 0xab, 0xf9, 0x13, 0x7e, 0xfd, 0xcf, 0x3d,
-	0x4d, 0x60, 0xe9, 0xc4, 0x5c, 0xf0, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, 0x9f, 0xa5,
-	0xd6, 0xc7, 0x02, 0x00, 0x00,
+	0x4d, 0x60, 0xe9, 0xc4, 0x5c, 0xf0, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x09, 0xf4, 0xad,
+	0x73, 0xc7, 0x02, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/poolmanager/types/module_route.pb.go b/x/poolmanager/types/module_route.pb.go
index e213da6a244..e6cef51287b 100644
--- a/x/poolmanager/types/module_route.pb.go
+++ b/x/poolmanager/types/module_route.pb.go
@@ -132,7 +132,7 @@ var fileDescriptor_96bfcc7b6d387cee = []byte{
 	// 320 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x2b, 0x31,
 	0x18, 0x85, 0x27, 0xbd, 0xa5, 0xb7, 0xc6, 0x52, 0x86, 0x41, 0xa4, 0x54, 0x48, 0x4b, 0x41, 0x28,
-	0x82, 0x09, 0x55, 0x44, 0x70, 0x39, 0x5d, 0xb9, 0x50, 0xb4, 0x0a, 0x82, 0x9b, 0x92, 0xe9, 0x84,
+	0x82, 0x09, 0x55, 0x50, 0x70, 0x39, 0x5d, 0xb9, 0x50, 0xb4, 0x0a, 0x82, 0x9b, 0x92, 0xe9, 0x84,
 	0xb1, 0x90, 0xcc, 0x1f, 0x26, 0x69, 0xb5, 0x5b, 0x57, 0x2e, 0x7d, 0x07, 0x5f, 0xa6, 0xcb, 0x2e,
 	0x5d, 0x15, 0x69, 0xdf, 0xc0, 0x27, 0x90, 0x8c, 0x53, 0xd0, 0x8d, 0xbb, 0x13, 0xf2, 0x9d, 0x0f,
 	0xfe, 0x83, 0x29, 0x18, 0x05, 0x66, 0x6c, 0x98, 0x06, 0x90, 0x8a, 0xa7, 0x3c, 0x11, 0x19, 0x9b,
@@ -149,7 +149,7 @@ var fileDescriptor_96bfcc7b6d387cee = []byte{
 	0x2b, 0x82, 0x16, 0x2b, 0x82, 0x3e, 0x56, 0x04, 0xbd, 0xae, 0x89, 0xb7, 0x58, 0x13, 0xef, 0x7d,
 	0x4d, 0xbc, 0xfb, 0xd3, 0x64, 0x6c, 0x1f, 0x26, 0x11, 0x1d, 0x81, 0x62, 0xc5, 0x55, 0x87, 0x92,
 	0x47, 0x66, 0xf3, 0x60, 0xd3, 0xde, 0x09, 0x7b, 0xfa, 0xb5, 0xb7, 0x5b, 0xc2, 0x44, 0x95, 0x7c,
-	0xae, 0xe3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0x27, 0x7b, 0x9c, 0x93, 0x01, 0x00, 0x00,
+	0xae, 0xe3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x4c, 0x73, 0x39, 0x93, 0x01, 0x00, 0x00,
 }
 
 func (m *ModuleRoute) Marshal() (dAtA []byte, err error) {
diff --git a/x/poolmanager/types/msgs_test.go b/x/poolmanager/types/msgs_test.go
index 184df735b53..bef99f2a353 100644
--- a/x/poolmanager/types/msgs_test.go
+++ b/x/poolmanager/types/msgs_test.go
@@ -7,9 +7,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var (
diff --git a/x/poolmanager/types/params.go b/x/poolmanager/types/params.go
index f7e151b3c49..9cbeb348920 100644
--- a/x/poolmanager/types/params.go
+++ b/x/poolmanager/types/params.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/poolmanager/types/swap_route.pb.go b/x/poolmanager/types/swap_route.pb.go
index f8e87f279f4..78e10d2ea61 100644
--- a/x/poolmanager/types/swap_route.pb.go
+++ b/x/poolmanager/types/swap_route.pb.go
@@ -233,7 +233,7 @@ var fileDescriptor_cddd97a9a05492a8 = []byte{
 	// 446 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x4d, 0x8b, 0xd3, 0x40,
 	0x18, 0xc7, 0x33, 0xbe, 0xac, 0x38, 0xae, 0x55, 0xc3, 0xba, 0x5b, 0x57, 0x48, 0x4a, 0x0e, 0x52,
-	0xd0, 0xce, 0x50, 0x45, 0x04, 0x2f, 0x62, 0xf0, 0x60, 0x4e, 0xc5, 0xf4, 0x56, 0x0f, 0x61, 0xd2,
+	0xd0, 0xce, 0x50, 0x05, 0x05, 0x2f, 0x62, 0xf0, 0x60, 0x4e, 0xc5, 0xf4, 0x56, 0x0f, 0x61, 0xd2,
 	0x84, 0x18, 0x9a, 0xcc, 0x84, 0xce, 0xa4, 0xb5, 0x57, 0xf1, 0x03, 0xf8, 0xb1, 0x7a, 0xec, 0x51,
 	0x3c, 0x04, 0x69, 0xc1, 0x8b, 0xb7, 0x7c, 0x02, 0xc9, 0x24, 0xb1, 0x49, 0x85, 0xa2, 0x9e, 0x32,
 	0x2f, 0xcf, 0xcb, 0xef, 0xff, 0xcf, 0x33, 0xf0, 0x09, 0xe3, 0x31, 0xe3, 0x21, 0xc7, 0x09, 0x63,
@@ -258,7 +258,7 @@ var fileDescriptor_cddd97a9a05492a8 = []byte{
 	0x64, 0xe6, 0xbb, 0xf5, 0x56, 0x03, 0x9b, 0xad, 0x06, 0xbe, 0x6f, 0x35, 0xf0, 0x65, 0xa7, 0x29,
 	0x9b, 0x9d, 0xa6, 0x7c, 0xdd, 0x69, 0xca, 0xe4, 0x45, 0xa3, 0x59, 0x25, 0x73, 0x10, 0x11, 0x97,
 	0xd7, 0x1b, 0xbc, 0x18, 0x3e, 0xc7, 0x1f, 0x5b, 0x6f, 0x4f, 0x12, 0xb8, 0x27, 0xf2, 0xf1, 0x3c,
-	0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x05, 0xfe, 0x01, 0x2a, 0x9f, 0x03, 0x00, 0x00,
+	0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x69, 0x95, 0x09, 0x8f, 0x9f, 0x03, 0x00, 0x00,
 }
 
 func (m *SwapAmountInRoute) Marshal() (dAtA []byte, err error) {
diff --git a/x/poolmanager/types/tx.pb.go b/x/poolmanager/types/tx.pb.go
index 3912be8dcc4..2b7f074682a 100644
--- a/x/poolmanager/types/tx.pb.go
+++ b/x/poolmanager/types/tx.pb.go
@@ -449,7 +449,7 @@ var fileDescriptor_acd130b4825d67dc = []byte{
 	// 753 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xdf, 0x4e, 0xd3, 0x50,
 	0x1c, 0xde, 0x19, 0x0b, 0xc2, 0x41, 0xfe, 0x55, 0x90, 0x51, 0xb0, 0x25, 0x8d, 0x41, 0x4c, 0xa4,
-	0xcd, 0x86, 0xc6, 0x88, 0x26, 0xc6, 0x81, 0x89, 0x4b, 0x68, 0x26, 0xf5, 0xce, 0x9b, 0xa5, 0x1b,
+	0xcd, 0x86, 0xd1, 0x88, 0x26, 0xc6, 0x81, 0x89, 0x4b, 0x68, 0x26, 0xf5, 0xce, 0x9b, 0xa5, 0x1b,
 	0xcd, 0x6c, 0x58, 0xcf, 0x69, 0x76, 0x4e, 0x61, 0xc4, 0xc4, 0xc4, 0xc4, 0x07, 0xd0, 0x78, 0x69,
 	0x8c, 0x89, 0x4f, 0xc3, 0x25, 0x77, 0x1a, 0x2f, 0x2a, 0xc2, 0x1b, 0xec, 0x09, 0x4c, 0xdb, 0xd3,
 	0xb2, 0x95, 0x51, 0xa8, 0x24, 0x72, 0xd5, 0xf6, 0xf4, 0xf7, 0xe7, 0xfb, 0x7d, 0xdf, 0x77, 0x4e,
@@ -493,7 +493,7 @@ var fileDescriptor_acd130b4825d67dc = []byte{
 	0x9b, 0xfb, 0x47, 0x02, 0x38, 0x38, 0x12, 0xc0, 0xe1, 0x91, 0x00, 0x3e, 0x1e, 0x0b, 0x99, 0x83,
 	0x63, 0x21, 0xf3, 0xf3, 0x58, 0xc8, 0xbc, 0x7e, 0xd8, 0x65, 0x62, 0xd6, 0x69, 0xb9, 0xa9, 0xd7,
 	0x48, 0xf8, 0xa0, 0xec, 0x14, 0x1e, 0x28, 0xed, 0x9e, 0x3f, 0x56, 0xdf, 0xd9, 0xb5, 0x41, 0xff,
-	0x2f, 0x75, 0xe5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xfe, 0x3b, 0x1f, 0x4e, 0x0b, 0x00,
+	0x2f, 0x75, 0xe5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x61, 0x95, 0x33, 0xba, 0x4e, 0x0b, 0x00,
 	0x00,
 }
 
diff --git a/x/protorev/client/cli/query.go b/x/protorev/client/cli/query.go
index a2576e51d58..bf5b718b012 100644
--- a/x/protorev/client/cli/query.go
+++ b/x/protorev/client/cli/query.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // NewCmdQuery returns the cli query commands for this module
diff --git a/x/protorev/client/cli/tx.go b/x/protorev/client/cli/tx.go
index f0f49c2222e..726d851f160 100644
--- a/x/protorev/client/cli/tx.go
+++ b/x/protorev/client/cli/tx.go
@@ -16,7 +16,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/protorev/client/cli/utils.go b/x/protorev/client/cli/utils.go
index e5900bf4be8..96ce0955c61 100644
--- a/x/protorev/client/cli/utils.go
+++ b/x/protorev/client/cli/utils.go
@@ -10,7 +10,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	flag "github.com/spf13/pflag"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // ------------ types/functions to handle a SetHotRoutes CLI TX ------------ //
diff --git a/x/protorev/keeper/developer_fees.go b/x/protorev/keeper/developer_fees.go
index 461f987360a..0aff185b343 100644
--- a/x/protorev/keeper/developer_fees.go
+++ b/x/protorev/keeper/developer_fees.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // Used in v16 upgrade, can be removed in v17
diff --git a/x/protorev/keeper/developer_fees_test.go b/x/protorev/keeper/developer_fees_test.go
index 298cfb4813e..110faedde3d 100644
--- a/x/protorev/keeper/developer_fees_test.go
+++ b/x/protorev/keeper/developer_fees_test.go
@@ -3,8 +3,8 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestSendDeveloperFee tests the SendDeveloperFee function
diff --git a/x/protorev/keeper/emit.go b/x/protorev/keeper/emit.go
index 9e84d07f4b0..9bbb9c93f98 100644
--- a/x/protorev/keeper/emit.go
+++ b/x/protorev/keeper/emit.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/tendermint/tendermint/crypto/tmhash"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // EmitBackrunEvent updates and emits a backrunEvent
diff --git a/x/protorev/keeper/emit_test.go b/x/protorev/keeper/emit_test.go
index 874009f3083..7dc2befbd3a 100644
--- a/x/protorev/keeper/emit_test.go
+++ b/x/protorev/keeper/emit_test.go
@@ -8,8 +8,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 func (s *KeeperTestSuite) TestBackRunEvent() {
diff --git a/x/protorev/keeper/epoch_hook_test.go b/x/protorev/keeper/epoch_hook_test.go
index 1c4bc71307c..012cafe0f7b 100644
--- a/x/protorev/keeper/epoch_hook_test.go
+++ b/x/protorev/keeper/epoch_hook_test.go
@@ -7,8 +7,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // BenchmarkEpochHook benchmarks the epoch hook. In particular, it benchmarks the UpdatePools function.
diff --git a/x/protorev/keeper/genesis.go b/x/protorev/keeper/genesis.go
index 83ca0df2733..429e5b6c360 100644
--- a/x/protorev/keeper/genesis.go
+++ b/x/protorev/keeper/genesis.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // InitGenesis initializes the module's state from a provided genesis state.
diff --git a/x/protorev/keeper/grpc_query.go b/x/protorev/keeper/grpc_query.go
index 16312508345..bea5c726dfe 100644
--- a/x/protorev/keeper/grpc_query.go
+++ b/x/protorev/keeper/grpc_query.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/protorev/keeper/grpc_query_test.go b/x/protorev/keeper/grpc_query_test.go
index 3c177b50c73..3f2c39818dc 100644
--- a/x/protorev/keeper/grpc_query_test.go
+++ b/x/protorev/keeper/grpc_query_test.go
@@ -3,10 +3,10 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestParams tests the query for params
diff --git a/x/protorev/keeper/keeper.go b/x/protorev/keeper/keeper.go
index 963b098e7c2..0a6550d6ac4 100644
--- a/x/protorev/keeper/keeper.go
+++ b/x/protorev/keeper/keeper.go
@@ -10,7 +10,7 @@ import (
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type (
diff --git a/x/protorev/keeper/keeper_test.go b/x/protorev/keeper/keeper_test.go
index d55fa73750f..de4b7961ac7 100644
--- a/x/protorev/keeper/keeper_test.go
+++ b/x/protorev/keeper/keeper_test.go
@@ -9,15 +9,15 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev"
-	protorevkeeper "github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev"
+	protorevkeeper "github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/stableswap"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/stableswap"
 
-	osmosisapp "github.com/osmosis-labs/osmosis/v15/app"
+	osmosisapp "github.com/osmosis-labs/osmosis/v16/app"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/protorev/keeper/msg_server.go b/x/protorev/keeper/msg_server.go
index 386a7f803db..2f5306ada37 100644
--- a/x/protorev/keeper/msg_server.go
+++ b/x/protorev/keeper/msg_server.go
@@ -6,7 +6,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type MsgServer struct {
diff --git a/x/protorev/keeper/msg_server_test.go b/x/protorev/keeper/msg_server_test.go
index 3aedb1b0474..95aaaeff55e 100644
--- a/x/protorev/keeper/msg_server_test.go
+++ b/x/protorev/keeper/msg_server_test.go
@@ -3,9 +3,9 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestMsgSetHotRoutes tests the MsgSetHotRoutes message.
diff --git a/x/protorev/keeper/params.go b/x/protorev/keeper/params.go
index b43ce41c96f..386e25e237f 100644
--- a/x/protorev/keeper/params.go
+++ b/x/protorev/keeper/params.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // GetParams get all parameters as types.Params
diff --git a/x/protorev/keeper/posthandler.go b/x/protorev/keeper/posthandler.go
index a17c8ae503a..d64d542d236 100644
--- a/x/protorev/keeper/posthandler.go
+++ b/x/protorev/keeper/posthandler.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 type SwapToBackrun struct {
diff --git a/x/protorev/keeper/posthandler_test.go b/x/protorev/keeper/posthandler_test.go
index c39006b3ae4..a790659bd3e 100644
--- a/x/protorev/keeper/posthandler_test.go
+++ b/x/protorev/keeper/posthandler_test.go
@@ -12,11 +12,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // BenchmarkBalancerSwapHighestLiquidityArb benchmarks a balancer swap that creates a single three hop arbitrage
diff --git a/x/protorev/keeper/proposal_test.go b/x/protorev/keeper/proposal_test.go
index 20ed0d28f0f..449e73917cd 100644
--- a/x/protorev/keeper/proposal_test.go
+++ b/x/protorev/keeper/proposal_test.go
@@ -1,9 +1,9 @@
 package keeper_test
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestSetProtoRevAdminAccount tests that the admin account can be set through a proposal
diff --git a/x/protorev/keeper/protorev.go b/x/protorev/keeper/protorev.go
index 6e060a1dc42..3e0bbfe06e5 100644
--- a/x/protorev/keeper/protorev.go
+++ b/x/protorev/keeper/protorev.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 
diff --git a/x/protorev/keeper/protorev_test.go b/x/protorev/keeper/protorev_test.go
index 75f0f94e69f..7595de0e994 100644
--- a/x/protorev/keeper/protorev_test.go
+++ b/x/protorev/keeper/protorev_test.go
@@ -3,7 +3,7 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestGetTokenPairArbRoutes tests the GetTokenPairArbRoutes function.
diff --git a/x/protorev/keeper/rebalance.go b/x/protorev/keeper/rebalance.go
index 7d93d2fff2c..274f9a7a88a 100644
--- a/x/protorev/keeper/rebalance.go
+++ b/x/protorev/keeper/rebalance.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // IterateRoutes checks the profitability of every single route that is passed in
diff --git a/x/protorev/keeper/rebalance_test.go b/x/protorev/keeper/rebalance_test.go
index 2ad4ab67653..307934d4def 100644
--- a/x/protorev/keeper/rebalance_test.go
+++ b/x/protorev/keeper/rebalance_test.go
@@ -3,10 +3,10 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	protorevtypes "github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	protorevtypes "github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // Mainnet Arb Route - 2 Asset, Same Weights (Block: 5905150)
diff --git a/x/protorev/keeper/routes.go b/x/protorev/keeper/routes.go
index 2af0c56d0f3..0966e0c5f56 100644
--- a/x/protorev/keeper/routes.go
+++ b/x/protorev/keeper/routes.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type RouteMetaData struct {
diff --git a/x/protorev/keeper/routes_test.go b/x/protorev/keeper/routes_test.go
index 82ef51f1982..7b4b4b3a7ea 100644
--- a/x/protorev/keeper/routes_test.go
+++ b/x/protorev/keeper/routes_test.go
@@ -3,8 +3,8 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type TestRoute struct {
diff --git a/x/protorev/keeper/statistics.go b/x/protorev/keeper/statistics.go
index 7dbc12113b6..e670023de09 100644
--- a/x/protorev/keeper/statistics.go
+++ b/x/protorev/keeper/statistics.go
@@ -7,8 +7,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // ----------------------- Statistics Stores  ----------------------- //
diff --git a/x/protorev/keeper/statistics_test.go b/x/protorev/keeper/statistics_test.go
index ee606e06d8b..063cbd8a356 100644
--- a/x/protorev/keeper/statistics_test.go
+++ b/x/protorev/keeper/statistics_test.go
@@ -3,8 +3,8 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 // TestGetNumberOfTrades tests GetNumberOfTrades and IncrementNumberOfTrades
diff --git a/x/protorev/module.go b/x/protorev/module.go
index a0d3cfd53e6..e071ae2c5a8 100644
--- a/x/protorev/module.go
+++ b/x/protorev/module.go
@@ -17,9 +17,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 var (
diff --git a/x/protorev/proposal_handler.go b/x/protorev/proposal_handler.go
index 0bf608418d7..f0e81344c94 100644
--- a/x/protorev/proposal_handler.go
+++ b/x/protorev/proposal_handler.go
@@ -7,8 +7,8 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 func NewProtoRevProposalHandler(k keeper.Keeper) govtypes.Handler {
diff --git a/x/protorev/types/expected_keepers.go b/x/protorev/types/expected_keepers.go
index f1cd028f66a..d8e6b0cca96 100644
--- a/x/protorev/types/expected_keepers.go
+++ b/x/protorev/types/expected_keepers.go
@@ -3,8 +3,8 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/protorev/types/genesis.pb.go b/x/protorev/types/genesis.pb.go
index 1795f0d771b..0f977b1cb18 100644
--- a/x/protorev/types/genesis.pb.go
+++ b/x/protorev/types/genesis.pb.go
@@ -177,45 +177,45 @@ var fileDescriptor_3c77fc2da5752af2 = []byte{
 	// 660 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
 	0x10, 0xc6, 0x63, 0x5a, 0x4a, 0xbb, 0x29, 0x15, 0xdd, 0x92, 0xca, 0x09, 0xd4, 0x31, 0xa6, 0x85,
-	0x1c, 0xa8, 0xad, 0x16, 0xb8, 0x70, 0x40, 0xaa, 0x8b, 0x0a, 0x17, 0xaa, 0xc8, 0x2d, 0x42, 0x02,
-	0x89, 0x65, 0x9d, 0x6c, 0x53, 0xab, 0xb6, 0xd7, 0xf2, 0x6e, 0x42, 0xfa, 0x00, 0xdc, 0x39, 0xf3,
-	0x1c, 0x3c, 0x44, 0x8f, 0x15, 0x27, 0x4e, 0x11, 0x6a, 0xdf, 0x20, 0x4f, 0x80, 0xf6, 0x4f, 0x92,
-	0x52, 0x62, 0x6e, 0xd9, 0x99, 0xdf, 0x7c, 0xdf, 0xcc, 0xec, 0xc6, 0xe0, 0x11, 0x65, 0x09, 0x65,
-	0x11, 0xf3, 0xb2, 0x9c, 0x72, 0x9a, 0x93, 0x9e, 0xd7, 0xdb, 0x0a, 0x09, 0xc7, 0x5b, 0x5e, 0x87,
-	0xa4, 0x84, 0x45, 0xcc, 0x95, 0x09, 0x68, 0x6a, 0xce, 0x1d, 0x71, 0xae, 0xe6, 0x6a, 0x77, 0x3b,
-	0xb4, 0x43, 0x65, 0xd4, 0x13, 0xbf, 0x14, 0x50, 0x7b, 0x5c, 0xa8, 0x3b, 0x16, 0x50, 0xe0, 0x46,
-	0x31, 0x88, 0x73, 0x9c, 0x68, 0xc3, 0x5a, 0xb5, 0x25, 0x39, 0xa4, 0x8c, 0xd4, 0x41, 0xa7, 0x2c,
-	0x75, 0xf2, 0x42, 0xcc, 0xc8, 0xb8, 0xb8, 0x45, 0xa3, 0x54, 0xe5, 0x9d, 0xef, 0xf3, 0x60, 0xf1,
-	0xb5, 0x1a, 0xe6, 0x80, 0x63, 0x4e, 0xe0, 0x4b, 0x30, 0xa7, 0xb4, 0x4d, 0xc3, 0x36, 0x1a, 0xe5,
-	0x6d, 0xdb, 0x2d, 0x1a, 0xce, 0x6d, 0x4a, 0xce, 0x9f, 0x3d, 0x1b, 0xd4, 0x4b, 0x81, 0xae, 0x82,
-	0x5f, 0x0d, 0x50, 0xe1, 0xf4, 0x84, 0xa4, 0x28, 0xc3, 0x51, 0x8e, 0x70, 0x1e, 0xa2, 0x9c, 0x76,
-	0x39, 0x61, 0xe6, 0x0d, 0x7b, 0xa6, 0x51, 0xde, 0x7e, 0x52, 0xac, 0x77, 0x28, 0xca, 0x9a, 0x38,
-	0xca, 0x77, 0xf2, 0x30, 0x90, 0x35, 0xfe, 0xba, 0xd0, 0x1e, 0x0e, 0xea, 0xf7, 0x4f, 0x71, 0x12,
-	0xbf, 0x70, 0xa6, 0x0a, 0x3b, 0x01, 0xe4, 0xff, 0x54, 0xc2, 0xcf, 0xa0, 0x2c, 0x66, 0x46, 0x6d,
-	0x92, 0xd2, 0x84, 0x99, 0x33, 0xd2, 0xfc, 0x61, 0xb1, 0xb9, 0x8f, 0x19, 0x79, 0x25, 0x58, 0xbf,
-	0xa6, 0x3d, 0xa1, 0xf2, 0xbc, 0xa2, 0xe2, 0x04, 0x20, 0x1c, 0x61, 0x0c, 0x12, 0xb0, 0x98, 0x51,
-	0x1a, 0xa3, 0x2f, 0x24, 0xea, 0x1c, 0x73, 0x66, 0xce, 0xca, 0x7d, 0x6d, 0xfc, 0x67, 0x5f, 0x94,
-	0xc6, 0xef, 0x15, 0xec, 0xdf, 0xd3, 0x26, 0x2b, 0xca, 0xe4, 0xaa, 0x90, 0x13, 0x94, 0xb3, 0x09,
-	0x09, 0x11, 0xa8, 0xb6, 0xf1, 0x29, 0x43, 0x2c, 0x4a, 0x5b, 0x04, 0x25, 0xb4, 0xdd, 0x8d, 0x09,
-	0xd2, 0xef, 0xcf, 0xbc, 0x69, 0x1b, 0x8d, 0x59, 0x7f, 0x7d, 0x38, 0xa8, 0xdb, 0x4a, 0xa8, 0x10,
-	0x75, 0x82, 0x55, 0x91, 0x3b, 0x10, 0xa9, 0xb7, 0x32, 0xa3, 0xaf, 0x1d, 0x22, 0xb0, 0xd4, 0x26,
-	0x3d, 0x12, 0xd3, 0x8c, 0xe4, 0xe8, 0x88, 0x10, 0x66, 0xce, 0xc9, 0x65, 0x55, 0x5d, 0xfd, 0x92,
-	0xc4, 0xcc, 0xe3, 0x21, 0x76, 0x69, 0x94, 0xfa, 0x6b, 0xba, 0xfb, 0x8a, 0x36, 0xfd, 0xab, 0xdc,
-	0x09, 0x6e, 0x8f, 0x03, 0x7b, 0x84, 0x30, 0xb8, 0x0f, 0x56, 0x62, 0xcc, 0x09, 0xe3, 0x28, 0x8c,
-	0x69, 0xeb, 0x04, 0x1d, 0xcb, 0xc9, 0xcc, 0x5b, 0xb2, 0x77, 0x6b, 0x38, 0xa8, 0xd7, 0x94, 0xcc,
-	0x14, 0xc8, 0x09, 0x96, 0x55, 0xd4, 0x17, 0xc1, 0x37, 0x32, 0x06, 0x3f, 0x82, 0xe5, 0x89, 0x23,
-	0x6e, 0xb7, 0x73, 0xc2, 0x98, 0x39, 0x6f, 0x1b, 0x8d, 0x05, 0xdf, 0x1d, 0x0e, 0xea, 0xe6, 0xf5,
-	0xa6, 0x34, 0xe2, 0xfc, 0xfc, 0xb1, 0xb9, 0xa4, 0x47, 0xda, 0x51, 0xa1, 0xe0, 0xce, 0x98, 0xd2,
-	0x11, 0xf8, 0x09, 0x54, 0x13, 0xdc, 0x47, 0xf2, 0x42, 0x32, 0x1a, 0xa5, 0x9c, 0x21, 0xa1, 0x21,
-	0x9b, 0x32, 0x17, 0xae, 0xaf, 0xbb, 0x10, 0x75, 0x82, 0x4a, 0x82, 0xfb, 0xe2, 0xc6, 0x9b, 0x32,
-	0xd3, 0x24, 0xb9, 0x1c, 0x01, 0xbe, 0x03, 0xab, 0xd3, 0x8a, 0x78, 0xdf, 0x04, 0x52, 0xfc, 0xc1,
-	0x70, 0x50, 0x5f, 0x2b, 0x16, 0xe7, 0x7d, 0x27, 0x80, 0xd7, 0x95, 0x0f, 0xfb, 0xf0, 0x00, 0x54,
-	0x24, 0x85, 0x5a, 0xb4, 0x9b, 0x72, 0x74, 0x44, 0x47, 0x2d, 0x97, 0xa5, 0xaa, 0x3d, 0xf9, 0x0f,
-	0x4d, 0xc5, 0x9c, 0x00, 0xca, 0xf8, 0xae, 0x08, 0xef, 0x51, 0xd5, 0xab, 0xbf, 0x7f, 0x76, 0x61,
-	0x19, 0xe7, 0x17, 0x96, 0xf1, 0xfb, 0xc2, 0x32, 0xbe, 0x5d, 0x5a, 0xa5, 0xf3, 0x4b, 0xab, 0xf4,
-	0xeb, 0xd2, 0x2a, 0x7d, 0x78, 0xd6, 0x89, 0xf8, 0x71, 0x37, 0x74, 0x5b, 0x34, 0xf1, 0xf4, 0x7b,
-	0xdf, 0x8c, 0x71, 0xc8, 0x46, 0x07, 0xaf, 0xb7, 0xf5, 0xdc, 0xeb, 0x4f, 0x3e, 0x5b, 0xfc, 0x34,
-	0x23, 0x2c, 0x9c, 0x93, 0xe7, 0xa7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x40, 0xe7, 0x7a, 0x25,
+	0x1c, 0xa8, 0xad, 0x16, 0xc4, 0x81, 0x03, 0x52, 0x5d, 0x54, 0xb8, 0x50, 0x45, 0x6e, 0x11, 0x12,
+	0x48, 0x2c, 0xeb, 0x64, 0x9b, 0x5a, 0xb5, 0xbd, 0x96, 0x77, 0x13, 0xd2, 0x07, 0xe0, 0xce, 0x99,
+	0xe7, 0xe0, 0x21, 0x7a, 0xac, 0x38, 0x71, 0x8a, 0x50, 0xfb, 0x06, 0x79, 0x02, 0xb4, 0x7f, 0x92,
+	0x94, 0x12, 0x73, 0xcb, 0xce, 0xfc, 0xe6, 0xfb, 0x66, 0x66, 0x37, 0x06, 0x8f, 0x28, 0x4b, 0x28,
+	0x8b, 0x98, 0x97, 0xe5, 0x94, 0xd3, 0x9c, 0xf4, 0xbc, 0xde, 0x56, 0x48, 0x38, 0xde, 0xf2, 0x3a,
+	0x24, 0x25, 0x2c, 0x62, 0xae, 0x4c, 0x40, 0x53, 0x73, 0xee, 0x88, 0x73, 0x35, 0x57, 0xbb, 0xdb,
+	0xa1, 0x1d, 0x2a, 0xa3, 0x9e, 0xf8, 0xa5, 0x80, 0xda, 0xe3, 0x42, 0xdd, 0xb1, 0x80, 0x02, 0x37,
+	0x8a, 0x41, 0x9c, 0xe3, 0x44, 0x1b, 0xd6, 0xaa, 0x2d, 0xc9, 0x21, 0x65, 0xa4, 0x0e, 0x3a, 0x65,
+	0xa9, 0x93, 0x17, 0x62, 0x46, 0xc6, 0xc5, 0x2d, 0x1a, 0xa5, 0x2a, 0xef, 0x7c, 0x9f, 0x07, 0x8b,
+	0xaf, 0xd5, 0x30, 0x07, 0x1c, 0x73, 0x02, 0x5f, 0x82, 0x39, 0xa5, 0x6d, 0x1a, 0xb6, 0xd1, 0x28,
+	0x6f, 0xdb, 0x6e, 0xd1, 0x70, 0x6e, 0x53, 0x72, 0xfe, 0xec, 0xd9, 0xa0, 0x5e, 0x0a, 0x74, 0x15,
+	0xfc, 0x6a, 0x80, 0x0a, 0xa7, 0x27, 0x24, 0x45, 0x19, 0x8e, 0x72, 0x84, 0xf3, 0x10, 0xe5, 0xb4,
+	0xcb, 0x09, 0x33, 0x6f, 0xd8, 0x33, 0x8d, 0xf2, 0xf6, 0x93, 0x62, 0xbd, 0x43, 0x51, 0xd6, 0xc4,
+	0x51, 0xbe, 0x93, 0x87, 0x81, 0xac, 0xf1, 0xd7, 0x85, 0xf6, 0x70, 0x50, 0xbf, 0x7f, 0x8a, 0x93,
+	0xf8, 0x85, 0x33, 0x55, 0xd8, 0x09, 0x20, 0xff, 0xa7, 0x12, 0x7e, 0x06, 0x65, 0x31, 0x33, 0x6a,
+	0x93, 0x94, 0x26, 0xcc, 0x9c, 0x91, 0xe6, 0x0f, 0x8b, 0xcd, 0x7d, 0xcc, 0xc8, 0x2b, 0xc1, 0xfa,
+	0x35, 0xed, 0x09, 0x95, 0xe7, 0x15, 0x15, 0x27, 0x00, 0xe1, 0x08, 0x63, 0x90, 0x80, 0xc5, 0x8c,
+	0xd2, 0x18, 0x7d, 0x21, 0x51, 0xe7, 0x98, 0x33, 0x73, 0x56, 0xee, 0x6b, 0xe3, 0x3f, 0xfb, 0xa2,
+	0x34, 0x7e, 0xaf, 0x60, 0xff, 0x9e, 0x36, 0x59, 0x51, 0x26, 0x57, 0x85, 0x9c, 0xa0, 0x9c, 0x4d,
+	0x48, 0x88, 0x40, 0xb5, 0x8d, 0x4f, 0x19, 0x62, 0x51, 0xda, 0x22, 0x28, 0xa1, 0xed, 0x6e, 0x4c,
+	0x90, 0x7e, 0x7f, 0xe6, 0x4d, 0xdb, 0x68, 0xcc, 0xfa, 0xeb, 0xc3, 0x41, 0xdd, 0x56, 0x42, 0x85,
+	0xa8, 0x13, 0xac, 0x8a, 0xdc, 0x81, 0x48, 0xbd, 0x95, 0x19, 0x7d, 0xed, 0x10, 0x81, 0xa5, 0x36,
+	0xe9, 0x91, 0x98, 0x66, 0x24, 0x47, 0x47, 0x84, 0x30, 0x73, 0x4e, 0x2e, 0xab, 0xea, 0xea, 0x97,
+	0x24, 0x66, 0x1e, 0x0f, 0xb1, 0x4b, 0xa3, 0xd4, 0x5f, 0xd3, 0xdd, 0x57, 0xb4, 0xe9, 0x5f, 0xe5,
+	0x4e, 0x70, 0x7b, 0x1c, 0xd8, 0x23, 0x84, 0xc1, 0x7d, 0xb0, 0x12, 0x63, 0x4e, 0x18, 0x47, 0x61,
+	0x4c, 0x5b, 0x27, 0xe8, 0x58, 0x4e, 0x66, 0xde, 0x92, 0xbd, 0x5b, 0xc3, 0x41, 0xbd, 0xa6, 0x64,
+	0xa6, 0x40, 0x4e, 0xb0, 0xac, 0xa2, 0xbe, 0x08, 0xbe, 0x91, 0x31, 0xf8, 0x11, 0x2c, 0x4f, 0x1c,
+	0x71, 0xbb, 0x9d, 0x13, 0xc6, 0xcc, 0x79, 0xdb, 0x68, 0x2c, 0xf8, 0xee, 0x70, 0x50, 0x37, 0xaf,
+	0x37, 0xa5, 0x11, 0xe7, 0xe7, 0x8f, 0xcd, 0x25, 0x3d, 0xd2, 0x8e, 0x0a, 0x05, 0x77, 0xc6, 0x94,
+	0x8e, 0xc0, 0x4f, 0xa0, 0x9a, 0xe0, 0x3e, 0x92, 0x17, 0x92, 0xd1, 0x28, 0xe5, 0x0c, 0x09, 0x0d,
+	0xd9, 0x94, 0xb9, 0x70, 0x7d, 0xdd, 0x85, 0xa8, 0x13, 0x54, 0x12, 0xdc, 0x17, 0x37, 0xde, 0x94,
+	0x99, 0x26, 0xc9, 0xe5, 0x08, 0xf0, 0x1d, 0x58, 0x9d, 0x56, 0xc4, 0xfb, 0x26, 0x90, 0xe2, 0x0f,
+	0x86, 0x83, 0xfa, 0x5a, 0xb1, 0x38, 0xef, 0x3b, 0x01, 0xbc, 0xae, 0x7c, 0xd8, 0x87, 0x07, 0xa0,
+	0x22, 0x29, 0xd4, 0xa2, 0xdd, 0x94, 0xa3, 0x23, 0x3a, 0x6a, 0xb9, 0x2c, 0x55, 0xed, 0xc9, 0x7f,
+	0x68, 0x2a, 0xe6, 0x04, 0x50, 0xc6, 0x77, 0x45, 0x78, 0x8f, 0xaa, 0x5e, 0xfd, 0xfd, 0xb3, 0x0b,
+	0xcb, 0x38, 0xbf, 0xb0, 0x8c, 0xdf, 0x17, 0x96, 0xf1, 0xed, 0xd2, 0x2a, 0x9d, 0x5f, 0x5a, 0xa5,
+	0x5f, 0x97, 0x56, 0xe9, 0xc3, 0xb3, 0x4e, 0xc4, 0x8f, 0xbb, 0xa1, 0xdb, 0xa2, 0x89, 0xa7, 0xdf,
+	0xfb, 0x66, 0x8c, 0x43, 0x36, 0x3a, 0x78, 0xbd, 0xad, 0xe7, 0x5e, 0x7f, 0xf2, 0xd9, 0xe2, 0xa7,
+	0x19, 0x61, 0xe1, 0x9c, 0x3c, 0x3f, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x0a, 0x2d, 0xd7,
 	0x58, 0x05, 0x00, 0x00,
 }
 
diff --git a/x/protorev/types/genesis_test.go b/x/protorev/types/genesis_test.go
index 2275495fe7f..ac2aea35a8a 100644
--- a/x/protorev/types/genesis_test.go
+++ b/x/protorev/types/genesis_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 func TestGenesisStateValidate(t *testing.T) {
diff --git a/x/protorev/types/gov.pb.go b/x/protorev/types/gov.pb.go
index 2a72ade8052..f9b497d901f 100644
--- a/x/protorev/types/gov.pb.go
+++ b/x/protorev/types/gov.pb.go
@@ -136,9 +136,9 @@ var fileDescriptor_e1f85ff7f3eaf8bb = []byte{
 	0x23, 0xea, 0x58, 0x3c, 0x82, 0xcd, 0xa5, 0x4e, 0x7e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24,
 	0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78,
 	0x2c, 0xc7, 0x10, 0x65, 0x92, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f,
-	0x35, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x34, 0xd5, 0xaf, 0x40, 0x44,
+	0x35, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x34, 0xd3, 0xaf, 0x40, 0x44,
 	0x79, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x98, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff,
-	0xeb, 0x98, 0x84, 0xbf, 0x95, 0x02, 0x00, 0x00,
+	0x13, 0x75, 0xd3, 0x4d, 0x95, 0x02, 0x00, 0x00,
 }
 
 func (this *SetProtoRevEnabledProposal) Equal(that interface{}) bool {
diff --git a/x/protorev/types/gov_test.go b/x/protorev/types/gov_test.go
index 22727b3380b..73695055d42 100644
--- a/x/protorev/types/gov_test.go
+++ b/x/protorev/types/gov_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 type GovTestSuite struct {
diff --git a/x/protorev/types/msg_test.go b/x/protorev/types/msg_test.go
index 8f9e7204a49..c8c006e0b52 100644
--- a/x/protorev/types/msg_test.go
+++ b/x/protorev/types/msg_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	"github.com/osmosis-labs/osmosis/v15/x/protorev/types"
+	"github.com/osmosis-labs/osmosis/v16/x/protorev/types"
 )
 
 func TestMsgSetHotRoutes(t *testing.T) {
diff --git a/x/protorev/types/params.pb.go b/x/protorev/types/params.pb.go
index ca426e111b9..39829ac6153 100644
--- a/x/protorev/types/params.pb.go
+++ b/x/protorev/types/params.pb.go
@@ -101,9 +101,9 @@ var fileDescriptor_72168e5a5a65ae7e = []byte{
 	0x88, 0x5a, 0xb0, 0xb0, 0x52, 0x10, 0x44, 0xda, 0xc9, 0xef, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f,
 	0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b,
 	0x8f, 0xe5, 0x18, 0xa2, 0x4c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5,
-	0xa1, 0xfe, 0xd1, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0x4d, 0xf5, 0x2b, 0x10,
+	0xa1, 0xfe, 0xd1, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x0c, 0xcd, 0xf4, 0x2b, 0x10,
 	0x21, 0x51, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xe6, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x9f, 0x60, 0x28, 0xda, 0x2a, 0x01, 0x00, 0x00,
+	0xff, 0x67, 0x8d, 0x7f, 0x28, 0x2a, 0x01, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/protorev/types/protorev.pb.go b/x/protorev/types/protorev.pb.go
index 4982098801c..2a8c49d2035 100644
--- a/x/protorev/types/protorev.pb.go
+++ b/x/protorev/types/protorev.pb.go
@@ -397,12 +397,12 @@ func init() {
 
 var fileDescriptor_1e9f2391fd9fec01 = []byte{
 	// 661 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xbd, 0x6f, 0xd3, 0x40,
-	0x14, 0xcf, 0x35, 0xe9, 0x47, 0xae, 0x1f, 0x29, 0x6e, 0x29, 0x6e, 0x06, 0x3b, 0x3a, 0xa4, 0x92,
-	0xa5, 0xb6, 0xc2, 0xc7, 0x52, 0x89, 0x01, 0x97, 0xa5, 0x42, 0x6a, 0xab, 0x6b, 0x25, 0x04, 0x8b,
-	0x75, 0x76, 0xae, 0xa9, 0xd5, 0xc4, 0x17, 0xf9, 0x2e, 0x85, 0xf6, 0xaf, 0x60, 0x80, 0x9d, 0xbf,
-	0x84, 0xb9, 0x63, 0xc7, 0x8a, 0xc1, 0x42, 0xe9, 0xc2, 0xec, 0x95, 0x05, 0xf9, 0xee, 0xec, 0x44,
-	0x15, 0x48, 0x30, 0xc0, 0xe4, 0xf7, 0x7e, 0xef, 0xfd, 0x7e, 0xef, 0xde, 0x7b, 0x77, 0x86, 0x8f,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xbf, 0x6f, 0xd3, 0x40,
+	0x14, 0xce, 0x35, 0xe9, 0x8f, 0x5c, 0x7f, 0xa4, 0xb8, 0xa5, 0xb8, 0x19, 0xec, 0xe8, 0x90, 0x4a,
+	0x96, 0xda, 0x0a, 0x20, 0x86, 0x4a, 0x0c, 0xb8, 0x2c, 0x15, 0x52, 0x5b, 0x5d, 0x2b, 0x21, 0x58,
+	0xac, 0xb3, 0x73, 0x4d, 0xad, 0x26, 0xbe, 0xc8, 0x77, 0x29, 0xb4, 0x7f, 0x05, 0x03, 0xec, 0xfc,
+	0x25, 0xcc, 0x1d, 0x3b, 0x56, 0x0c, 0x16, 0x4a, 0x17, 0x66, 0xaf, 0x2c, 0xc8, 0x77, 0x67, 0x27,
+	0xaa, 0x40, 0x82, 0x01, 0x26, 0xbf, 0xf7, 0xbd, 0xf7, 0x7d, 0xef, 0xde, 0x7b, 0x77, 0x86, 0x8f,
 	0x18, 0x1f, 0x30, 0x1e, 0x71, 0x77, 0x98, 0x30, 0xc1, 0x12, 0x7a, 0xee, 0x9e, 0x77, 0x02, 0x2a,
 	0x48, 0xa7, 0x04, 0x1c, 0x69, 0x18, 0xa6, 0x4e, 0x74, 0x4a, 0x5c, 0x27, 0x36, 0x37, 0x43, 0x19,
 	0xf2, 0x65, 0xc0, 0x55, 0x8e, 0xca, 0x6a, 0xae, 0xf7, 0x58, 0x8f, 0x29, 0x3c, 0xb7, 0x34, 0x6a,
@@ -437,8 +437,8 @@ var fileDescriptor_1e9f2391fd9fec01 = []byte{
 	0x11, 0x56, 0xe1, 0x7f, 0xfe, 0x2e, 0xbc, 0xfd, 0xab, 0xb1, 0x05, 0xae, 0xc7, 0x16, 0xf8, 0x36,
 	0xb6, 0xc0, 0x87, 0x5b, 0xab, 0x72, 0x7d, 0x6b, 0x55, 0x6e, 0x6e, 0xad, 0xca, 0xdb, 0xa7, 0x53,
 	0xfa, 0xfa, 0x71, 0x6f, 0xf7, 0x49, 0xc0, 0x0b, 0xc7, 0x3d, 0xef, 0x3c, 0x73, 0xdf, 0x4f, 0xfe,
-	0xbc, 0xb2, 0x62, 0x30, 0x27, 0xfd, 0x27, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xec, 0x1d, 0xab,
-	0xff, 0x9a, 0x05, 0x00, 0x00,
+	0xbc, 0xb2, 0x62, 0x30, 0x27, 0xfd, 0x27, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x14, 0xf0, 0xfc,
+	0x0d, 0x9a, 0x05, 0x00, 0x00,
 }
 
 func (this *TokenPairArbRoutes) Equal(that interface{}) bool {
diff --git a/x/protorev/types/query.pb.go b/x/protorev/types/query.pb.go
index 8878b1ddbaf..ce506de9df1 100644
--- a/x/protorev/types/query.pb.go
+++ b/x/protorev/types/query.pb.go
@@ -1427,7 +1427,7 @@ var fileDescriptor_f5e7ac9973cce389 = []byte{
 	// 1537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0xdc, 0x44,
 	0x1b, 0x8e, 0x7b, 0x48, 0xbe, 0x4e, 0xda, 0x7e, 0xed, 0xb4, 0x49, 0x13, 0x37, 0xdd, 0x4d, 0x27,
-	0xa7, 0xe6, 0xb4, 0xab, 0xb4, 0xe9, 0xd7, 0x8f, 0x43, 0x81, 0xb8, 0x81, 0x2a, 0xaa, 0x68, 0x16,
+	0xa7, 0xe6, 0xb4, 0xab, 0xb4, 0xf9, 0xda, 0x8f, 0x43, 0x81, 0xb8, 0x81, 0x2a, 0xaa, 0x68, 0x16,
 	0x53, 0x84, 0x04, 0x12, 0x8b, 0x77, 0x77, 0xb2, 0xb5, 0xea, 0xf5, 0xb8, 0xb6, 0x37, 0x64, 0x6f,
 	0x41, 0x42, 0x42, 0x20, 0x71, 0xba, 0xe6, 0x8e, 0x1f, 0xc0, 0x1f, 0xe0, 0x82, 0x0b, 0xa4, 0x5e,
 	0xa1, 0x4a, 0x08, 0x09, 0xf5, 0x62, 0xa9, 0x5a, 0x24, 0x6e, 0xb8, 0xda, 0x5f, 0x80, 0x3c, 0xf3,
@@ -1515,12 +1515,12 @@ var fileDescriptor_f5e7ac9973cce389 = []byte{
 	0xbb, 0x24, 0x7a, 0x2b, 0x07, 0x16, 0x3d, 0xcb, 0xad, 0x1c, 0xb3, 0xff, 0x59, 0x6e, 0xe5, 0xf8,
 	0x57, 0xc1, 0x7e, 0xb7, 0x72, 0xc8, 0xeb, 0xe3, 0x1f, 0x24, 0x84, 0xe3, 0xc6, 0x1d, 0xff, 0x7f,
 	0xf0, 0xfa, 0xbd, 0x5f, 0x03, 0xf2, 0x0b, 0x07, 0xc8, 0x04, 0xda, 0x73, 0x9c, 0x76, 0x1e, 0x5f,
-	0x4a, 0xa6, 0x0d, 0x9f, 0x07, 0xf8, 0x7b, 0x09, 0xfd, 0x37, 0xd2, 0x93, 0xf8, 0x7a, 0xb6, 0x1e,
-	0xf6, 0xc9, 0xfe, 0x2f, 0x6b, 0x1a, 0x30, 0x25, 0x9c, 0xe9, 0x14, 0x96, 0xd3, 0x7b, 0x5e, 0xb9,
+	0x4a, 0xa6, 0x0d, 0x9f, 0x07, 0xf8, 0x7b, 0x09, 0xfd, 0x37, 0xd2, 0x93, 0xf8, 0x7f, 0xd9, 0x7a,
+	0xd8, 0x27, 0x7b, 0x3d, 0x6b, 0x1a, 0x30, 0x25, 0x9c, 0xe9, 0x14, 0x96, 0xd3, 0x7b, 0x5e, 0xb9,
 	0xfb, 0xe8, 0x59, 0x4e, 0x7a, 0xfc, 0x2c, 0x27, 0x3d, 0x7d, 0x96, 0x93, 0xbe, 0x7a, 0x9e, 0x1b,
 	0x7a, 0xfc, 0x3c, 0x37, 0xf4, 0xfb, 0xf3, 0xdc, 0xd0, 0x7b, 0xeb, 0xa1, 0xff, 0xb4, 0x42, 0xfe,
 	0xaa, 0xa1, 0x55, 0x9c, 0x10, 0xd8, 0xf5, 0xe2, 0x5e, 0xe8, 0xbe, 0x6a, 0x59, 0xd4, 0xa9, 0x0c,
-	0xf3, 0xe7, 0x6b, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x61, 0x1e, 0x35, 0x74, 0xac, 0x17, 0x00,
+	0xf3, 0xe7, 0x6b, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x99, 0xf3, 0x62, 0x86, 0xac, 0x17, 0x00,
 	0x00,
 }
 
diff --git a/x/protorev/types/tx.pb.go b/x/protorev/types/tx.pb.go
index 34825e556a2..b944735e073 100644
--- a/x/protorev/types/tx.pb.go
+++ b/x/protorev/types/tx.pb.go
@@ -612,58 +612,58 @@ var fileDescriptor_2783dce032fc6954 = []byte{
 	// 854 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4f, 0x6f, 0xe3, 0x44,
 	0x18, 0xc6, 0x33, 0x5d, 0x40, 0xec, 0xa4, 0xc0, 0xc6, 0xfb, 0x2f, 0x71, 0x8b, 0x93, 0x9d, 0x6e,
-	0x77, 0xc3, 0xee, 0x26, 0xde, 0x24, 0x5b, 0x69, 0x15, 0x04, 0x52, 0xad, 0x3d, 0xc0, 0xa1, 0x28,
-	0xf2, 0x16, 0x21, 0x71, 0xc0, 0xd8, 0xc9, 0xe0, 0x58, 0x8d, 0x3d, 0x96, 0x67, 0x1a, 0xd2, 0x2b,
-	0x47, 0x4e, 0x48, 0xdc, 0x38, 0x70, 0xe0, 0x13, 0x80, 0x54, 0x38, 0x20, 0x71, 0xe0, 0xd6, 0x0b,
-	0x52, 0x05, 0x07, 0x38, 0x45, 0xa8, 0x45, 0xe2, 0x9e, 0x4f, 0x80, 0x32, 0x63, 0x3b, 0x69, 0x62,
-	0x93, 0x66, 0x73, 0xa9, 0x9a, 0x99, 0xe7, 0x7d, 0xde, 0xdf, 0xe3, 0x19, 0xbf, 0x86, 0x77, 0x08,
-	0x75, 0x09, 0x75, 0xa8, 0xea, 0x07, 0x84, 0x91, 0x00, 0xf7, 0xd5, 0x7e, 0xcd, 0xc2, 0xcc, 0xac,
-	0xa9, 0x6c, 0x50, 0xe5, 0x6b, 0x52, 0x3e, 0x94, 0x54, 0x23, 0x49, 0x35, 0x94, 0xc8, 0x37, 0x6c,
-	0x62, 0x13, 0xbe, 0xaa, 0x8e, 0xff, 0x13, 0x02, 0x39, 0x67, 0xba, 0x8e, 0x47, 0x54, 0xfe, 0x37,
-	0x5c, 0xda, 0xb4, 0x09, 0xb1, 0x7b, 0x58, 0x35, 0x7d, 0x47, 0x35, 0x3d, 0x8f, 0x30, 0x93, 0x39,
-	0xc4, 0x0b, 0x1d, 0xe5, 0xfb, 0xa9, 0x0c, 0x71, 0x47, 0x21, 0x2c, 0xb4, 0xb9, 0xd2, 0x10, 0x2d,
-	0xc5, 0x0f, 0xb1, 0x85, 0xfe, 0x04, 0xf0, 0x8d, 0x3d, 0x6a, 0x3f, 0xc7, 0xec, 0x3d, 0xc2, 0x74,
-	0x72, 0xc8, 0x30, 0x95, 0xde, 0x85, 0x2f, 0x9b, 0x1d, 0xd7, 0xf1, 0xf2, 0xa0, 0x04, 0xca, 0x57,
-	0xb5, 0xf2, 0x68, 0x58, 0x5c, 0x3f, 0x32, 0xdd, 0x5e, 0x13, 0xf1, 0x65, 0xf4, 0xfb, 0x71, 0xe5,
-	0x46, 0x68, 0xb2, 0xdb, 0xe9, 0x04, 0x98, 0xd2, 0xe7, 0x2c, 0x70, 0x3c, 0x5b, 0x17, 0x65, 0xd2,
-	0x67, 0x10, 0x76, 0x09, 0x33, 0x02, 0xee, 0x96, 0x5f, 0x2b, 0x5d, 0x29, 0x67, 0xeb, 0x8f, 0xaa,
-	0x69, 0x4f, 0xa3, 0xba, 0x4f, 0x0e, 0xb0, 0xd7, 0x32, 0x9d, 0x60, 0x37, 0xb0, 0x04, 0x81, 0x56,
-	0x38, 0x19, 0x16, 0x33, 0xa3, 0x61, 0x31, 0x27, 0xda, 0x4e, 0xdc, 0x90, 0x7e, 0xb5, 0x1b, 0x71,
-	0x36, 0x37, 0xbf, 0xfc, 0xf7, 0xfb, 0x07, 0xb7, 0xa3, 0x87, 0x30, 0x93, 0x02, 0x15, 0xe0, 0xed,
-	0x99, 0x25, 0x1d, 0x53, 0x9f, 0x78, 0x14, 0xa3, 0x13, 0x00, 0x6f, 0x89, 0xbd, 0x67, 0xb8, 0x8f,
-	0x7b, 0xc4, 0xc7, 0xc1, 0x6e, 0xbb, 0x4d, 0x0e, 0x3d, 0xb6, 0x72, 0xf6, 0xf7, 0x61, 0xae, 0x13,
-	0x79, 0x1a, 0xa6, 0x30, 0xcd, 0xaf, 0x71, 0xaf, 0xcd, 0xd1, 0xb0, 0x98, 0x17, 0x5e, 0x73, 0x12,
-	0xa4, 0x5f, 0xeb, 0xcc, 0xa0, 0x34, 0xb7, 0xc6, 0xf1, 0x94, 0x8b, 0xf1, 0x66, 0x79, 0x51, 0x09,
-	0x2a, 0xc9, 0x3b, 0x71, 0xd8, 0x9f, 0x01, 0xcc, 0x09, 0x49, 0x8b, 0x90, 0xde, 0x47, 0xd8, 0xb1,
-	0xbb, 0x6c, 0xf5, 0x33, 0xc6, 0x70, 0xdd, 0x27, 0xa4, 0x67, 0x7c, 0x2e, 0xfc, 0x78, 0xc4, 0x6c,
-	0x7d, 0x3b, 0xfd, 0x94, 0xa7, 0x9a, 0x6b, 0x1b, 0xe1, 0xf1, 0x5e, 0x17, 0x1d, 0xa7, 0x8d, 0x90,
-	0x9e, 0xf5, 0x27, 0x4a, 0xb4, 0x01, 0x0b, 0x73, 0xec, 0x71, 0xb2, 0x1f, 0x00, 0xcc, 0x8b, 0xdd,
-	0x3d, 0x73, 0x30, 0x16, 0xb4, 0x88, 0xe3, 0x31, 0xda, 0xc2, 0xc1, 0xfe, 0x60, 0xe5, 0x80, 0x1f,
-	0xc2, 0x5b, 0xae, 0x39, 0x30, 0x38, 0x9b, 0xcf, 0x7d, 0x8d, 0xf1, 0x79, 0xb1, 0x01, 0x8f, 0xfa,
-	0x92, 0x76, 0x67, 0x34, 0x2c, 0xbe, 0x29, 0x0c, 0x93, 0x75, 0x48, 0x97, 0xdc, 0x39, 0x2c, 0x84,
-	0x60, 0x29, 0x0d, 0x39, 0xce, 0xf5, 0x0b, 0x80, 0x1b, 0xc9, 0x22, 0xad, 0x47, 0xda, 0x07, 0x2b,
-	0x47, 0xfb, 0x04, 0x16, 0x92, 0x90, 0xad, 0xb1, 0x79, 0x98, 0xee, 0xee, 0x68, 0x58, 0x2c, 0xa5,
-	0xa7, 0xe3, 0x52, 0xa4, 0xdf, 0x74, 0x93, 0xf8, 0xd0, 0x36, 0xdc, 0xfa, 0x1f, 0xfc, 0x38, 0xe6,
-	0x31, 0x80, 0xd7, 0x84, 0x4e, 0x33, 0x29, 0x7e, 0x86, 0x3d, 0xe2, 0xae, 0x7e, 0x2f, 0x3f, 0x85,
-	0x59, 0xcb, 0xa4, 0xd8, 0xe8, 0x70, 0xbb, 0x70, 0xf8, 0x6c, 0xa5, 0x5f, 0xcb, 0xb8, 0xb5, 0x26,
-	0x87, 0x97, 0x52, 0x12, 0xed, 0xa6, 0x5c, 0x90, 0x0e, 0xad, 0x98, 0x10, 0xc9, 0xd1, 0xa5, 0x9b,
-	0x50, 0x47, 0x91, 0xea, 0x3f, 0xbe, 0x0a, 0xaf, 0xec, 0x51, 0x5b, 0xfa, 0x06, 0xc0, 0xf5, 0x0b,
-	0x23, 0xf5, 0xad, 0x74, 0x82, 0x99, 0x21, 0x25, 0xd7, 0x2e, 0x2d, 0x8d, 0x9f, 0xe4, 0xa3, 0x2f,
-	0xfe, 0xf8, 0xe7, 0xeb, 0xb5, 0x7b, 0xe8, 0xae, 0x1a, 0x4d, 0x8b, 0x7e, 0xed, 0xc9, 0xe4, 0xab,
-	0x40, 0x31, 0x33, 0x26, 0x23, 0x54, 0xfa, 0x09, 0xc0, 0xeb, 0x49, 0xa3, 0xef, 0xf1, 0xa2, 0xc6,
-	0xb3, 0x15, 0xf2, 0xd3, 0x65, 0x2b, 0x62, 0xe2, 0x06, 0x27, 0xae, 0xa0, 0x87, 0xe9, 0xc4, 0x73,
-	0x33, 0x52, 0xfa, 0x15, 0xc0, 0x9b, 0xc9, 0x2f, 0x7b, 0x7d, 0x11, 0xc8, 0x7c, 0x8d, 0xdc, 0x5c,
-	0xbe, 0x26, 0xc6, 0x7f, 0xca, 0xf1, 0xeb, 0xe8, 0x71, 0x3a, 0x7e, 0xf2, 0x50, 0x90, 0x7e, 0x03,
-	0x30, 0x9f, 0xfa, 0x62, 0xef, 0x2c, 0x8b, 0xc4, 0xcb, 0xe4, 0x77, 0x5e, 0xa8, 0x2c, 0x0e, 0xf3,
-	0x36, 0x0f, 0xb3, 0x83, 0x1a, 0xcb, 0x85, 0xe1, 0x33, 0x40, 0xfa, 0x0e, 0xc0, 0xd7, 0x67, 0x3e,
-	0x2d, 0x0f, 0x17, 0xe1, 0x4c, 0x89, 0xe5, 0xc6, 0x12, 0xe2, 0x98, 0xb8, 0xca, 0x89, 0xcb, 0xe8,
-	0x5e, 0x3a, 0xf1, 0xf4, 0x37, 0x45, 0xfa, 0x16, 0xc0, 0xd7, 0x2e, 0x8e, 0x99, 0x07, 0x8b, 0xda,
-	0x4e, 0xb4, 0x72, 0xfd, 0xf2, 0xda, 0x98, 0xb0, 0xc2, 0x09, 0xef, 0xa3, 0xed, 0x74, 0xc2, 0xa9,
-	0x01, 0xa3, 0x7d, 0x70, 0x72, 0xa6, 0x80, 0xd3, 0x33, 0x05, 0xfc, 0x7d, 0xa6, 0x80, 0xaf, 0xce,
-	0x95, 0xcc, 0xe9, 0xb9, 0x92, 0xf9, 0xeb, 0x5c, 0xc9, 0x7c, 0xfc, 0xc4, 0x76, 0x58, 0xf7, 0xd0,
-	0xaa, 0xb6, 0x89, 0x1b, 0x59, 0x55, 0x7a, 0xa6, 0x45, 0xa7, 0x7c, 0x77, 0xd4, 0xc1, 0xc4, 0x99,
-	0x1d, 0xf9, 0x98, 0x5a, 0xaf, 0xf0, 0xdf, 0x8d, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x95, 0x2a,
-	0xc8, 0xa3, 0xa6, 0x0a, 0x00, 0x00,
+	0x77, 0xc3, 0xee, 0x26, 0xde, 0x24, 0xbb, 0x68, 0x15, 0x04, 0x52, 0xad, 0x3d, 0xc0, 0xa1, 0x28,
+	0x72, 0x8b, 0x90, 0x38, 0x60, 0xec, 0x64, 0x70, 0xac, 0xc6, 0x1e, 0xcb, 0x33, 0x0d, 0xe9, 0x95,
+	0x23, 0x27, 0x24, 0x6e, 0x1c, 0x38, 0xf0, 0x09, 0x40, 0x2a, 0x1c, 0x90, 0x38, 0x70, 0xeb, 0x05,
+	0xa9, 0x82, 0x03, 0x9c, 0x22, 0xd4, 0x22, 0x71, 0xcf, 0x27, 0x40, 0x99, 0xb1, 0x9d, 0x34, 0xb1,
+	0x49, 0x43, 0x2e, 0x55, 0x33, 0xf3, 0xbc, 0xcf, 0xfb, 0x7b, 0x3c, 0xe3, 0xd7, 0xf0, 0x0e, 0xa1,
+	0x2e, 0xa1, 0x0e, 0x55, 0xfd, 0x80, 0x30, 0x12, 0xe0, 0xbe, 0xda, 0xaf, 0x59, 0x98, 0x99, 0x35,
+	0x95, 0x0d, 0xaa, 0x7c, 0x4d, 0xca, 0x87, 0x92, 0x6a, 0x24, 0xa9, 0x86, 0x12, 0xf9, 0x86, 0x4d,
+	0x6c, 0xc2, 0x57, 0xd5, 0xf1, 0x7f, 0x42, 0x20, 0xe7, 0x4c, 0xd7, 0xf1, 0x88, 0xca, 0xff, 0x86,
+	0x4b, 0x9b, 0x36, 0x21, 0x76, 0x0f, 0xab, 0xa6, 0xef, 0xa8, 0xa6, 0xe7, 0x11, 0x66, 0x32, 0x87,
+	0x78, 0xa1, 0xa3, 0x7c, 0x3f, 0x95, 0x21, 0xee, 0x28, 0x84, 0x85, 0x36, 0x57, 0x1a, 0xa2, 0xa5,
+	0xf8, 0x21, 0xb6, 0xd0, 0x1f, 0x00, 0xbe, 0xb6, 0x4b, 0xed, 0x3d, 0xcc, 0xde, 0x25, 0x4c, 0x27,
+	0x87, 0x0c, 0x53, 0xe9, 0x1d, 0xf8, 0xa2, 0xd9, 0x71, 0x1d, 0x2f, 0x0f, 0x4a, 0xa0, 0x7c, 0x55,
+	0x2b, 0x8f, 0x86, 0xc5, 0xf5, 0x23, 0xd3, 0xed, 0x35, 0x11, 0x5f, 0x46, 0xbf, 0x1d, 0x57, 0x6e,
+	0x84, 0x26, 0x3b, 0x9d, 0x4e, 0x80, 0x29, 0xdd, 0x63, 0x81, 0xe3, 0xd9, 0xba, 0x28, 0x93, 0x3e,
+	0x85, 0xb0, 0x4b, 0x98, 0x11, 0x70, 0xb7, 0xfc, 0x5a, 0xe9, 0x4a, 0x39, 0x5b, 0x7f, 0x54, 0x4d,
+	0x7b, 0x1a, 0xd5, 0x7d, 0x72, 0x80, 0xbd, 0x96, 0xe9, 0x04, 0x3b, 0x81, 0x25, 0x08, 0xb4, 0xc2,
+	0xc9, 0xb0, 0x98, 0x19, 0x0d, 0x8b, 0x39, 0xd1, 0x76, 0xe2, 0x86, 0xf4, 0xab, 0xdd, 0x88, 0xb3,
+	0xb9, 0xf9, 0xc5, 0x3f, 0xdf, 0x3d, 0xb8, 0x1d, 0x3d, 0x84, 0x99, 0x14, 0xa8, 0x00, 0x6f, 0xcf,
+	0x2c, 0xe9, 0x98, 0xfa, 0xc4, 0xa3, 0x18, 0x9d, 0x00, 0x78, 0x4b, 0xec, 0x3d, 0xc7, 0x7d, 0xdc,
+	0x23, 0x3e, 0x0e, 0x76, 0xda, 0x6d, 0x72, 0xe8, 0xb1, 0x95, 0xb3, 0xbf, 0x07, 0x73, 0x9d, 0xc8,
+	0xd3, 0x30, 0x85, 0x69, 0x7e, 0x8d, 0x7b, 0x6d, 0x8e, 0x86, 0xc5, 0xbc, 0xf0, 0x9a, 0x93, 0x20,
+	0xfd, 0x5a, 0x67, 0x06, 0xa5, 0xb9, 0x35, 0x8e, 0xa7, 0x5c, 0x8c, 0x37, 0xcb, 0x8b, 0x4a, 0x50,
+	0x49, 0xde, 0x89, 0xc3, 0xfe, 0x04, 0x60, 0x4e, 0x48, 0x5a, 0x84, 0xf4, 0x3e, 0xc4, 0x8e, 0xdd,
+	0x65, 0xab, 0x9f, 0x31, 0x86, 0xeb, 0x3e, 0x21, 0x3d, 0xe3, 0x33, 0xe1, 0xc7, 0x23, 0x66, 0xeb,
+	0xdb, 0xe9, 0xa7, 0x3c, 0xd5, 0x5c, 0xdb, 0x08, 0x8f, 0xf7, 0xba, 0xe8, 0x38, 0x6d, 0x84, 0xf4,
+	0xac, 0x3f, 0x51, 0xa2, 0x0d, 0x58, 0x98, 0x63, 0x8f, 0x93, 0x7d, 0x0f, 0x60, 0x5e, 0xec, 0xee,
+	0x9a, 0x83, 0xb1, 0xa0, 0x45, 0x1c, 0x8f, 0xd1, 0x16, 0x0e, 0xf6, 0x07, 0x2b, 0x07, 0xfc, 0x00,
+	0xde, 0x72, 0xcd, 0x81, 0xc1, 0xd9, 0x7c, 0xee, 0x6b, 0x8c, 0xcf, 0x8b, 0x0d, 0x78, 0xd4, 0x17,
+	0xb4, 0x3b, 0xa3, 0x61, 0xf1, 0x75, 0x61, 0x98, 0xac, 0x43, 0xba, 0xe4, 0xce, 0x61, 0x21, 0x04,
+	0x4b, 0x69, 0xc8, 0x71, 0xae, 0x9f, 0x01, 0xdc, 0x48, 0x16, 0x69, 0x3d, 0xd2, 0x3e, 0x58, 0x39,
+	0xda, 0xc7, 0xb0, 0x90, 0x84, 0x6c, 0x8d, 0xcd, 0xc3, 0x74, 0x77, 0x47, 0xc3, 0x62, 0x29, 0x3d,
+	0x1d, 0x97, 0x22, 0xfd, 0xa6, 0x9b, 0xc4, 0x87, 0xb6, 0xe1, 0xd6, 0x7f, 0xe0, 0xc7, 0x31, 0x8f,
+	0x01, 0xbc, 0x26, 0x74, 0x9a, 0x49, 0xf1, 0x73, 0xec, 0x11, 0x77, 0xf5, 0x7b, 0xf9, 0x09, 0xcc,
+	0x5a, 0x26, 0xc5, 0x46, 0x87, 0xdb, 0x85, 0xc3, 0x67, 0x2b, 0xfd, 0x5a, 0xc6, 0xad, 0x35, 0x39,
+	0xbc, 0x94, 0x92, 0x68, 0x37, 0xe5, 0x82, 0x74, 0x68, 0xc5, 0x84, 0x48, 0x8e, 0x2e, 0xdd, 0x84,
+	0x3a, 0x8a, 0x54, 0xff, 0xe1, 0x65, 0x78, 0x65, 0x97, 0xda, 0xd2, 0xd7, 0x00, 0xae, 0x5f, 0x18,
+	0xa9, 0x6f, 0xa4, 0x13, 0xcc, 0x0c, 0x29, 0xb9, 0x76, 0x69, 0x69, 0xfc, 0x24, 0x1f, 0x7d, 0xfe,
+	0xfb, 0xdf, 0x5f, 0xad, 0xdd, 0x43, 0x77, 0xd5, 0x68, 0x5a, 0xf4, 0x6b, 0x4f, 0x26, 0x5f, 0x05,
+	0x8a, 0x99, 0x31, 0x19, 0xa1, 0xd2, 0x8f, 0x00, 0x5e, 0x4f, 0x1a, 0x7d, 0x8f, 0x17, 0x35, 0x9e,
+	0xad, 0x90, 0x9f, 0x2d, 0x5b, 0x11, 0x13, 0x37, 0x38, 0x71, 0x05, 0x3d, 0x4c, 0x27, 0x9e, 0x9b,
+	0x91, 0xd2, 0x2f, 0x00, 0xde, 0x4c, 0x7e, 0xd9, 0xeb, 0x8b, 0x40, 0xe6, 0x6b, 0xe4, 0xe6, 0xf2,
+	0x35, 0x31, 0xfe, 0x33, 0x8e, 0x5f, 0x47, 0x8f, 0xd3, 0xf1, 0x93, 0x87, 0x82, 0xf4, 0x2b, 0x80,
+	0xf9, 0xd4, 0x17, 0xfb, 0xe9, 0xb2, 0x48, 0xbc, 0x4c, 0x7e, 0xfb, 0x7f, 0x95, 0xc5, 0x61, 0xde,
+	0xe2, 0x61, 0x9e, 0xa2, 0xc6, 0x72, 0x61, 0xf8, 0x0c, 0x90, 0xbe, 0x05, 0xf0, 0xd5, 0x99, 0x4f,
+	0xcb, 0xc3, 0x45, 0x38, 0x53, 0x62, 0xb9, 0xb1, 0x84, 0x38, 0x26, 0xae, 0x72, 0xe2, 0x32, 0xba,
+	0x97, 0x4e, 0x3c, 0xfd, 0x4d, 0x91, 0xbe, 0x01, 0xf0, 0x95, 0x8b, 0x63, 0xe6, 0xc1, 0xa2, 0xb6,
+	0x13, 0xad, 0x5c, 0xbf, 0xbc, 0x36, 0x26, 0xac, 0x70, 0xc2, 0xfb, 0x68, 0x3b, 0x9d, 0x70, 0x6a,
+	0xc0, 0x68, 0xef, 0x9f, 0x9c, 0x29, 0xe0, 0xf4, 0x4c, 0x01, 0x7f, 0x9d, 0x29, 0xe0, 0xcb, 0x73,
+	0x25, 0x73, 0x7a, 0xae, 0x64, 0xfe, 0x3c, 0x57, 0x32, 0x1f, 0x3d, 0xb1, 0x1d, 0xd6, 0x3d, 0xb4,
+	0xaa, 0x6d, 0xe2, 0x46, 0x56, 0x95, 0x9e, 0x69, 0xd1, 0x29, 0xdf, 0x37, 0xd5, 0xc1, 0xc4, 0x99,
+	0x1d, 0xf9, 0x98, 0x5a, 0x2f, 0xf1, 0xdf, 0x8d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xc7,
+	0x9f, 0x51, 0xa6, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/superfluid/abci.go b/x/superfluid/abci.go
index 9d6196ae2eb..95b4f9aa807 100644
--- a/x/superfluid/abci.go
+++ b/x/superfluid/abci.go
@@ -1,8 +1,8 @@
 package superfluid
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/client/cli/query.go b/x/superfluid/client/cli/query.go
index bbebe011ed5..5042553313f 100644
--- a/x/superfluid/client/cli/query.go
+++ b/x/superfluid/client/cli/query.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
diff --git a/x/superfluid/client/cli/query_test.go b/x/superfluid/client/cli/query_test.go
index d37903262d8..ad5dd18fc25 100644
--- a/x/superfluid/client/cli/query_test.go
+++ b/x/superfluid/client/cli/query_test.go
@@ -11,8 +11,8 @@ import (
 
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/superfluid/client/cli/tx.go b/x/superfluid/client/cli/tx.go
index ff5c7a020b0..3d13ead10f6 100644
--- a/x/superfluid/client/cli/tx.go
+++ b/x/superfluid/client/cli/tx.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -19,8 +19,8 @@ import (
 	govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // GetTxCmd returns the transaction commands for this module.
diff --git a/x/superfluid/client/proposal_handler.go b/x/superfluid/client/proposal_handler.go
index eb6e8450593..4c00636897e 100644
--- a/x/superfluid/client/proposal_handler.go
+++ b/x/superfluid/client/proposal_handler.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/client/rest"
 
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 )
diff --git a/x/superfluid/keeper/concentrated_liquidity.go b/x/superfluid/keeper/concentrated_liquidity.go
index 1819bfdbaa6..fa1925d417b 100644
--- a/x/superfluid/keeper/concentrated_liquidity.go
+++ b/x/superfluid/keeper/concentrated_liquidity.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 // addToConcentratedLiquiditySuperfluidPosition adds the specified amounts of tokens to an existing superfluid staked
diff --git a/x/superfluid/keeper/concentrated_liquidity_test.go b/x/superfluid/keeper/concentrated_liquidity_test.go
index 22976a9c00d..c4583cbc119 100644
--- a/x/superfluid/keeper/concentrated_liquidity_test.go
+++ b/x/superfluid/keeper/concentrated_liquidity_test.go
@@ -8,9 +8,9 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) TestAddToConcentratedLiquiditySuperfluidPosition() {
diff --git a/x/superfluid/keeper/distribution_test.go b/x/superfluid/keeper/distribution_test.go
index e4238625435..7fca50e5352 100644
--- a/x/superfluid/keeper/distribution_test.go
+++ b/x/superfluid/keeper/distribution_test.go
@@ -1,8 +1,8 @@
 package keeper_test
 
 import (
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
diff --git a/x/superfluid/keeper/edge_case_test.go b/x/superfluid/keeper/edge_case_test.go
index 1d51a7c8d53..9ea237a53f9 100644
--- a/x/superfluid/keeper/edge_case_test.go
+++ b/x/superfluid/keeper/edge_case_test.go
@@ -7,7 +7,7 @@ import (
 	evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 func (s *KeeperTestSuite) TestSuperfluidDelegatedValidatorJailed() {
diff --git a/x/superfluid/keeper/epoch.go b/x/superfluid/keeper/epoch.go
index 4c4f461f7f3..3f5292a6c4f 100644
--- a/x/superfluid/keeper/epoch.go
+++ b/x/superfluid/keeper/epoch.go
@@ -9,13 +9,13 @@ import (
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64) error {
diff --git a/x/superfluid/keeper/epoch_test.go b/x/superfluid/keeper/epoch_test.go
index 531d2ebf93f..2d130bc2b15 100644
--- a/x/superfluid/keeper/epoch_test.go
+++ b/x/superfluid/keeper/epoch_test.go
@@ -5,9 +5,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) TestUpdateOsmoEquivalentMultipliers() {
diff --git a/x/superfluid/keeper/export_test.go b/x/superfluid/keeper/export_test.go
index a24665b74e0..037c4615ac8 100644
--- a/x/superfluid/keeper/export_test.go
+++ b/x/superfluid/keeper/export_test.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 var (
diff --git a/x/superfluid/keeper/genesis.go b/x/superfluid/keeper/genesis.go
index c37882ed7a3..0bebc55db4e 100644
--- a/x/superfluid/keeper/genesis.go
+++ b/x/superfluid/keeper/genesis.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 // InitGenesis initializes the capability module's state from a provided genesis
diff --git a/x/superfluid/keeper/genesis_test.go b/x/superfluid/keeper/genesis_test.go
index 6090335ebf1..851c8a36499 100644
--- a/x/superfluid/keeper/genesis_test.go
+++ b/x/superfluid/keeper/genesis_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/require"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	simapp "github.com/osmosis-labs/osmosis/v15/app"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	simapp "github.com/osmosis-labs/osmosis/v16/app"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/gov/gov.go b/x/superfluid/keeper/gov/gov.go
index eae3579832e..e5a1488e096 100644
--- a/x/superfluid/keeper/gov/gov.go
+++ b/x/superfluid/keeper/gov/gov.go
@@ -6,10 +6,10 @@ import (
 	"sort"
 	"strings"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/internal/events"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/internal/events"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/gov/gov_test.go b/x/superfluid/keeper/gov/gov_test.go
index 5ddbb08f219..03026c0cdb8 100644
--- a/x/superfluid/keeper/gov/gov_test.go
+++ b/x/superfluid/keeper/gov/gov_test.go
@@ -4,12 +4,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/gov"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/gov"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) createGammPool(denoms []string) uint64 {
diff --git a/x/superfluid/keeper/gov/suite_test.go b/x/superfluid/keeper/gov/suite_test.go
index f73f31561cf..dbbbbd51329 100644
--- a/x/superfluid/keeper/gov/suite_test.go
+++ b/x/superfluid/keeper/gov/suite_test.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go
index 5335cdee04b..59d33caf159 100644
--- a/x/superfluid/keeper/grpc_query.go
+++ b/x/superfluid/keeper/grpc_query.go
@@ -13,13 +13,13 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	"github.com/cosmos/cosmos-sdk/types/query"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go
index 4228d72f078..c99ec2f3872 100644
--- a/x/superfluid/keeper/grpc_query_test.go
+++ b/x/superfluid/keeper/grpc_query_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) TestGRPCParams() {
diff --git a/x/superfluid/keeper/hooks.go b/x/superfluid/keeper/hooks.go
index 6e41b9f61ce..37035355540 100644
--- a/x/superfluid/keeper/hooks.go
+++ b/x/superfluid/keeper/hooks.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"time"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/internal/events"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/internal/events"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/superfluid/keeper/hooks_test.go b/x/superfluid/keeper/hooks_test.go
index da97d6378e8..d4ec2d762cc 100644
--- a/x/superfluid/keeper/hooks_test.go
+++ b/x/superfluid/keeper/hooks_test.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	lockupkeeper "github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockupkeeper "github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) TestSuperfluidAfterEpochEnd() {
diff --git a/x/superfluid/keeper/intermediary_account.go b/x/superfluid/keeper/intermediary_account.go
index a5547feb041..d38e414124f 100644
--- a/x/superfluid/keeper/intermediary_account.go
+++ b/x/superfluid/keeper/intermediary_account.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	"github.com/gogo/protobuf/proto"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/superfluid/keeper/intermediary_account_test.go b/x/superfluid/keeper/intermediary_account_test.go
index eb02d263070..ebfe72d7d43 100644
--- a/x/superfluid/keeper/intermediary_account_test.go
+++ b/x/superfluid/keeper/intermediary_account_test.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func (s *KeeperTestSuite) TestIntermediaryAccountCreation() {
diff --git a/x/superfluid/keeper/internal/events/emit.go b/x/superfluid/keeper/internal/events/emit.go
index b2c68e8a07c..ee8913e8f32 100644
--- a/x/superfluid/keeper/internal/events/emit.go
+++ b/x/superfluid/keeper/internal/events/emit.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func EmitSetSuperfluidAssetEvent(ctx sdk.Context, denom string, assetType types.SuperfluidAssetType) {
diff --git a/x/superfluid/keeper/internal/events/emit_test.go b/x/superfluid/keeper/internal/events/emit_test.go
index d40ea84a960..8196f4b112a 100644
--- a/x/superfluid/keeper/internal/events/emit_test.go
+++ b/x/superfluid/keeper/internal/events/emit_test.go
@@ -8,9 +8,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/internal/events"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/internal/events"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 type SuperfluidEventsTestSuite struct {
diff --git a/x/superfluid/keeper/invariants.go b/x/superfluid/keeper/invariants.go
index 828a9ecc47b..8147c05eb4c 100644
--- a/x/superfluid/keeper/invariants.go
+++ b/x/superfluid/keeper/invariants.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 const totalSuperfluidDelegationInvariantName = "total-superfluid-delegation-invariant-name"
diff --git a/x/superfluid/keeper/keeper.go b/x/superfluid/keeper/keeper.go
index e0517c1cec6..2a5f0e789b8 100644
--- a/x/superfluid/keeper/keeper.go
+++ b/x/superfluid/keeper/keeper.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go
index c237151e991..50b9210c697 100644
--- a/x/superfluid/keeper/keeper_test.go
+++ b/x/superfluid/keeper/keeper_test.go
@@ -10,13 +10,13 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	minttypes "github.com/osmosis-labs/osmosis/v15/x/mint/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	minttypes "github.com/osmosis-labs/osmosis/v16/x/mint/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/superfluid/keeper/migrate.go b/x/superfluid/keeper/migrate.go
index bdec3c159c6..9ffee48f46f 100644
--- a/x/superfluid/keeper/migrate.go
+++ b/x/superfluid/keeper/migrate.go
@@ -7,10 +7,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 type MigrationType int
diff --git a/x/superfluid/keeper/migrate_test.go b/x/superfluid/keeper/migrate_test.go
index 8553d59b076..f1ea89798f9 100644
--- a/x/superfluid/keeper/migrate_test.go
+++ b/x/superfluid/keeper/migrate_test.go
@@ -11,12 +11,12 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 // We test migrating in the following circumstances:
diff --git a/x/superfluid/keeper/msg_server.go b/x/superfluid/keeper/msg_server.go
index 7a9b3df12bc..d54ed4883c1 100644
--- a/x/superfluid/keeper/msg_server.go
+++ b/x/superfluid/keeper/msg_server.go
@@ -8,11 +8,11 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/internal/events"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/internal/events"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 type msgServer struct {
diff --git a/x/superfluid/keeper/msg_server_test.go b/x/superfluid/keeper/msg_server_test.go
index 3ff188921b4..c9eb177ae20 100644
--- a/x/superfluid/keeper/msg_server_test.go
+++ b/x/superfluid/keeper/msg_server_test.go
@@ -6,14 +6,14 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	v8constants "github.com/osmosis-labs/osmosis/v15/app/upgrades/v8/constants"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockupkeeper "github.com/osmosis-labs/osmosis/v15/x/lockup/keeper"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	v8constants "github.com/osmosis-labs/osmosis/v16/app/upgrades/v8/constants"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockupkeeper "github.com/osmosis-labs/osmosis/v16/x/lockup/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 var defaultFunds = sdk.NewCoins(defaultPoolAssets[0].Token, sdk.NewCoin("stake", sdk.NewInt(5000000000)))
diff --git a/x/superfluid/keeper/params.go b/x/superfluid/keeper/params.go
index 3c7ea17bf99..0c98c0380fa 100644
--- a/x/superfluid/keeper/params.go
+++ b/x/superfluid/keeper/params.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/slash.go b/x/superfluid/keeper/slash.go
index 3c84844281c..99a16f8351d 100644
--- a/x/superfluid/keeper/slash.go
+++ b/x/superfluid/keeper/slash.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/slash_test.go b/x/superfluid/keeper/slash_test.go
index fa7b40f2e9e..c25ba3a8de7 100644
--- a/x/superfluid/keeper/slash_test.go
+++ b/x/superfluid/keeper/slash_test.go
@@ -3,11 +3,11 @@ package keeper_test
 import (
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/accum"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	cl "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
diff --git a/x/superfluid/keeper/stake.go b/x/superfluid/keeper/stake.go
index e0eeeb64373..9f9fc3b92df 100644
--- a/x/superfluid/keeper/stake.go
+++ b/x/superfluid/keeper/stake.go
@@ -6,8 +6,8 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
diff --git a/x/superfluid/keeper/stake_test.go b/x/superfluid/keeper/stake_test.go
index 56cf8920cbf..9060cca2163 100644
--- a/x/superfluid/keeper/stake_test.go
+++ b/x/superfluid/keeper/stake_test.go
@@ -5,10 +5,10 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/superfluid/keeper/superfluid_asset.go b/x/superfluid/keeper/superfluid_asset.go
index 84d5557652c..29abc8ac9ca 100644
--- a/x/superfluid/keeper/superfluid_asset.go
+++ b/x/superfluid/keeper/superfluid_asset.go
@@ -2,7 +2,7 @@ package keeper
 
 import (
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/superfluid_asset_store.go b/x/superfluid/keeper/superfluid_asset_store.go
index ea43da1bad6..d58bef96b11 100644
--- a/x/superfluid/keeper/superfluid_asset_store.go
+++ b/x/superfluid/keeper/superfluid_asset_store.go
@@ -8,7 +8,7 @@ import (
 	errorsmod "cosmossdk.io/errors"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/superfluid/keeper/superfluid_asset_test.go b/x/superfluid/keeper/superfluid_asset_test.go
index 8d544be42b4..a484d80d640 100644
--- a/x/superfluid/keeper/superfluid_asset_test.go
+++ b/x/superfluid/keeper/superfluid_asset_test.go
@@ -1,7 +1,7 @@
 package keeper_test
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/synthetic_lock_wrapper.go b/x/superfluid/keeper/synthetic_lock_wrapper.go
index ee37602550c..b2edeff6c87 100644
--- a/x/superfluid/keeper/synthetic_lock_wrapper.go
+++ b/x/superfluid/keeper/synthetic_lock_wrapper.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/twap_price.go b/x/superfluid/keeper/twap_price.go
index 74f4e748f17..8b464232f62 100644
--- a/x/superfluid/keeper/twap_price.go
+++ b/x/superfluid/keeper/twap_price.go
@@ -3,8 +3,8 @@ package keeper
 import (
 	"github.com/gogo/protobuf/proto"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/superfluid/keeper/twap_price_test.go b/x/superfluid/keeper/twap_price_test.go
index c8af613ac2d..a0222821e69 100644
--- a/x/superfluid/keeper/twap_price_test.go
+++ b/x/superfluid/keeper/twap_price_test.go
@@ -1,8 +1,8 @@
 package keeper_test
 
 import (
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/superfluid/keeper/unpool.go b/x/superfluid/keeper/unpool.go
index f2be67e163c..6bfcc9a038e 100644
--- a/x/superfluid/keeper/unpool.go
+++ b/x/superfluid/keeper/unpool.go
@@ -6,10 +6,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 // Returns a list of newly created lockIDs, or an error.
diff --git a/x/superfluid/keeper/unpool_test.go b/x/superfluid/keeper/unpool_test.go
index b10d5b1d34a..00705c0e47a 100644
--- a/x/superfluid/keeper/unpool_test.go
+++ b/x/superfluid/keeper/unpool_test.go
@@ -9,11 +9,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 var (
diff --git a/x/superfluid/module.go b/x/superfluid/module.go
index ccbb3ae50ae..fc9c404bb99 100644
--- a/x/superfluid/module.go
+++ b/x/superfluid/module.go
@@ -26,12 +26,12 @@ import (
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/mint/client/rest"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/simulation"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/mint/client/rest"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/simulation"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 var (
diff --git a/x/superfluid/proposal_handler.go b/x/superfluid/proposal_handler.go
index 5c51cb91a7a..328c2b6fdda 100644
--- a/x/superfluid/proposal_handler.go
+++ b/x/superfluid/proposal_handler.go
@@ -7,9 +7,9 @@ import (
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper/gov"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper/gov"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 func NewSuperfluidProposalHandler(k keeper.Keeper, ek types.EpochKeeper, gk types.GammKeeper) govtypes.Handler {
diff --git a/x/superfluid/simulation/genesis.go b/x/superfluid/simulation/genesis.go
index 48a5ac1dcd7..eba48f671f5 100644
--- a/x/superfluid/simulation/genesis.go
+++ b/x/superfluid/simulation/genesis.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/x/superfluid/simulation/operations.go b/x/superfluid/simulation/operations.go
index 70eb55fd7ac..9c78a2549c5 100644
--- a/x/superfluid/simulation/operations.go
+++ b/x/superfluid/simulation/operations.go
@@ -3,13 +3,13 @@ package simulation
 import (
 	"math/rand"
 
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
diff --git a/x/superfluid/simulation/proposals.go b/x/superfluid/simulation/proposals.go
index b9a598b51a1..db8727f5043 100644
--- a/x/superfluid/simulation/proposals.go
+++ b/x/superfluid/simulation/proposals.go
@@ -7,9 +7,9 @@ import (
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 )
 
 const (
diff --git a/x/superfluid/types/errors.go b/x/superfluid/types/errors.go
index cd1552ccb58..238f4af985c 100644
--- a/x/superfluid/types/errors.go
+++ b/x/superfluid/types/errors.go
@@ -6,7 +6,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 // x/superfluid module errors.
diff --git a/x/superfluid/types/expected_keepers.go b/x/superfluid/types/expected_keepers.go
index 5ebcd01945b..ecf7bb76f4e 100644
--- a/x/superfluid/types/expected_keepers.go
+++ b/x/superfluid/types/expected_keepers.go
@@ -7,11 +7,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/model"
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	incentivestypes "github.com/osmosis-labs/osmosis/v15/x/incentives/types"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/v16/x/incentives/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/superfluid/types/genesis.pb.go b/x/superfluid/types/genesis.pb.go
index 2938790c00e..f4c9d6f3d5a 100644
--- a/x/superfluid/types/genesis.pb.go
+++ b/x/superfluid/types/genesis.pb.go
@@ -114,30 +114,30 @@ func init() { proto.RegisterFile("osmosis/superfluid/genesis.proto", fileDescrip
 
 var fileDescriptor_d5256ebb7c83fff3 = []byte{
 	// 382 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x4e, 0xc2, 0x40,
-	0x10, 0x87, 0x5b, 0x41, 0x0e, 0xc5, 0x83, 0x36, 0x98, 0x54, 0x8c, 0x85, 0xc8, 0x85, 0x8b, 0x6d,
-	0xc0, 0xf8, 0xe7, 0x0a, 0xc6, 0x18, 0x12, 0x8d, 0x04, 0x12, 0x0f, 0x5e, 0x9a, 0xa5, 0xac, 0x75,
-	0x63, 0xdb, 0xad, 0x3b, 0x5b, 0x02, 0x0f, 0xe0, 0x9d, 0xc7, 0xe2, 0xc8, 0xd1, 0x93, 0x31, 0xf0,
-	0x22, 0xa6, 0xed, 0x5a, 0x50, 0xaa, 0xb7, 0x69, 0xe7, 0xfb, 0xcd, 0x37, 0x9b, 0x8c, 0x52, 0xa5,
-	0xe0, 0x51, 0x20, 0x60, 0x42, 0x18, 0x60, 0xf6, 0xe4, 0x86, 0x64, 0x68, 0x3a, 0xd8, 0xc7, 0x40,
-	0xc0, 0x08, 0x18, 0xe5, 0x54, 0x55, 0x05, 0x61, 0xac, 0x88, 0x72, 0xc9, 0xa1, 0x0e, 0x8d, 0xdb,
-	0x66, 0x54, 0x25, 0x64, 0xb9, 0x96, 0x31, 0x6b, 0x55, 0x0a, 0xa8, 0x92, 0x01, 0x05, 0x88, 0x21,
-	0x4f, 0xf8, 0x8e, 0xa7, 0x79, 0x65, 0xe7, 0x26, 0xd9, 0xa0, 0xcf, 0x11, 0xc7, 0xea, 0xa5, 0x52,
-	0x48, 0x00, 0x4d, 0xae, 0xca, 0xf5, 0x62, 0xb3, 0x6c, 0x6c, 0x6e, 0x64, 0x74, 0x63, 0xa2, 0x9d,
-	0x9f, 0x7d, 0x54, 0xa4, 0x9e, 0xe0, 0xd5, 0x07, 0x65, 0x6f, 0x85, 0x58, 0x08, 0x00, 0x73, 0xd0,
-	0xb6, 0xaa, 0xb9, 0x7a, 0xb1, 0x59, 0xcb, 0x1a, 0xd2, 0x4f, 0xcb, 0x56, 0xc4, 0x8a, 0x69, 0xbb,
-	0xf0, 0xf3, 0x37, 0xa8, 0x63, 0xe5, 0x30, 0x4a, 0x5b, 0xf8, 0x35, 0x24, 0x23, 0xe4, 0x62, 0x9f,
-	0x5b, 0x5e, 0xe8, 0x72, 0x12, 0xb8, 0x04, 0x33, 0xd0, 0x72, 0xb1, 0xa1, 0x99, 0x65, 0xb8, 0x07,
-	0x8f, 0x5e, 0xa7, 0xa9, 0xbb, 0x34, 0xd4, 0xc3, 0x36, 0x65, 0x43, 0x21, 0x3c, 0xa0, 0x7f, 0x50,
-	0xa0, 0xba, 0xca, 0x3e, 0xf1, 0x39, 0x66, 0x1e, 0x1e, 0x12, 0xc4, 0x26, 0x16, 0xb2, 0x6d, 0x1a,
-	0xfa, 0x1c, 0xb4, 0x7c, 0xec, 0x6c, 0xfc, 0xff, 0xaa, 0xce, 0x5a, 0xb4, 0x95, 0x24, 0x85, 0xb2,
-	0x44, 0x36, 0x5b, 0xa0, 0xbe, 0xc9, 0x4a, 0x25, 0x6a, 0xfc, 0xb2, 0x59, 0x36, 0xf5, 0x7d, 0x6c,
-	0x73, 0x42, 0x7d, 0xd0, 0xb6, 0x63, 0xf1, 0x45, 0x96, 0xf8, 0x96, 0xda, 0x2f, 0x9d, 0x2c, 0xe9,
-	0x55, 0x9a, 0x17, 0xfa, 0xa3, 0x35, 0xcb, 0x06, 0x03, 0xed, 0xee, 0x6c, 0xa1, 0xcb, 0xf3, 0x85,
-	0x2e, 0x7f, 0x2e, 0x74, 0x79, 0xba, 0xd4, 0xa5, 0xf9, 0x52, 0x97, 0xde, 0x97, 0xba, 0xf4, 0x78,
-	0xee, 0x10, 0xfe, 0x1c, 0x0e, 0x0c, 0x9b, 0x7a, 0xa6, 0xd8, 0xe0, 0xc4, 0x45, 0x03, 0xf8, 0xfe,
-	0x30, 0x47, 0x8d, 0x33, 0x73, 0xbc, 0x7e, 0x6b, 0x7c, 0x12, 0x60, 0x18, 0x14, 0xe2, 0x5b, 0x3b,
-	0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x72, 0x55, 0x84, 0xff, 0x02, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x4f, 0xc2, 0x40,
+	0x14, 0xc7, 0x5b, 0x41, 0x86, 0xe2, 0xa0, 0x0d, 0x26, 0x15, 0x63, 0x21, 0xb2, 0xb0, 0xd8, 0x06,
+	0x4c, 0xd0, 0x15, 0x8c, 0x31, 0x24, 0x1a, 0x09, 0x24, 0x0e, 0x2e, 0xcd, 0x51, 0xce, 0x7a, 0xb1,
+	0xed, 0xd5, 0x7b, 0x57, 0x02, 0x1f, 0xc0, 0x9d, 0x8f, 0xc5, 0xc8, 0xe8, 0x64, 0x0c, 0x7c, 0x11,
+	0xd3, 0xf6, 0x2c, 0x28, 0xd5, 0xed, 0xb5, 0xef, 0xf7, 0x7f, 0xbf, 0x77, 0xc9, 0x53, 0xaa, 0x14,
+	0x3c, 0x0a, 0x04, 0x4c, 0x08, 0x03, 0xcc, 0x9e, 0xdc, 0x90, 0x8c, 0x4c, 0x07, 0xfb, 0x18, 0x08,
+	0x18, 0x01, 0xa3, 0x9c, 0xaa, 0xaa, 0x20, 0x8c, 0x35, 0x51, 0x2e, 0x39, 0xd4, 0xa1, 0x71, 0xdb,
+	0x8c, 0xaa, 0x84, 0x2c, 0xd7, 0x32, 0x66, 0xad, 0x4b, 0x01, 0x55, 0x32, 0xa0, 0x00, 0x31, 0xe4,
+	0x09, 0xdf, 0xe9, 0x2c, 0xaf, 0xec, 0xdd, 0x24, 0x1b, 0x0c, 0x38, 0xe2, 0x58, 0xbd, 0x54, 0x0a,
+	0x09, 0xa0, 0xc9, 0x55, 0xb9, 0x5e, 0x6c, 0x96, 0x8d, 0xed, 0x8d, 0x8c, 0x5e, 0x4c, 0x74, 0xf2,
+	0xf3, 0x8f, 0x8a, 0xd4, 0x17, 0xbc, 0xfa, 0xa0, 0x1c, 0xac, 0x11, 0x0b, 0x01, 0x60, 0x0e, 0xda,
+	0x4e, 0x35, 0x57, 0x2f, 0x36, 0x6b, 0x59, 0x43, 0x06, 0x69, 0xd9, 0x8e, 0x58, 0x31, 0x6d, 0x1f,
+	0x7e, 0xfe, 0x06, 0x75, 0xa2, 0x1c, 0x47, 0x69, 0x0b, 0xbf, 0x86, 0x64, 0x8c, 0x5c, 0xec, 0x73,
+	0xcb, 0x0b, 0x5d, 0x4e, 0x02, 0x97, 0x60, 0x06, 0x5a, 0x2e, 0x36, 0x34, 0xb3, 0x0c, 0xf7, 0xe0,
+	0xd1, 0xeb, 0x34, 0x75, 0x97, 0x86, 0xfa, 0xd8, 0xa6, 0x6c, 0x24, 0x84, 0x47, 0xf4, 0x0f, 0x0a,
+	0x54, 0x57, 0x39, 0x24, 0x3e, 0xc7, 0xcc, 0xc3, 0x23, 0x82, 0xd8, 0xd4, 0x42, 0xb6, 0x4d, 0x43,
+	0x9f, 0x83, 0x96, 0x8f, 0x9d, 0x8d, 0xff, 0x5f, 0xd5, 0xdd, 0x88, 0xb6, 0x93, 0xa4, 0x50, 0x96,
+	0xc8, 0x76, 0x0b, 0xd4, 0x37, 0x59, 0xa9, 0x44, 0x8d, 0x5f, 0x36, 0xcb, 0xa6, 0xbe, 0x8f, 0x6d,
+	0x4e, 0xa8, 0x0f, 0xda, 0x6e, 0x2c, 0xbe, 0xc8, 0x12, 0xdf, 0x52, 0xfb, 0xa5, 0x9b, 0x25, 0xbd,
+	0x4a, 0xf3, 0x42, 0x7f, 0xb2, 0x61, 0xd9, 0x62, 0xa0, 0xd3, 0x9b, 0x2f, 0x75, 0x79, 0xb1, 0xd4,
+	0xe5, 0xcf, 0xa5, 0x2e, 0xcf, 0x56, 0xba, 0xb4, 0x58, 0xe9, 0xd2, 0xfb, 0x4a, 0x97, 0x1e, 0x5b,
+	0x0e, 0xe1, 0xcf, 0xe1, 0xd0, 0xb0, 0xa9, 0x67, 0x8a, 0x0d, 0xce, 0x5c, 0x34, 0x84, 0xef, 0x0f,
+	0x73, 0xdc, 0x68, 0x99, 0x93, 0xcd, 0x5b, 0xe3, 0xd3, 0x00, 0xc3, 0xb0, 0x10, 0xdf, 0xda, 0xf9,
+	0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x75, 0x8b, 0x86, 0xff, 0x02, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/superfluid/types/gov.go b/x/superfluid/types/gov.go
index 1ad7dd8de97..076fb8db098 100644
--- a/x/superfluid/types/gov.go
+++ b/x/superfluid/types/gov.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strings"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	cltypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
+	cltypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
 )
 
 const (
diff --git a/x/superfluid/types/gov.pb.go b/x/superfluid/types/gov.pb.go
index 7e19d4e3d44..831b28d1b04 100644
--- a/x/superfluid/types/gov.pb.go
+++ b/x/superfluid/types/gov.pb.go
@@ -158,35 +158,35 @@ func init() {
 
 var fileDescriptor_2e37d6a8d0e42294 = []byte{
 	// 464 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x33, 0xb6, 0x2e, 0xee, 0xd4, 0x83, 0x86, 0x15, 0x6b, 0xc5, 0xa4, 0xee, 0x8a, 0x14,
-	0x21, 0x09, 0x55, 0xdc, 0xc3, 0xde, 0x76, 0xf5, 0x28, 0xba, 0x64, 0x29, 0x82, 0x97, 0x92, 0x36,
-	0xcf, 0xee, 0x40, 0x92, 0x37, 0x64, 0x5e, 0xb2, 0xfa, 0x0d, 0xc4, 0x93, 0x47, 0x8f, 0xfd, 0x08,
-	0x1e, 0xfc, 0x10, 0x8b, 0xa7, 0x3d, 0x7a, 0x10, 0x91, 0xf6, 0xb0, 0xde, 0xfc, 0x0a, 0xd2, 0xc9,
-	0x74, 0x5b, 0xa5, 0x08, 0xea, 0x5e, 0xc2, 0xbc, 0xf7, 0xfe, 0xf3, 0xff, 0xe7, 0xf7, 0x60, 0xf8,
-	0x1d, 0x54, 0x29, 0x2a, 0xa1, 0x02, 0x55, 0x48, 0xc8, 0x5f, 0x26, 0x85, 0x88, 0x83, 0xb2, 0x3b,
-	0x00, 0x8a, 0xba, 0xc1, 0x08, 0x4b, 0x5f, 0xe6, 0x48, 0x68, 0xb7, 0x8c, 0xca, 0x5f, 0xa8, 0x7c,
-	0xa3, 0x6a, 0x6d, 0x8c, 0x70, 0x84, 0x5a, 0x16, 0xcc, 0x4e, 0xd5, 0x8d, 0xd6, 0xd5, 0x28, 0x15,
-	0x19, 0x06, 0xfa, 0x6b, 0x5a, 0x37, 0x86, 0xda, 0xa5, 0x5f, 0x69, 0xab, 0xc2, 0x8c, 0xb6, 0x56,
-	0xfc, 0xc5, 0x52, 0x94, 0x16, 0x6d, 0xfe, 0x60, 0xfc, 0xe6, 0x01, 0xd0, 0xc1, 0x59, 0x7f, 0x57,
-	0x29, 0x20, 0xb5, 0x9f, 0xa3, 0x44, 0x15, 0x25, 0xf6, 0x06, 0xbf, 0x48, 0x82, 0x12, 0x68, 0xb2,
-	0x36, 0xeb, 0xac, 0x87, 0x55, 0x61, 0xb7, 0x79, 0x23, 0x06, 0x35, 0xcc, 0x85, 0x24, 0x81, 0x59,
-	0xf3, 0x82, 0x9e, 0x2d, 0xb7, 0xec, 0x5d, 0xbe, 0x16, 0x69, 0xa7, 0x66, 0xad, 0x5d, 0xeb, 0x34,
-	0xee, 0x6f, 0xf9, 0x2b, 0x68, 0x7f, 0x4b, 0xdd, 0xab, 0x1f, 0x7f, 0x75, 0xad, 0xd0, 0x5c, 0xdc,
-	0xe9, 0xbd, 0x19, 0xbb, 0xd6, 0xfb, 0xb1, 0x6b, 0x7d, 0x1f, 0xbb, 0xec, 0xd3, 0x47, 0xaf, 0x65,
-	0xe8, 0x66, 0x1b, 0x34, 0x7b, 0xf2, 0x1f, 0x61, 0x46, 0x90, 0xd1, 0xdb, 0xd3, 0x0f, 0xf7, 0xee,
-	0x9e, 0xe1, 0x02, 0x79, 0x8b, 0x10, 0xaf, 0x72, 0xf3, 0xa4, 0x21, 0xda, 0x3c, 0x65, 0xdc, 0x09,
-	0x21, 0xc5, 0x12, 0xce, 0x1d, 0x7a, 0x9b, 0x5f, 0x5f, 0x04, 0xf7, 0x75, 0x70, 0x3f, 0x86, 0x0c,
-	0xd3, 0x6a, 0x0b, 0xeb, 0xe1, 0x35, 0xf5, 0x6b, 0xe4, 0x63, 0x3d, 0xfc, 0x67, 0xd2, 0x18, 0x92,
-	0x3f, 0x91, 0x7e, 0x61, 0xfc, 0x56, 0x4f, 0xc6, 0x11, 0x41, 0x2f, 0x93, 0x88, 0xc9, 0xf3, 0x43,
-	0x41, 0xf0, 0x44, 0x28, 0xfa, 0x6f, 0xd0, 0x2b, 0xbc, 0x26, 0xe2, 0x0a, 0xaa, 0x1e, 0xce, 0x8e,
-	0xf6, 0x6d, 0x7e, 0x59, 0xa8, 0x3e, 0x96, 0x90, 0x1f, 0xe5, 0x82, 0xa0, 0x59, 0x6f, 0xb3, 0xce,
-	0xa5, 0xb0, 0x21, 0xd4, 0xb3, 0x79, 0x6b, 0xe7, 0xe9, 0xdf, 0x51, 0xba, 0x73, 0xca, 0x42, 0x23,
-	0x78, 0x85, 0x66, 0xf0, 0x8e, 0x66, 0x10, 0x89, 0x50, 0xb4, 0xb7, 0x7f, 0x3c, 0x71, 0xd8, 0xc9,
-	0xc4, 0x61, 0xdf, 0x26, 0x0e, 0x7b, 0x37, 0x75, 0xac, 0x93, 0xa9, 0x63, 0x7d, 0x9e, 0x3a, 0xd6,
-	0x8b, 0xed, 0x91, 0xa0, 0xc3, 0x62, 0xe0, 0x0f, 0x31, 0x0d, 0x8c, 0x8b, 0x97, 0x44, 0x03, 0x35,
-	0x2f, 0x82, 0xb2, 0xfb, 0x30, 0x78, 0xb5, 0xfc, 0x2e, 0xe8, 0xb5, 0x04, 0x35, 0x58, 0xd3, 0x6f,
-	0xe2, 0xc1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0x0d, 0xcd, 0xe6, 0xc0, 0x03, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x8a, 0xd3, 0x50,
+	0x14, 0xc6, 0x73, 0x6d, 0x1d, 0x9c, 0x5b, 0x17, 0x1a, 0x46, 0xac, 0x15, 0x93, 0x3a, 0x23, 0x52,
+	0x84, 0x24, 0x54, 0xa1, 0x8b, 0xd9, 0xcd, 0xe8, 0x52, 0x74, 0xc8, 0x50, 0x04, 0x37, 0x25, 0x6d,
+	0x8e, 0x9d, 0x0b, 0x49, 0xce, 0x25, 0xf7, 0x24, 0xa3, 0x6f, 0x20, 0xae, 0x5c, 0xba, 0xec, 0x23,
+	0xb8, 0xf0, 0x21, 0x06, 0x57, 0xb3, 0x74, 0x21, 0x22, 0xed, 0x62, 0xdc, 0xf9, 0x0a, 0xd2, 0x9b,
+	0xdb, 0x69, 0x95, 0x22, 0xf8, 0x67, 0x13, 0xee, 0x39, 0xe7, 0xbb, 0xdf, 0x97, 0xdf, 0x81, 0xcb,
+	0xef, 0xa0, 0x4a, 0x51, 0x09, 0x15, 0xa8, 0x42, 0x42, 0xfe, 0x22, 0x29, 0x44, 0x1c, 0x94, 0xdd,
+	0x21, 0x50, 0xd4, 0x0d, 0xc6, 0x58, 0xfa, 0x32, 0x47, 0x42, 0xbb, 0x65, 0x54, 0xfe, 0x52, 0xe5,
+	0x1b, 0x55, 0x6b, 0x6b, 0x8c, 0x63, 0xd4, 0xb2, 0x60, 0x7e, 0xaa, 0x6e, 0xb4, 0xae, 0x46, 0xa9,
+	0xc8, 0x30, 0xd0, 0x5f, 0xd3, 0xba, 0x31, 0xd2, 0x2e, 0x83, 0x4a, 0x5b, 0x15, 0x66, 0xb4, 0xb3,
+	0xe6, 0x2f, 0x56, 0xa2, 0xb4, 0x68, 0xfb, 0x3b, 0xe3, 0x37, 0x0f, 0x81, 0x0e, 0xcf, 0xfb, 0x7b,
+	0x4a, 0x01, 0xa9, 0x83, 0x1c, 0x25, 0xaa, 0x28, 0xb1, 0xb7, 0xf8, 0x45, 0x12, 0x94, 0x40, 0x93,
+	0xb5, 0x59, 0x67, 0x33, 0xac, 0x0a, 0xbb, 0xcd, 0x1b, 0x31, 0xa8, 0x51, 0x2e, 0x24, 0x09, 0xcc,
+	0x9a, 0x17, 0xf4, 0x6c, 0xb5, 0x65, 0xef, 0xf1, 0x8d, 0x48, 0x3b, 0x35, 0x6b, 0xed, 0x5a, 0xa7,
+	0x71, 0x7f, 0xc7, 0x5f, 0x43, 0xfb, 0x4b, 0xea, 0x7e, 0xfd, 0xe4, 0x8b, 0x6b, 0x85, 0xe6, 0xe2,
+	0x6e, 0xff, 0xf5, 0xc4, 0xb5, 0xde, 0x4d, 0x5c, 0xeb, 0xdb, 0xc4, 0x65, 0x1f, 0x3f, 0x78, 0x2d,
+	0x43, 0x37, 0xdf, 0xa0, 0xd9, 0x93, 0xff, 0x10, 0x33, 0x82, 0x8c, 0xde, 0x9c, 0xbd, 0xbf, 0x77,
+	0xf7, 0x1c, 0x17, 0xc8, 0x5b, 0x86, 0x78, 0x95, 0x9b, 0x27, 0x0d, 0xd1, 0xf6, 0x19, 0xe3, 0x4e,
+	0x08, 0x29, 0x96, 0xf0, 0xdf, 0xa1, 0x7b, 0xfc, 0xfa, 0x32, 0x78, 0xa0, 0x83, 0x07, 0x31, 0x64,
+	0x98, 0x56, 0x5b, 0xd8, 0x0c, 0xaf, 0xa9, 0x9f, 0x23, 0x1f, 0xe9, 0xe1, 0x5f, 0x93, 0xc6, 0x90,
+	0xfc, 0x8e, 0xf4, 0x33, 0xe3, 0xb7, 0xfa, 0x32, 0x8e, 0x08, 0xfa, 0x99, 0x44, 0x4c, 0x9e, 0x1d,
+	0x09, 0x82, 0xc7, 0x42, 0xd1, 0x3f, 0x83, 0x5e, 0xe1, 0x35, 0x11, 0x57, 0x50, 0xf5, 0x70, 0x7e,
+	0xb4, 0x6f, 0xf3, 0xcb, 0x42, 0x0d, 0xb0, 0x84, 0xfc, 0x38, 0x17, 0x04, 0xcd, 0x7a, 0x9b, 0x75,
+	0x2e, 0x85, 0x0d, 0xa1, 0x9e, 0x2e, 0x5a, 0xbb, 0x4f, 0xfe, 0x8c, 0xd2, 0x5d, 0x50, 0x16, 0x1a,
+	0xc1, 0x2b, 0x34, 0x83, 0x77, 0x3c, 0x87, 0x48, 0x84, 0xa2, 0xfd, 0x83, 0x93, 0xa9, 0xc3, 0x4e,
+	0xa7, 0x0e, 0xfb, 0x3a, 0x75, 0xd8, 0xdb, 0x99, 0x63, 0x9d, 0xce, 0x1c, 0xeb, 0xd3, 0xcc, 0xb1,
+	0x9e, 0xf7, 0xc6, 0x82, 0x8e, 0x8a, 0xa1, 0x3f, 0xc2, 0x34, 0x30, 0x2e, 0x5e, 0x12, 0x0d, 0xd5,
+	0xa2, 0x08, 0xca, 0x6e, 0x2f, 0x78, 0xb9, 0xfa, 0x2e, 0xe8, 0x95, 0x04, 0x35, 0xdc, 0xd0, 0x6f,
+	0xe2, 0xc1, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x0a, 0x13, 0xe4, 0xc0, 0x03, 0x00, 0x00,
 }
 
 func (this *SetSuperfluidAssetsProposal) Equal(that interface{}) bool {
diff --git a/x/superfluid/types/msg_test.go b/x/superfluid/types/msg_test.go
index 5c87f35f829..3cfafd35c26 100644
--- a/x/superfluid/types/msg_test.go
+++ b/x/superfluid/types/msg_test.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/superfluid/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/superfluid/types"
 
 	"github.com/tendermint/tendermint/crypto/ed25519"
 )
diff --git a/x/superfluid/types/params.pb.go b/x/superfluid/types/params.pb.go
index 30713b065e0..fd84298b725 100644
--- a/x/superfluid/types/params.pb.go
+++ b/x/superfluid/types/params.pb.go
@@ -89,8 +89,8 @@ var fileDescriptor_0985261dfaf2a82e = []byte{
 	0x62, 0xa4, 0x52, 0x90, 0x20, 0x54, 0x34, 0x28, 0xb3, 0x38, 0xdb, 0x0d, 0x2c, 0xe6, 0x14, 0x70,
 	0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7,
 	0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0x48, 0x56, 0x42, 0xfd, 0xad,
-	0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xea, 0x57, 0x20, 0x87, 0x15, 0xd8,
-	0x19, 0x49, 0x6c, 0x60, 0x1f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x29, 0x54, 0xb7,
+	0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xe9, 0x57, 0x20, 0x87, 0x15, 0xd8,
+	0x19, 0x49, 0x6c, 0x60, 0x1f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xab, 0x2e, 0x8a, 0xb5,
 	0x4e, 0x01, 0x00, 0x00,
 }
 
diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go
index d15b7818d70..c0c99d64f65 100644
--- a/x/superfluid/types/query.pb.go
+++ b/x/superfluid/types/query.pb.go
@@ -14,7 +14,7 @@ import (
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -1616,7 +1616,7 @@ var fileDescriptor_e3d9448e4ed3943f = []byte{
 	// 1859 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x4d, 0x6c, 0xd4, 0xda,
 	0x15, 0x8e, 0x27, 0x79, 0x09, 0x39, 0x91, 0x48, 0x72, 0xa1, 0x2f, 0x89, 0x81, 0x09, 0xcf, 0xc9,
-	0x4b, 0xd2, 0x3c, 0xb0, 0x49, 0x68, 0x20, 0x40, 0x41, 0xcc, 0x10, 0x02, 0x91, 0x92, 0x86, 0x4e,
+	0x4b, 0xd2, 0x3c, 0xb0, 0x49, 0x28, 0x21, 0x40, 0x41, 0xcc, 0x10, 0x02, 0x91, 0x92, 0x86, 0x4e,
 	0x48, 0x90, 0xfa, 0x23, 0xcb, 0x19, 0xdf, 0x4c, 0xac, 0x78, 0xec, 0xc9, 0x5c, 0x4f, 0x60, 0x84,
 	0x50, 0xa5, 0x54, 0x95, 0x8a, 0xba, 0x68, 0x25, 0x56, 0xdd, 0x75, 0x0b, 0x8b, 0x76, 0xd9, 0x4d,
 	0x37, 0x55, 0x37, 0x48, 0x55, 0x25, 0xa4, 0x6e, 0xaa, 0x2e, 0xa0, 0x82, 0x2e, 0xdb, 0x4d, 0x97,
@@ -1651,85 +1651,85 @@ var fileDescriptor_e3d9448e4ed3943f = []byte{
 	0xe5, 0xc0, 0x84, 0x8c, 0xf6, 0x30, 0x26, 0xfe, 0x28, 0xed, 0x42, 0x36, 0x67, 0x9a, 0x11, 0x36,
 	0x78, 0x31, 0x74, 0xf3, 0x23, 0xc8, 0x7f, 0xee, 0x8f, 0x29, 0x99, 0x15, 0x80, 0xec, 0x16, 0x8b,
 	0xcc, 0xfa, 0x09, 0xaf, 0x01, 0xf9, 0x9e, 0x56, 0xf2, 0xd2, 0xb0, 0x10, 0xe2, 0x94, 0xfe, 0x20,
-	0xc0, 0x78, 0xac, 0x2a, 0x1e, 0x8b, 0x07, 0x70, 0x4c, 0xe3, 0xef, 0x78, 0x72, 0x2c, 0x24, 0x27,
-	0x47, 0x8c, 0xf3, 0x78, 0xba, 0xf8, 0xc2, 0xd0, 0x9d, 0x06, 0x10, 0x19, 0x0a, 0x62, 0xba, 0x2d,
-	0x08, 0x66, 0x55, 0x03, 0x8a, 0x1b, 0x30, 0x71, 0xcb, 0xb6, 0x2c, 0x5c, 0x74, 0x70, 0x94, 0x72,
-	0xcf, 0x69, 0x23, 0xd0, 0xe7, 0xb6, 0x16, 0x37, 0x14, 0x02, 0x0d, 0x45, 0xaf, 0xfb, 0xb8, 0xa2,
-	0x4b, 0x0f, 0x61, 0x32, 0x99, 0x9f, 0x7b, 0x62, 0x1d, 0xfa, 0xb8, 0xf1, 0xdc, 0xe5, 0x47, 0x73,
-	0x44, 0xc1, 0x93, 0x22, 0x2d, 0x83, 0x4c, 0xdb, 0xce, 0x7d, 0xdb, 0xd1, 0xcc, 0x25, 0x6c, 0xe2,
-	0x12, 0x05, 0x94, 0xaf, 0x6f, 0x69, 0xa6, 0xa1, 0x6b, 0x8e, 0x5d, 0x5d, 0xb6, 0xab, 0x4b, 0x6e,
-	0x8e, 0x25, 0x97, 0x52, 0x05, 0x94, 0xd4, 0x72, 0x38, 0x96, 0xeb, 0x4d, 0x05, 0x3f, 0x1e, 0x05,
-	0x25, 0x10, 0x45, 0x9a, 0x8a, 0xfd, 0x30, 0x03, 0x03, 0xa1, 0xd3, 0x86, 0x12, 0x10, 0x1a, 0x4b,
-	0x00, 0xc3, 0x80, 0x56, 0x76, 0xe1, 0xaa, 0x64, 0x87, 0xe8, 0xac, 0x40, 0xf2, 0x4b, 0xae, 0xb4,
-	0xbf, 0xbe, 0x1e, 0x9f, 0x2a, 0x19, 0xce, 0x6e, 0x6d, 0x5b, 0x2e, 0xda, 0x65, 0x85, 0xf7, 0x6f,
-	0xf6, 0xe7, 0x3c, 0xd1, 0xf7, 0x14, 0xb7, 0xfb, 0x11, 0x79, 0xc5, 0x72, 0xfe, 0xf5, 0x7a, 0x1c,
-	0xd5, 0xb5, 0xb2, 0x79, 0x55, 0x0a, 0x89, 0x92, 0x0a, 0xc0, 0x9e, 0x36, 0x76, 0x88, 0x8e, 0xf6,
-	0x61, 0xb0, 0xa9, 0x65, 0xd0, 0x82, 0xeb, 0xcf, 0xdf, 0xed, 0x58, 0xd5, 0xe7, 0x4c, 0x55, 0x93,
-	0x38, 0xa9, 0x70, 0xbc, 0xb1, 0x7b, 0x48, 0x13, 0xf0, 0x05, 0xf5, 0x78, 0x10, 0xf1, 0x90, 0x4b,
-	0xbc, 0x76, 0xfb, 0x5c, 0x00, 0x29, 0x89, 0x8a, 0xc7, 0xe3, 0x50, 0x80, 0x61, 0xc7, 0x25, 0x53,
-	0xf5, 0xe0, 0x94, 0xb9, 0x32, 0xbf, 0xd9, 0x31, 0x82, 0x09, 0x86, 0x80, 0x09, 0x0c, 0x02, 0x1a,
-	0x96, 0x2d, 0x15, 0x86, 0x9c, 0xc6, 0x74, 0x21, 0xd2, 0xb3, 0x86, 0x26, 0x18, 0x9c, 0xe4, 0xca,
-	0xe1, 0x3a, 0xfa, 0x0a, 0x86, 0xb9, 0x1c, 0xbb, 0xaa, 0x7a, 0x2d, 0x8c, 0x05, 0x7d, 0xc8, 0x3f,
-	0xc8, 0xb1, 0xf7, 0x2e, 0xf1, 0x81, 0x97, 0x84, 0x3e, 0x31, 0x6b, 0x92, 0x43, 0xfe, 0x81, 0x47,
-	0xec, 0x67, 0x77, 0x77, 0x38, 0xbb, 0x9f, 0x0a, 0x20, 0x25, 0x59, 0xc5, 0x3d, 0x58, 0x84, 0x5e,
-	0x96, 0x0e, 0x3c, 0xa3, 0xc7, 0x1a, 0x5a, 0x89, 0xd7, 0x44, 0x6e, 0xd9, 0x86, 0x95, 0xbf, 0xe0,
-	0x3a, 0xf4, 0xc5, 0x9b, 0xf1, 0x99, 0x14, 0x0e, 0x75, 0x19, 0x48, 0x81, 0x8b, 0x96, 0xb6, 0x60,
-	0x3a, 0x32, 0x8e, 0xf9, 0xfa, 0x92, 0x87, 0xfc, 0x28, 0x6e, 0x92, 0x7e, 0xdb, 0x0d, 0x33, 0xed,
-	0x05, 0x73, 0xa4, 0x8f, 0xe0, 0x4c, 0x64, 0x4c, 0xd5, 0x2a, 0xbd, 0xe5, 0xbc, 0x92, 0x96, 0x93,
-	0xbb, 0x53, 0xa0, 0x84, 0x5d, 0x8e, 0xbc, 0xc2, 0x4f, 0x91, 0x58, 0x0a, 0x82, 0x7e, 0x04, 0xdf,
-	0x68, 0x48, 0x52, 0xac, 0xab, 0xee, 0xd7, 0xa6, 0x1b, 0xd1, 0x0f, 0xee, 0xf2, 0x13, 0xe1, 0xf4,
-	0xc4, 0x3a, 0x7d, 0x89, 0x7e, 0x2e, 0x40, 0x96, 0x59, 0x10, 0xfa, 0x34, 0x70, 0xbf, 0xf0, 0xb0,
-	0xae, 0xf2, 0xe8, 0x77, 0xd3, 0xd6, 0x9c, 0x60, 0x8a, 0xc2, 0x4d, 0x99, 0x4e, 0x69, 0x4a, 0xe1,
-	0x14, 0xd5, 0x18, 0x14, 0xfe, 0x06, 0xd5, 0xc7, 0xd2, 0x4f, 0xb2, 0xe0, 0x9b, 0x81, 0x4f, 0x37,
-	0x2d, 0xfd, 0x83, 0xe5, 0x44, 0x50, 0x0d, 0x99, 0x70, 0x35, 0xfc, 0x3b, 0x03, 0xb3, 0x69, 0x14,
-	0x7e, 0xf2, 0x5c, 0xf9, 0xb1, 0x00, 0x23, 0x2c, 0x54, 0x35, 0xeb, 0x23, 0xa4, 0x0b, 0x4b, 0xcc,
-	0xcd, 0x40, 0x15, 0x4b, 0x98, 0x55, 0x18, 0x24, 0x75, 0xcb, 0xd9, 0xc5, 0x8e, 0x51, 0x54, 0xdd,
-	0xfb, 0x9e, 0x8c, 0x76, 0x53, 0xe5, 0x67, 0x7c, 0xc4, 0x6c, 0xec, 0x90, 0x37, 0x3c, 0xb2, 0x55,
-	0xbb, 0xb8, 0xc7, 0x01, 0x1e, 0x27, 0xe1, 0x97, 0x44, 0xda, 0x87, 0x73, 0x31, 0x55, 0xea, 0xdf,
-	0xb4, 0x0d, 0xd7, 0x75, 0x64, 0xf7, 0x13, 0xda, 0x75, 0xbf, 0x86, 0x78, 0x3f, 0x17, 0xe0, 0x7c,
-	0x4a, 0x9d, 0x9f, 0x3a, 0xe4, 0xd2, 0x13, 0x58, 0xbc, 0x4d, 0x1c, 0xa3, 0xac, 0x39, 0xb8, 0x45,
-	0x90, 0x57, 0x30, 0xff, 0x47, 0x57, 0xfd, 0x4e, 0x80, 0x2b, 0x47, 0xd0, 0xcf, 0xdd, 0x16, 0xdb,
-	0xdb, 0x84, 0x8f, 0xd3, 0xdb, 0xa4, 0x4d, 0x98, 0x8a, 0xfe, 0x8a, 0x7b, 0xbf, 0xab, 0xe5, 0x97,
-	0x3d, 0x30, 0xdd, 0x56, 0xee, 0x27, 0xef, 0x16, 0x1a, 0x9c, 0x68, 0x50, 0xc7, 0x0c, 0xe2, 0x8d,
-	0x62, 0xd6, 0xf3, 0xbd, 0x37, 0xcb, 0x7b, 0xee, 0x0f, 0xcb, 0x61, 0x1c, 0x5c, 0x17, 0xd2, 0x5b,
-	0x4e, 0xe2, 0x03, 0xdc, 0xfd, 0xf5, 0xb9, 0xbc, 0x7a, 0x3e, 0xee, 0xe5, 0x75, 0x06, 0x4e, 0xd1,
-	0xd4, 0xd8, 0xb4, 0x2a, 0xb6, 0x6d, 0x3e, 0xd8, 0x35, 0x1c, 0x6c, 0x1a, 0xc4, 0xfb, 0xd2, 0x93,
-	0xae, 0xc0, 0xe9, 0xe8, 0x63, 0xee, 0xd1, 0x31, 0x38, 0xe6, 0x1e, 0xa8, 0x06, 0xcf, 0x8c, 0x9e,
-	0x42, 0x9f, 0xfb, 0xbc, 0xa2, 0x93, 0xf9, 0xff, 0x8e, 0xc0, 0x67, 0x94, 0x17, 0xfd, 0x44, 0x80,
-	0x5e, 0xb6, 0x23, 0x41, 0x53, 0x51, 0x79, 0xd3, 0xba, 0x8e, 0x11, 0xa7, 0xdb, 0xd2, 0x31, 0x03,
-	0xa4, 0xd9, 0xc3, 0x3f, 0xff, 0xfd, 0x59, 0x66, 0x12, 0x49, 0x4a, 0xc4, 0x92, 0x29, 0xd8, 0x14,
-	0x51, 0xe5, 0x3f, 0x15, 0xa0, 0xdf, 0x5f, 0x92, 0xa0, 0xc9, 0x28, 0x15, 0xcd, 0x2b, 0x1b, 0xf1,
-	0xcb, 0x36, 0x54, 0xdc, 0x0c, 0x99, 0x9a, 0x31, 0x83, 0xa6, 0x92, 0xcc, 0x08, 0x16, 0x3a, 0xcc,
-	0x14, 0x6f, 0x07, 0x13, 0x63, 0x4a, 0xd3, 0xda, 0x26, 0xc6, 0x94, 0xe6, 0x45, 0x4e, 0x4a, 0x53,
-	0x4c, 0x53, 0x65, 0x83, 0x1c, 0xfa, 0x95, 0x00, 0x83, 0x4d, 0x5b, 0x18, 0x34, 0x1b, 0x8b, 0xba,
-	0x65, 0xb7, 0x23, 0x7e, 0x95, 0x8a, 0x96, 0x1b, 0xf7, 0x2d, 0x6a, 0x9c, 0x8c, 0xce, 0xb5, 0xf7,
-	0x53, 0xb0, 0xee, 0x41, 0xbf, 0x17, 0x60, 0x24, 0x66, 0x49, 0x81, 0xe6, 0x63, 0xbc, 0x92, 0xb0,
-	0x3c, 0x11, 0x2f, 0x76, 0xc4, 0xc3, 0x4d, 0xbf, 0x4e, 0x4d, 0xbf, 0x8c, 0x16, 0xda, 0xf9, 0xd5,
-	0x08, 0x49, 0x51, 0xfd, 0x5d, 0xc7, 0x1b, 0x01, 0x4e, 0x27, 0xed, 0x18, 0xd0, 0xe5, 0x28, 0xa3,
-	0x52, 0x6c, 0x35, 0xc4, 0xc5, 0xce, 0x19, 0x39, 0xa4, 0x55, 0x0a, 0x69, 0x19, 0x2d, 0x25, 0x41,
-	0x2a, 0x7a, 0x92, 0x22, 0x81, 0x29, 0x8f, 0xf9, 0x46, 0xe5, 0x09, 0xfa, 0x8d, 0x37, 0xe7, 0x26,
-	0xee, 0x1f, 0x50, 0x3e, 0xb6, 0xb4, 0x53, 0x2f, 0x41, 0xc4, 0x5b, 0xef, 0x25, 0x83, 0xa3, 0xef,
-	0x42, 0x7f, 0x14, 0x40, 0x8c, 0x9f, 0xcc, 0x51, 0xe4, 0x72, 0xa7, 0xed, 0xbc, 0x2f, 0x5e, 0xea,
-	0x94, 0x8d, 0xdb, 0x73, 0x83, 0x46, 0x63, 0x11, 0x5d, 0x6a, 0x97, 0x60, 0xd1, 0xe3, 0x3c, 0xfa,
-	0x93, 0x00, 0x62, 0xfc, 0x94, 0x8c, 0x16, 0xd2, 0x5e, 0xd9, 0x0d, 0xb3, 0x7e, 0x34, 0x9a, 0xf6,
-	0xc3, 0xb8, 0x74, 0x93, 0xa2, 0xb9, 0x8a, 0x16, 0x93, 0xd0, 0x44, 0x7f, 0x6a, 0xb0, 0x9b, 0x10,
-	0xfd, 0x53, 0x80, 0xb3, 0xed, 0x26, 0x62, 0x74, 0x2d, 0xad, 0x79, 0x11, 0xc3, 0x98, 0xf8, 0xed,
-	0xa3, 0x31, 0x73, 0x84, 0xdf, 0xa1, 0x08, 0xef, 0xa2, 0xe5, 0x8e, 0x11, 0x12, 0xe5, 0x71, 0xcb,
-	0xd7, 0xdb, 0x13, 0x74, 0x98, 0x09, 0x6f, 0x39, 0xe2, 0xe6, 0x3a, 0x74, 0x3d, 0xd9, 0xe8, 0x36,
-	0x03, 0xa8, 0x78, 0xe3, 0xa8, 0xec, 0x1c, 0xf5, 0x0f, 0x29, 0xea, 0x07, 0x68, 0x33, 0x25, 0xea,
-	0x5a, 0x58, 0xa0, 0xba, 0x5d, 0x57, 0x7d, 0xe4, 0x91, 0x4e, 0xf8, 0x8f, 0x00, 0x5f, 0xa6, 0x1a,
-	0x76, 0xd0, 0xcd, 0x0e, 0x82, 0x17, 0x39, 0x70, 0x88, 0xb9, 0xf7, 0x90, 0xc0, 0xbd, 0xb1, 0x46,
-	0xbd, 0x71, 0x07, 0xdd, 0xee, 0x3c, 0x07, 0x5c, 0x5f, 0x04, 0xf3, 0x0e, 0xfb, 0x3f, 0xc2, 0xaf,
-	0x33, 0x30, 0xd7, 0xf1, 0xfc, 0x82, 0x56, 0xa3, 0x70, 0x1c, 0x75, 0x0c, 0x13, 0xd7, 0x3e, 0x90,
-	0x34, 0xee, 0xa1, 0x1f, 0x50, 0x0f, 0x6d, 0xa1, 0xfb, 0x49, 0x1e, 0xc2, 0x5c, 0xbc, 0x9a, 0xd4,
-	0x10, 0xa2, 0x1c, 0xf6, 0x0f, 0xaf, 0x83, 0x47, 0x4e, 0x35, 0xe8, 0x6a, 0xfa, 0x7b, 0xa2, 0xa5,
-	0x50, 0xae, 0x1d, 0x89, 0x97, 0xa3, 0xde, 0xa4, 0xa8, 0xd7, 0xd1, 0x5a, 0x12, 0xea, 0xe6, 0x6d,
-	0x6f, 0xfb, 0xea, 0x78, 0x21, 0xc0, 0x60, 0xd3, 0xa7, 0x38, 0x52, 0x62, 0xed, 0x8c, 0xfe, 0xa6,
-	0x17, 0x2f, 0xa4, 0x67, 0xe8, 0xe4, 0xab, 0xad, 0x46, 0x99, 0xd5, 0x87, 0x1e, 0x77, 0xfe, 0xde,
-	0xcb, 0xb7, 0x59, 0xe1, 0xd5, 0xdb, 0xac, 0xf0, 0xb7, 0xb7, 0x59, 0xe1, 0x17, 0xef, 0xb2, 0x5d,
-	0xaf, 0xde, 0x65, 0xbb, 0xfe, 0xf2, 0x2e, 0xdb, 0xf5, 0xbd, 0x4b, 0xa1, 0xd1, 0x85, 0x4b, 0x3c,
+	0xc0, 0x78, 0xac, 0x2a, 0x1e, 0x8b, 0x07, 0x70, 0x4c, 0xe3, 0xef, 0x78, 0x72, 0x5c, 0x4a, 0x4e,
+	0x8e, 0x18, 0xe7, 0xf1, 0x74, 0xf1, 0x85, 0xa1, 0x3b, 0x0d, 0x20, 0x32, 0x14, 0xc4, 0x74, 0x5b,
+	0x10, 0xcc, 0xaa, 0x06, 0x14, 0x37, 0x60, 0xe2, 0x96, 0x6d, 0x59, 0xb8, 0xe8, 0xe0, 0x28, 0xe5,
+	0x9e, 0xd3, 0x46, 0xa0, 0xcf, 0x6d, 0x2d, 0x6e, 0x28, 0x04, 0x1a, 0x8a, 0x5e, 0xf7, 0x71, 0x45,
+	0x97, 0x1e, 0xc2, 0x64, 0x32, 0x3f, 0xf7, 0xc4, 0x3a, 0xf4, 0x71, 0xe3, 0xb9, 0xcb, 0x8f, 0xe6,
+	0x88, 0x82, 0x27, 0x45, 0x5a, 0x06, 0x99, 0xb6, 0x9d, 0xfb, 0xb6, 0xa3, 0x99, 0x4b, 0xd8, 0xc4,
+	0x25, 0x0a, 0x28, 0x5f, 0xdf, 0xd2, 0x4c, 0x43, 0xd7, 0x1c, 0xbb, 0xba, 0x6c, 0x57, 0x97, 0xdc,
+	0x1c, 0x4b, 0x2e, 0xa5, 0x0a, 0x28, 0xa9, 0xe5, 0x70, 0x2c, 0xd7, 0x9b, 0x0a, 0x7e, 0x3c, 0x0a,
+	0x4a, 0x20, 0x8a, 0x34, 0x15, 0xfb, 0x61, 0x06, 0x06, 0x42, 0xa7, 0x0d, 0x25, 0x20, 0x34, 0x96,
+	0x00, 0x86, 0x01, 0xad, 0xec, 0xc2, 0x55, 0xc9, 0x0e, 0xd1, 0x59, 0x81, 0xe4, 0x97, 0x5c, 0x69,
+	0x7f, 0x7d, 0x3d, 0x3e, 0x55, 0x32, 0x9c, 0xdd, 0xda, 0xb6, 0x5c, 0xb4, 0xcb, 0x0a, 0xef, 0xdf,
+	0xec, 0xcf, 0x79, 0xa2, 0xef, 0x29, 0x6e, 0xf7, 0x23, 0xf2, 0x8a, 0xe5, 0xfc, 0xeb, 0xf5, 0x38,
+	0xaa, 0x6b, 0x65, 0xf3, 0xaa, 0x14, 0x12, 0x25, 0x15, 0x80, 0x3d, 0x6d, 0xec, 0x10, 0x1d, 0xed,
+	0xc3, 0x60, 0x53, 0xcb, 0xa0, 0x05, 0xd7, 0x9f, 0xbf, 0xdb, 0xb1, 0xaa, 0xcf, 0x99, 0xaa, 0x26,
+	0x71, 0x52, 0xe1, 0x78, 0x63, 0xf7, 0x90, 0x26, 0xe0, 0x0b, 0xea, 0xf1, 0x20, 0xe2, 0x21, 0x97,
+	0x78, 0xed, 0xf6, 0xb9, 0x00, 0x52, 0x12, 0x15, 0x8f, 0xc7, 0xa1, 0x00, 0xc3, 0x8e, 0x4b, 0xa6,
+	0xea, 0xc1, 0x29, 0x73, 0x65, 0x7e, 0xb3, 0x63, 0x04, 0x13, 0x0c, 0x01, 0x13, 0x18, 0x04, 0x34,
+	0x2c, 0x5b, 0x2a, 0x0c, 0x39, 0x8d, 0xe9, 0x42, 0xa4, 0x67, 0x0d, 0x4d, 0x30, 0x38, 0xc9, 0x95,
+	0xc3, 0x75, 0xf4, 0x15, 0x0c, 0x73, 0x39, 0x76, 0x55, 0xf5, 0x5a, 0x18, 0x0b, 0xfa, 0x90, 0x7f,
+	0x90, 0x63, 0xef, 0x5d, 0xe2, 0x03, 0x2f, 0x09, 0x7d, 0x62, 0xd6, 0x24, 0x87, 0xfc, 0x03, 0x8f,
+	0xd8, 0xcf, 0xee, 0xee, 0x70, 0x76, 0x3f, 0x15, 0x40, 0x4a, 0xb2, 0x8a, 0x7b, 0xb0, 0x08, 0xbd,
+	0x2c, 0x1d, 0x78, 0x46, 0x8f, 0x35, 0xb4, 0x12, 0xaf, 0x89, 0xdc, 0xb2, 0x0d, 0x2b, 0x7f, 0xc1,
+	0x75, 0xe8, 0x8b, 0x37, 0xe3, 0x33, 0x29, 0x1c, 0xea, 0x32, 0x90, 0x02, 0x17, 0x2d, 0x6d, 0xc1,
+	0x74, 0x64, 0x1c, 0xf3, 0xf5, 0x25, 0x0f, 0xf9, 0x51, 0xdc, 0x24, 0xfd, 0xb6, 0x1b, 0x66, 0xda,
+	0x0b, 0xe6, 0x48, 0x1f, 0xc1, 0x99, 0xc8, 0x98, 0xaa, 0x55, 0x7a, 0xcb, 0x79, 0x25, 0x2d, 0x27,
+	0x77, 0xa7, 0x40, 0x09, 0xbb, 0x1c, 0x79, 0x85, 0x9f, 0x22, 0xb1, 0x14, 0x04, 0xfd, 0x08, 0xbe,
+	0xd1, 0x90, 0xa4, 0x58, 0x57, 0xdd, 0xaf, 0x4d, 0x37, 0xa2, 0x1f, 0xdc, 0xe5, 0x27, 0xc2, 0xe9,
+	0x89, 0x75, 0xfa, 0x12, 0xfd, 0x5c, 0x80, 0x2c, 0xb3, 0x20, 0xf4, 0x69, 0xe0, 0x7e, 0xe1, 0x61,
+	0x5d, 0xe5, 0xd1, 0xef, 0xa6, 0xad, 0x39, 0xc1, 0x14, 0x85, 0x9b, 0x32, 0x9d, 0xd2, 0x94, 0xc2,
+	0x29, 0xaa, 0x31, 0x28, 0xfc, 0x0d, 0xaa, 0x8f, 0xa5, 0x9f, 0x64, 0xc1, 0x37, 0x03, 0x9f, 0x6e,
+	0x5a, 0xfa, 0x07, 0xcb, 0x89, 0xa0, 0x1a, 0x32, 0xe1, 0x6a, 0xf8, 0x77, 0x06, 0x66, 0xd3, 0x28,
+	0xfc, 0xe4, 0xb9, 0xf2, 0x63, 0x01, 0x46, 0x58, 0xa8, 0x6a, 0xd6, 0x47, 0x48, 0x17, 0x96, 0x98,
+	0x9b, 0x81, 0x2a, 0x96, 0x30, 0xab, 0x30, 0x48, 0xea, 0x96, 0xb3, 0x8b, 0x1d, 0xa3, 0xa8, 0xba,
+	0xf7, 0x3d, 0x19, 0xed, 0xa6, 0xca, 0xcf, 0xf8, 0x88, 0xd9, 0xd8, 0x21, 0x6f, 0x78, 0x64, 0xab,
+	0x76, 0x71, 0x8f, 0x03, 0x3c, 0x4e, 0xc2, 0x2f, 0x89, 0xb4, 0x0f, 0xe7, 0x62, 0xaa, 0xd4, 0xbf,
+	0x69, 0x1b, 0xae, 0xeb, 0xc8, 0xee, 0x27, 0xb4, 0xeb, 0x7e, 0x0d, 0xf1, 0x7e, 0x2e, 0xc0, 0xf9,
+	0x94, 0x3a, 0x3f, 0x75, 0xc8, 0xa5, 0x27, 0xb0, 0x78, 0x9b, 0x38, 0x46, 0x59, 0x73, 0x70, 0x8b,
+	0x20, 0xaf, 0x60, 0xfe, 0x8f, 0xae, 0xfa, 0x9d, 0x00, 0x57, 0x8e, 0xa0, 0x9f, 0xbb, 0x2d, 0xb6,
+	0xb7, 0x09, 0x1f, 0xa7, 0xb7, 0x49, 0x9b, 0x30, 0x15, 0xfd, 0x15, 0xf7, 0x7e, 0x57, 0xcb, 0x2f,
+	0x7b, 0x60, 0xba, 0xad, 0xdc, 0x4f, 0xde, 0x2d, 0x34, 0x38, 0xd1, 0xa0, 0x8e, 0x19, 0xc4, 0x1b,
+	0xc5, 0xac, 0xe7, 0x7b, 0x6f, 0x96, 0xf7, 0xdc, 0x1f, 0x96, 0xc3, 0x38, 0xb8, 0x2e, 0xa4, 0xb7,
+	0x9c, 0xc4, 0x07, 0xb8, 0xfb, 0xeb, 0x73, 0x79, 0xf5, 0x7c, 0xdc, 0xcb, 0xeb, 0x0c, 0x9c, 0xa2,
+	0xa9, 0xb1, 0x69, 0x55, 0x6c, 0xdb, 0x7c, 0xb0, 0x6b, 0x38, 0xd8, 0x34, 0x88, 0xf7, 0xa5, 0x27,
+	0x5d, 0x81, 0xd3, 0xd1, 0xc7, 0xdc, 0xa3, 0x63, 0x70, 0xcc, 0x3d, 0x50, 0x0d, 0x9e, 0x19, 0x3d,
+	0x85, 0x3e, 0xf7, 0x79, 0x45, 0x27, 0xf3, 0xff, 0x1d, 0x81, 0xcf, 0x28, 0x2f, 0xfa, 0x89, 0x00,
+	0xbd, 0x6c, 0x47, 0x82, 0xa6, 0xa2, 0xf2, 0xa6, 0x75, 0x1d, 0x23, 0x4e, 0xb7, 0xa5, 0x63, 0x06,
+	0x48, 0xb3, 0x87, 0x7f, 0xfe, 0xfb, 0xb3, 0xcc, 0x24, 0x92, 0x94, 0x88, 0x25, 0x53, 0xb0, 0x29,
+	0xa2, 0xca, 0x7f, 0x2a, 0x40, 0xbf, 0xbf, 0x24, 0x41, 0x93, 0x51, 0x2a, 0x9a, 0x57, 0x36, 0xe2,
+	0x97, 0x6d, 0xa8, 0xb8, 0x19, 0x32, 0x35, 0x63, 0x06, 0x4d, 0x25, 0x99, 0x11, 0x2c, 0x74, 0x98,
+	0x29, 0xde, 0x0e, 0x26, 0xc6, 0x94, 0xa6, 0xb5, 0x4d, 0x8c, 0x29, 0xcd, 0x8b, 0x9c, 0x94, 0xa6,
+	0x98, 0xa6, 0xca, 0x06, 0x39, 0xf4, 0x2b, 0x01, 0x06, 0x9b, 0xb6, 0x30, 0x68, 0x36, 0x16, 0x75,
+	0xcb, 0x6e, 0x47, 0xfc, 0x2a, 0x15, 0x2d, 0x37, 0xee, 0x5b, 0xd4, 0x38, 0x19, 0x9d, 0x6b, 0xef,
+	0xa7, 0x60, 0xdd, 0x83, 0x7e, 0x2f, 0xc0, 0x48, 0xcc, 0x92, 0x02, 0xcd, 0xc7, 0x78, 0x25, 0x61,
+	0x79, 0x22, 0x5e, 0xec, 0x88, 0x87, 0x9b, 0x7e, 0x9d, 0x9a, 0x7e, 0x19, 0x5d, 0x6a, 0xe7, 0x57,
+	0x23, 0x24, 0x45, 0xf5, 0x77, 0x1d, 0x6f, 0x04, 0x38, 0x9d, 0xb4, 0x63, 0x40, 0x97, 0xa3, 0x8c,
+	0x4a, 0xb1, 0xd5, 0x10, 0x17, 0x3b, 0x67, 0xe4, 0x90, 0x56, 0x29, 0xa4, 0x65, 0xb4, 0x94, 0x04,
+	0xa9, 0xe8, 0x49, 0x8a, 0x04, 0xa6, 0x3c, 0xe6, 0x1b, 0x95, 0x27, 0xe8, 0x37, 0xde, 0x9c, 0x9b,
+	0xb8, 0x7f, 0x40, 0xf9, 0xd8, 0xd2, 0x4e, 0xbd, 0x04, 0x11, 0x6f, 0xbd, 0x97, 0x0c, 0x8e, 0xbe,
+	0x0b, 0xfd, 0x51, 0x00, 0x31, 0x7e, 0x32, 0x47, 0x91, 0xcb, 0x9d, 0xb6, 0xf3, 0xbe, 0xb8, 0xd0,
+	0x29, 0x1b, 0xb7, 0xe7, 0x06, 0x8d, 0xc6, 0x22, 0x5a, 0x68, 0x97, 0x60, 0xd1, 0xe3, 0x3c, 0xfa,
+	0x93, 0x00, 0x62, 0xfc, 0x94, 0x8c, 0x2e, 0xa5, 0xbd, 0xb2, 0x1b, 0x66, 0xfd, 0x68, 0x34, 0xed,
+	0x87, 0x71, 0xe9, 0x26, 0x45, 0x73, 0x15, 0x2d, 0x26, 0xa1, 0x89, 0xfe, 0xd4, 0x60, 0x37, 0x21,
+	0xfa, 0xa7, 0x00, 0x67, 0xdb, 0x4d, 0xc4, 0xe8, 0x5a, 0x5a, 0xf3, 0x22, 0x86, 0x31, 0xf1, 0xdb,
+	0x47, 0x63, 0xe6, 0x08, 0xbf, 0x43, 0x11, 0xde, 0x45, 0xcb, 0x1d, 0x23, 0x24, 0xca, 0xe3, 0x96,
+	0xaf, 0xb7, 0x27, 0xe8, 0x30, 0x13, 0xde, 0x72, 0xc4, 0xcd, 0x75, 0xe8, 0x7a, 0xb2, 0xd1, 0x6d,
+	0x06, 0x50, 0xf1, 0xc6, 0x51, 0xd9, 0x39, 0xea, 0x1f, 0x52, 0xd4, 0x0f, 0xd0, 0x66, 0x4a, 0xd4,
+	0xb5, 0xb0, 0x40, 0x75, 0xbb, 0xae, 0xfa, 0xc8, 0x23, 0x9d, 0xf0, 0x1f, 0x01, 0xbe, 0x4c, 0x35,
+	0xec, 0xa0, 0x9b, 0x1d, 0x04, 0x2f, 0x72, 0xe0, 0x10, 0x73, 0xef, 0x21, 0x81, 0x7b, 0x63, 0x8d,
+	0x7a, 0xe3, 0x0e, 0xba, 0xdd, 0x79, 0x0e, 0xb8, 0xbe, 0x08, 0xe6, 0x1d, 0xf6, 0x7f, 0x84, 0x5f,
+	0x67, 0x60, 0xae, 0xe3, 0xf9, 0x05, 0xad, 0x46, 0xe1, 0x38, 0xea, 0x18, 0x26, 0xae, 0x7d, 0x20,
+	0x69, 0xdc, 0x43, 0x3f, 0xa0, 0x1e, 0xda, 0x42, 0xf7, 0x93, 0x3c, 0x84, 0xb9, 0x78, 0x35, 0xa9,
+	0x21, 0x44, 0x39, 0xec, 0x1f, 0x5e, 0x07, 0x8f, 0x9c, 0x6a, 0xd0, 0xd5, 0xf4, 0xf7, 0x44, 0x4b,
+	0xa1, 0x5c, 0x3b, 0x12, 0x2f, 0x47, 0xbd, 0x49, 0x51, 0xaf, 0xa3, 0xb5, 0x24, 0xd4, 0xcd, 0xdb,
+	0xde, 0xf6, 0xd5, 0xf1, 0x42, 0x80, 0xc1, 0xa6, 0x4f, 0x71, 0xa4, 0xc4, 0xda, 0x19, 0xfd, 0x4d,
+	0x2f, 0x5e, 0x48, 0xcf, 0xd0, 0xc9, 0x57, 0x5b, 0x8d, 0x32, 0xab, 0x0f, 0x3d, 0xee, 0xfc, 0xbd,
+	0x97, 0x6f, 0xb3, 0xc2, 0xab, 0xb7, 0x59, 0xe1, 0x6f, 0x6f, 0xb3, 0xc2, 0x2f, 0xde, 0x65, 0xbb,
+	0x5e, 0xbd, 0xcb, 0x76, 0xfd, 0xe5, 0x5d, 0xb6, 0xeb, 0x7b, 0x0b, 0xa1, 0xd1, 0x85, 0x4b, 0x3c,
 	0x6f, 0x6a, 0xdb, 0xc4, 0x17, 0x7f, 0x30, 0xb7, 0xa0, 0x3c, 0x0a, 0x2b, 0xa1, 0xe3, 0xcc, 0x76,
-	0x2f, 0xfd, 0x0f, 0xee, 0xc5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xb7, 0xcb, 0x9b, 0x3f,
+	0x2f, 0xfd, 0x0f, 0xee, 0xc5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x92, 0xb0, 0x15, 0x99, 0x3f,
 	0x1f, 0x00, 0x00,
 }
 
diff --git a/x/superfluid/types/superfluid.pb.go b/x/superfluid/types/superfluid.pb.go
index 132d4e9045e..875b81e3bd0 100644
--- a/x/superfluid/types/superfluid.pb.go
+++ b/x/superfluid/types/superfluid.pb.go
@@ -410,49 +410,49 @@ var fileDescriptor_79d3c29d82dbb734 = []byte{
 	// 714 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0x13, 0x41,
 	0x14, 0xef, 0xb6, 0x15, 0xe8, 0x60, 0xb4, 0x2c, 0x04, 0x4b, 0x13, 0xb6, 0xb8, 0x18, 0x69, 0x20,
-	0xec, 0xa6, 0x18, 0x3d, 0x70, 0x2b, 0x45, 0x13, 0x12, 0x44, 0xb2, 0x68, 0x4c, 0xbc, 0x34, 0xd3,
-	0x9d, 0x61, 0x3b, 0xe9, 0xec, 0xce, 0xb2, 0x33, 0x5b, 0xed, 0xcd, 0x83, 0x07, 0x8e, 0x7e, 0x04,
-	0x12, 0x6f, 0x7e, 0x08, 0xcf, 0x1c, 0x39, 0x1a, 0x0f, 0x68, 0xe0, 0xe2, 0x99, 0x4f, 0x60, 0x76,
-	0x76, 0xbb, 0x5d, 0xa1, 0x46, 0x3d, 0xed, 0xcc, 0xfb, 0xbd, 0xf7, 0x7b, 0xbf, 0xf7, 0x67, 0x07,
-	0x2c, 0x33, 0xee, 0x32, 0x4e, 0xb8, 0xc9, 0x43, 0x1f, 0x07, 0x87, 0x34, 0x24, 0x28, 0x73, 0x34,
-	0xfc, 0x80, 0x09, 0xa6, 0xaa, 0x89, 0x93, 0x31, 0x42, 0xaa, 0x73, 0x0e, 0x73, 0x98, 0x84, 0xcd,
-	0xe8, 0x14, 0x7b, 0x56, 0x35, 0x87, 0x31, 0x87, 0x62, 0x53, 0xde, 0x3a, 0xe1, 0xa1, 0x89, 0xc2,
-	0x00, 0x0a, 0xc2, 0xbc, 0x04, 0xaf, 0x5d, 0xc7, 0x05, 0x71, 0x31, 0x17, 0xd0, 0xf5, 0x87, 0x04,
-	0xb6, 0xcc, 0x65, 0x76, 0x20, 0xc7, 0x66, 0xbf, 0xd1, 0xc1, 0x02, 0x36, 0x4c, 0x9b, 0x91, 0x84,
-	0x40, 0x1f, 0x80, 0xbb, 0x07, 0xa9, 0x88, 0x26, 0xe7, 0x58, 0xa8, 0x73, 0xe0, 0x16, 0xc2, 0x1e,
-	0x73, 0x2b, 0xca, 0x92, 0x52, 0x2f, 0x59, 0xf1, 0x45, 0x7d, 0x06, 0x00, 0x8c, 0xe0, 0xb6, 0x18,
-	0xf8, 0xb8, 0x92, 0x5f, 0x52, 0xea, 0x77, 0x36, 0x56, 0x8c, 0x9b, 0x85, 0x18, 0xd7, 0xe8, 0x5e,
-	0x0e, 0x7c, 0x6c, 0x95, 0xe0, 0xf0, 0xb8, 0x39, 0x75, 0x7c, 0x52, 0xcb, 0xfd, 0x3c, 0xa9, 0x29,
-	0x7a, 0x0f, 0x2c, 0x8e, 0x7c, 0x77, 0x3c, 0x81, 0x03, 0x17, 0x23, 0x02, 0x83, 0x41, 0xd3, 0xb6,
-	0x59, 0xe8, 0xfd, 0x49, 0xc8, 0x02, 0x98, 0xea, 0x43, 0xda, 0x86, 0x08, 0x05, 0x52, 0x46, 0xc9,
-	0x9a, 0xec, 0x43, 0xda, 0x44, 0x28, 0x88, 0x20, 0x07, 0x86, 0x0e, 0x6e, 0x13, 0x54, 0x29, 0x2c,
-	0x29, 0xf5, 0xa2, 0x35, 0x29, 0xef, 0x3b, 0x48, 0xff, 0xa2, 0x00, 0xed, 0x05, 0x77, 0xd9, 0xd3,
-	0xa3, 0x90, 0xf4, 0x21, 0xc5, 0x9e, 0x78, 0x1e, 0x52, 0x41, 0x7c, 0x4a, 0x70, 0x60, 0x61, 0x9b,
-	0x05, 0x48, 0xbd, 0x0f, 0x6e, 0x63, 0x9f, 0xd9, 0xdd, 0xb6, 0x17, 0xba, 0x1d, 0x1c, 0xc8, 0xac,
-	0x05, 0x6b, 0x5a, 0xda, 0xf6, 0xa4, 0x69, 0xa4, 0x28, 0x9f, 0x55, 0x64, 0x03, 0xe0, 0xa6, 0x64,
-	0x32, 0x71, 0x69, 0xab, 0x75, 0x7a, 0x5e, 0xcb, 0x7d, 0x3b, 0xaf, 0x3d, 0x74, 0x88, 0xe8, 0x86,
-	0x1d, 0xc3, 0x66, 0xae, 0x99, 0x8c, 0x22, 0xfe, 0xac, 0x73, 0xd4, 0x33, 0xa3, 0x5e, 0x72, 0x63,
-	0x1b, 0xdb, 0x57, 0xe7, 0xb5, 0x99, 0x01, 0x74, 0xe9, 0xa6, 0x3e, 0x62, 0xd2, 0xad, 0x0c, 0xad,
-	0x7e, 0x95, 0x07, 0xd5, 0x51, 0xbb, 0xb6, 0x31, 0xc5, 0x8e, 0x5c, 0x84, 0x44, 0xfc, 0x1a, 0x98,
-	0x41, 0xb1, 0x8d, 0x05, 0xb2, 0x37, 0x98, 0xf3, 0xa4, 0x6f, 0xe5, 0x14, 0x68, 0xc6, 0xf6, 0xc8,
-	0xb9, 0x0f, 0x29, 0x41, 0xbf, 0x39, 0xc7, 0x25, 0x95, 0x53, 0x60, 0xe8, 0xfc, 0x36, 0x65, 0x26,
-	0xcc, 0x6b, 0x43, 0x37, 0x1a, 0x8d, 0x2c, 0x72, 0x7a, 0x63, 0xc1, 0x88, 0x6b, 0x31, 0xa2, 0xed,
-	0x32, 0x92, 0xed, 0x32, 0x5a, 0x8c, 0x78, 0x5b, 0x66, 0x54, 0xff, 0xe7, 0xef, 0xb5, 0x95, 0x7f,
-	0xa8, 0x3f, 0x0a, 0x48, 0x55, 0x12, 0xe6, 0x35, 0x65, 0x0e, 0xf5, 0xbd, 0x02, 0x2a, 0x38, 0x1d,
-	0x57, 0x9b, 0x0b, 0xd8, 0xc3, 0x68, 0x28, 0xa0, 0xf8, 0x37, 0x01, 0x6b, 0xff, 0x93, 0x7c, 0x7e,
-	0x94, 0xe7, 0x40, 0xa6, 0x89, 0x25, 0xe8, 0x47, 0x60, 0x79, 0x97, 0xd9, 0xbd, 0x9d, 0x71, 0xeb,
-	0xd9, 0x62, 0x9e, 0x87, 0xed, 0x48, 0xaf, 0x7a, 0x0f, 0x4c, 0x52, 0x66, 0xf7, 0xa2, 0xb5, 0x53,
-	0xe4, 0xda, 0x4d, 0x50, 0x19, 0xa5, 0x36, 0xc0, 0x1c, 0xc9, 0x44, 0xb6, 0x61, 0x1c, 0x9a, 0xf4,
-	0x7a, 0x96, 0xdc, 0x64, 0xd5, 0x57, 0xc1, 0xfc, 0x2b, 0xcf, 0x67, 0x8c, 0xbe, 0xee, 0x12, 0x81,
-	0x29, 0xe1, 0x02, 0xa3, 0x7d, 0xc6, 0x28, 0x57, 0xcb, 0xa0, 0x40, 0x50, 0x34, 0xd4, 0x42, 0xbd,
-	0x68, 0x45, 0xc7, 0xd5, 0x0f, 0x0a, 0x98, 0x1d, 0xf3, 0xbb, 0xa9, 0x8b, 0x60, 0x61, 0x8c, 0x79,
-	0x0f, 0x0a, 0xd2, 0xc7, 0xe5, 0x9c, 0xaa, 0x65, 0x37, 0x29, 0x85, 0x77, 0xf7, 0x0f, 0xba, 0x30,
-	0xc0, 0x65, 0x45, 0xad, 0x83, 0x07, 0x63, 0xf0, 0x16, 0xf3, 0x6c, 0xec, 0x89, 0x00, 0x0a, 0x8c,
-	0x62, 0xcf, 0x7c, 0xb5, 0x78, 0xfc, 0x49, 0xcb, 0x6d, 0xed, 0x9f, 0x5e, 0x68, 0xca, 0xd9, 0x85,
-	0xa6, 0xfc, 0xb8, 0xd0, 0x94, 0x8f, 0x97, 0x5a, 0xee, 0xec, 0x52, 0xcb, 0x7d, 0xbd, 0xd4, 0x72,
-	0x6f, 0x9e, 0x64, 0x06, 0x90, 0x3c, 0x15, 0xeb, 0x14, 0x76, 0xf8, 0xf0, 0x62, 0xf6, 0x1b, 0x8f,
-	0xcd, 0x77, 0xd9, 0xb7, 0x52, 0x0e, 0xa5, 0x33, 0x21, 0x1f, 0xa7, 0x47, 0xbf, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0xe9, 0x2b, 0xa4, 0x0a, 0x4e, 0x05, 0x00, 0x00,
+	0xec, 0xa6, 0x98, 0x70, 0xe0, 0x56, 0x8a, 0x26, 0x24, 0x88, 0x64, 0xd1, 0x98, 0x78, 0x69, 0xa6,
+	0x3b, 0xc3, 0x76, 0xd2, 0xd9, 0x9d, 0x65, 0x67, 0xb6, 0xda, 0x9b, 0x07, 0x0f, 0x1c, 0xfd, 0x08,
+	0x24, 0xde, 0xfc, 0x10, 0x9e, 0x39, 0x72, 0x34, 0x1e, 0xd0, 0xc0, 0xc5, 0x33, 0x9f, 0xc0, 0xec,
+	0xec, 0x76, 0xbb, 0x42, 0x8d, 0x7a, 0xda, 0x99, 0xf7, 0x7b, 0xef, 0xf7, 0x7e, 0xef, 0xcf, 0x0e,
+	0x58, 0x66, 0xdc, 0x65, 0x9c, 0x70, 0x93, 0x87, 0x3e, 0x0e, 0x8e, 0x68, 0x48, 0x50, 0xe6, 0x68,
+	0xf8, 0x01, 0x13, 0x4c, 0x55, 0x13, 0x27, 0x63, 0x84, 0x54, 0xe7, 0x1c, 0xe6, 0x30, 0x09, 0x9b,
+	0xd1, 0x29, 0xf6, 0xac, 0x6a, 0x0e, 0x63, 0x0e, 0xc5, 0xa6, 0xbc, 0x75, 0xc2, 0x23, 0x13, 0x85,
+	0x01, 0x14, 0x84, 0x79, 0x09, 0x5e, 0xbb, 0x89, 0x0b, 0xe2, 0x62, 0x2e, 0xa0, 0xeb, 0x0f, 0x09,
+	0x6c, 0x99, 0xcb, 0xec, 0x40, 0x8e, 0xcd, 0x7e, 0xa3, 0x83, 0x05, 0x6c, 0x98, 0x36, 0x23, 0x09,
+	0x81, 0x3e, 0x00, 0xf7, 0x0f, 0x53, 0x11, 0x4d, 0xce, 0xb1, 0x50, 0xe7, 0xc0, 0x1d, 0x84, 0x3d,
+	0xe6, 0x56, 0x94, 0x25, 0xa5, 0x5e, 0xb2, 0xe2, 0x8b, 0xfa, 0x0c, 0x00, 0x18, 0xc1, 0x6d, 0x31,
+	0xf0, 0x71, 0x25, 0xbf, 0xa4, 0xd4, 0xef, 0x6d, 0xac, 0x18, 0xb7, 0x0b, 0x31, 0x6e, 0xd0, 0xbd,
+	0x1c, 0xf8, 0xd8, 0x2a, 0xc1, 0xe1, 0x71, 0x6b, 0xea, 0xe4, 0xb4, 0x96, 0xfb, 0x79, 0x5a, 0x53,
+	0xf4, 0x1e, 0x58, 0x1c, 0xf9, 0xee, 0x7a, 0x02, 0x07, 0x2e, 0x46, 0x04, 0x06, 0x83, 0xa6, 0x6d,
+	0xb3, 0xd0, 0xfb, 0x93, 0x90, 0x05, 0x30, 0xd5, 0x87, 0xb4, 0x0d, 0x11, 0x0a, 0xa4, 0x8c, 0x92,
+	0x35, 0xd9, 0x87, 0xb4, 0x89, 0x50, 0x10, 0x41, 0x0e, 0x0c, 0x1d, 0xdc, 0x26, 0xa8, 0x52, 0x58,
+	0x52, 0xea, 0x45, 0x6b, 0x52, 0xde, 0x77, 0x91, 0xfe, 0x45, 0x01, 0xda, 0x0b, 0xee, 0xb2, 0xa7,
+	0xc7, 0x21, 0xe9, 0x43, 0x8a, 0x3d, 0xf1, 0x3c, 0xa4, 0x82, 0xf8, 0x94, 0xe0, 0xc0, 0xc2, 0x36,
+	0x0b, 0x90, 0xfa, 0x10, 0xdc, 0xc5, 0x3e, 0xb3, 0xbb, 0x6d, 0x2f, 0x74, 0x3b, 0x38, 0x90, 0x59,
+	0x0b, 0xd6, 0xb4, 0xb4, 0xed, 0x4b, 0xd3, 0x48, 0x51, 0x3e, 0xab, 0xc8, 0x06, 0xc0, 0x4d, 0xc9,
+	0x64, 0xe2, 0xd2, 0x76, 0xeb, 0xec, 0xa2, 0x96, 0xfb, 0x76, 0x51, 0x7b, 0xec, 0x10, 0xd1, 0x0d,
+	0x3b, 0x86, 0xcd, 0x5c, 0x33, 0x19, 0x45, 0xfc, 0x59, 0xe7, 0xa8, 0x67, 0x46, 0xbd, 0xe4, 0xc6,
+	0x0e, 0xb6, 0xaf, 0x2f, 0x6a, 0x33, 0x03, 0xe8, 0xd2, 0x2d, 0x7d, 0xc4, 0xa4, 0x5b, 0x19, 0x5a,
+	0xfd, 0x3a, 0x0f, 0xaa, 0xa3, 0x76, 0xed, 0x60, 0x8a, 0x1d, 0xb9, 0x08, 0x89, 0xf8, 0x35, 0x30,
+	0x83, 0x62, 0x1b, 0x0b, 0x64, 0x6f, 0x30, 0xe7, 0x49, 0xdf, 0xca, 0x29, 0xd0, 0x8c, 0xed, 0x91,
+	0x73, 0x1f, 0x52, 0x82, 0x7e, 0x73, 0x8e, 0x4b, 0x2a, 0xa7, 0xc0, 0xd0, 0xf9, 0x6d, 0xca, 0x4c,
+	0x98, 0xd7, 0x86, 0x6e, 0x34, 0x1a, 0x59, 0xe4, 0xf4, 0xc6, 0x82, 0x11, 0xd7, 0x62, 0x44, 0xdb,
+	0x65, 0x24, 0xdb, 0x65, 0xb4, 0x18, 0xf1, 0xb6, 0xcd, 0xa8, 0xfe, 0xcf, 0xdf, 0x6b, 0x2b, 0xff,
+	0x50, 0x7f, 0x14, 0x90, 0xaa, 0x24, 0xcc, 0x6b, 0xca, 0x1c, 0xea, 0x7b, 0x05, 0x54, 0x70, 0x3a,
+	0xae, 0x36, 0x17, 0xb0, 0x87, 0xd1, 0x50, 0x40, 0xf1, 0x6f, 0x02, 0xd6, 0xfe, 0x27, 0xf9, 0xfc,
+	0x28, 0xcf, 0xa1, 0x4c, 0x13, 0x4b, 0xd0, 0x8f, 0xc1, 0xf2, 0x1e, 0xb3, 0x7b, 0xbb, 0xe3, 0xd6,
+	0xb3, 0xc5, 0x3c, 0x0f, 0xdb, 0x91, 0x5e, 0xf5, 0x01, 0x98, 0xa4, 0xcc, 0xee, 0x45, 0x6b, 0xa7,
+	0xc8, 0xb5, 0x9b, 0xa0, 0x32, 0x4a, 0x6d, 0x80, 0x39, 0x92, 0x89, 0x6c, 0xc3, 0x38, 0x34, 0xe9,
+	0xf5, 0x2c, 0xb9, 0xcd, 0xaa, 0xaf, 0x82, 0xf9, 0x57, 0x9e, 0xcf, 0x18, 0x7d, 0xdd, 0x25, 0x02,
+	0x53, 0xc2, 0x05, 0x46, 0x07, 0x8c, 0x51, 0xae, 0x96, 0x41, 0x81, 0xa0, 0x68, 0xa8, 0x85, 0x7a,
+	0xd1, 0x8a, 0x8e, 0xab, 0x1f, 0x14, 0x30, 0x3b, 0xe6, 0x77, 0x53, 0x17, 0xc1, 0xc2, 0x18, 0xf3,
+	0x3e, 0x14, 0xa4, 0x8f, 0xcb, 0x39, 0x55, 0xcb, 0x6e, 0x52, 0x0a, 0xef, 0x1d, 0x1c, 0x76, 0x61,
+	0x80, 0xcb, 0x8a, 0x5a, 0x07, 0x8f, 0xc6, 0xe0, 0x2d, 0xe6, 0xd9, 0xd8, 0x13, 0x01, 0x14, 0x18,
+	0xc5, 0x9e, 0xf9, 0x6a, 0xf1, 0xe4, 0x93, 0x96, 0xdb, 0x3e, 0x38, 0xbb, 0xd4, 0x94, 0xf3, 0x4b,
+	0x4d, 0xf9, 0x71, 0xa9, 0x29, 0x1f, 0xaf, 0xb4, 0xdc, 0xf9, 0x95, 0x96, 0xfb, 0x7a, 0xa5, 0xe5,
+	0xde, 0x6c, 0x66, 0x06, 0x90, 0x3c, 0x15, 0xeb, 0x14, 0x76, 0xf8, 0xf0, 0x62, 0xf6, 0x1b, 0x9b,
+	0xe6, 0xbb, 0xec, 0x5b, 0x29, 0x87, 0xd2, 0x99, 0x90, 0x8f, 0xd3, 0x93, 0x5f, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0xce, 0x2c, 0x7a, 0x08, 0x4e, 0x05, 0x00, 0x00,
 }
 
 func (this *SuperfluidAsset) Equal(that interface{}) bool {
diff --git a/x/superfluid/types/tx.pb.go b/x/superfluid/types/tx.pb.go
index e02eeb25e0e..e75372c8d89 100644
--- a/x/superfluid/types/tx.pb.go
+++ b/x/superfluid/types/tx.pb.go
@@ -1045,88 +1045,88 @@ func init() {
 func init() { proto.RegisterFile("osmosis/superfluid/tx.proto", fileDescriptor_55b645f187d22814) }
 
 var fileDescriptor_55b645f187d22814 = []byte{
-	// 1289 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xbf, 0x6f, 0xdb, 0xc6,
-	0x17, 0x37, 0x25, 0xc5, 0x4e, 0xce, 0x71, 0x12, 0xf3, 0x9b, 0x1f, 0x8a, 0xbe, 0x89, 0xa8, 0x5c,
-	0x82, 0xc0, 0x69, 0x22, 0xd2, 0x4a, 0x9a, 0x1f, 0xf0, 0x64, 0xcb, 0x42, 0x0a, 0xa5, 0x16, 0x6a,
-	0x30, 0x36, 0x0a, 0x64, 0x11, 0x28, 0xdd, 0x85, 0x66, 0x4d, 0xf1, 0x14, 0x1d, 0xe9, 0x1f, 0xe8,
-	0xd4, 0x2e, 0x29, 0x32, 0x65, 0xec, 0xd6, 0xbd, 0x43, 0xd1, 0x3f, 0xa1, 0x43, 0x87, 0xa0, 0x53,
-	0xb6, 0x16, 0x2d, 0xa0, 0x14, 0xf6, 0xd0, 0xdd, 0x63, 0xa7, 0xe2, 0xc8, 0xe3, 0x49, 0xb2, 0xc9,
-	0xc8, 0x54, 0xd4, 0xa1, 0x4b, 0xa2, 0xbb, 0x7b, 0xef, 0x7d, 0x3e, 0xef, 0xdd, 0x7b, 0xef, 0x1e,
-	0x0d, 0xfe, 0x4f, 0x68, 0x8b, 0x50, 0x8b, 0x6a, 0xd4, 0x6b, 0xe3, 0xce, 0x73, 0xdb, 0xb3, 0x90,
-	0xe6, 0xee, 0xa8, 0xed, 0x0e, 0x71, 0x89, 0x2c, 0xf3, 0x43, 0xb5, 0x77, 0x98, 0x3b, 0x6f, 0x12,
-	0x93, 0xf8, 0xc7, 0x1a, 0xfb, 0x15, 0x48, 0xe6, 0x66, 0x8d, 0x96, 0xe5, 0x10, 0xcd, 0xff, 0x97,
-	0x6f, 0xe5, 0x4d, 0x42, 0x4c, 0x1b, 0x6b, 0xfe, 0xaa, 0xe1, 0x3d, 0xd7, 0x90, 0xd7, 0x31, 0x5c,
-	0x8b, 0x38, 0xe1, 0x79, 0xd3, 0xb7, 0xae, 0x35, 0x0c, 0x8a, 0xb5, 0xad, 0x52, 0x03, 0xbb, 0x46,
-	0x49, 0x6b, 0x12, 0x2b, 0x3c, 0x57, 0x0e, 0xeb, 0xbb, 0x56, 0x0b, 0x53, 0xd7, 0x68, 0xb5, 0xb9,
-	0xc0, 0xf5, 0x08, 0xea, 0xbd, 0x9f, 0x81, 0x10, 0xfc, 0x56, 0x02, 0x17, 0x6a, 0xd4, 0x7c, 0x2a,
-	0xf6, 0x2b, 0xd8, 0xc6, 0xa6, 0xe1, 0x62, 0xf9, 0x16, 0x98, 0xa4, 0xd8, 0x41, 0xb8, 0x93, 0x95,
-	0x0a, 0xd2, 0xdc, 0xa9, 0xf2, 0xec, 0x41, 0x57, 0x99, 0xd9, 0x35, 0x5a, 0xf6, 0x02, 0x0c, 0xf6,
-	0xa1, 0xce, 0x05, 0xe4, 0x4b, 0x60, 0xca, 0x26, 0xcd, 0xcd, 0xba, 0x85, 0xb2, 0xa9, 0x82, 0x34,
-	0x97, 0xd1, 0x27, 0xd9, 0xb2, 0x8a, 0xe4, 0xcb, 0xe0, 0xe4, 0x96, 0x61, 0xd7, 0x0d, 0x84, 0x3a,
-	0xd9, 0x34, 0xb3, 0xa2, 0x4f, 0x6d, 0x19, 0xf6, 0x12, 0x42, 0x9d, 0x85, 0xc2, 0xab, 0xbf, 0x7e,
-	0xfc, 0x28, 0x22, 0xba, 0x45, 0xc4, 0x09, 0x40, 0x05, 0x5c, 0x8d, 0x64, 0xa6, 0x63, 0xda, 0x26,
-	0x0e, 0xc5, 0xf0, 0x2b, 0x09, 0x5c, 0x1a, 0x90, 0x58, 0x77, 0xd0, 0x18, 0xd9, 0x2f, 0x40, 0x46,
-	0xf1, 0x6a, 0x04, 0x45, 0x4f, 0xe0, 0xc0, 0x6b, 0x40, 0x89, 0xa1, 0x20, 0x68, 0x7e, 0x7d, 0x94,
-	0x66, 0x83, 0x38, 0x68, 0x85, 0x34, 0x37, 0xc7, 0x42, 0xf3, 0x3a, 0xa3, 0x99, 0x8f, 0xa4, 0xc9,
-	0x70, 0x8a, 0x4c, 0x2c, 0x82, 0x67, 0xc8, 0x41, 0xf0, 0xfc, 0x41, 0x02, 0x37, 0x62, 0x7c, 0x59,
-	0x72, 0xc6, 0x4c, 0x5a, 0x2e, 0x83, 0x0c, 0xcb, 0x65, 0x3f, 0x2b, 0xa6, 0xef, 0x5e, 0x56, 0x83,
-	0x64, 0x57, 0x59, 0xb2, 0xab, 0x3c, 0xd9, 0xd5, 0x65, 0x62, 0x39, 0xe5, 0xff, 0xbd, 0xe9, 0x2a,
-	0x13, 0x07, 0x5d, 0x65, 0x3a, 0x00, 0x60, 0x4a, 0x50, 0xf7, 0x75, 0xe1, 0x27, 0xe0, 0xce, 0x71,
-	0xf8, 0x86, 0x0e, 0xf6, 0x93, 0x91, 0xfa, 0xc9, 0xc0, 0x03, 0x09, 0x5c, 0xa9, 0x51, 0x93, 0x09,
-	0x2f, 0x39, 0xe8, 0xc3, 0x6a, 0xc1, 0x00, 0x27, 0x18, 0x39, 0x9a, 0x4d, 0x15, 0xd2, 0xef, 0xf7,
-	0x6c, 0x9e, 0x79, 0xf6, 0xfd, 0x3b, 0x65, 0xce, 0xb4, 0xdc, 0x0d, 0xaf, 0xa1, 0x36, 0x49, 0x4b,
-	0xe3, 0x35, 0x1f, 0xfc, 0x57, 0xa4, 0x68, 0x53, 0x73, 0x77, 0xdb, 0x98, 0xfa, 0x0a, 0x54, 0x0f,
-	0x2c, 0xbf, 0xaf, 0xaa, 0x6e, 0xb1, 0x5c, 0xb8, 0x11, 0xe6, 0x02, 0x73, 0xaf, 0x68, 0x38, 0xa8,
-	0x18, 0x55, 0x5e, 0x0f, 0xfc, 0xdb, 0x8e, 0xf5, 0x59, 0x44, 0xed, 0x0c, 0x48, 0x55, 0x2b, 0x3c,
-	0x60, 0xa9, 0x6a, 0x05, 0xbe, 0x4c, 0x01, 0xad, 0x46, 0xcd, 0xe5, 0x0e, 0x36, 0x5c, 0xfc, 0xd8,
-	0xb3, 0x6d, 0xdd, 0x70, 0x4c, 0xbc, 0x4a, 0xa8, 0xc5, 0x9a, 0xd7, 0x7f, 0x3b, 0x7e, 0xf2, 0x6d,
-	0x30, 0xd5, 0x26, 0xc4, 0x66, 0x29, 0x92, 0x61, 0x1e, 0x97, 0xe5, 0x83, 0xae, 0x72, 0x26, 0x60,
-	0xca, 0x0f, 0xa0, 0x3e, 0xc9, 0x7e, 0x55, 0x11, 0x7c, 0x01, 0x1e, 0x26, 0x0c, 0x84, 0x08, 0xea,
-	0x45, 0x10, 0xe4, 0x5e, 0x65, 0x20, 0x13, 0x2b, 0x72, 0x1e, 0x80, 0x36, 0x37, 0x50, 0xad, 0xf0,
-	0x92, 0xe9, 0xdb, 0x61, 0xed, 0x3a, 0x5b, 0xa3, 0xe6, 0xba, 0xb3, 0x4a, 0x88, 0xfd, 0xf9, 0x86,
-	0xe5, 0x62, 0xdb, 0xa2, 0x2e, 0x46, 0x6c, 0x99, 0x24, 0xca, 0x7d, 0x7e, 0xa6, 0x86, 0xf9, 0xb9,
-	0x70, 0x83, 0x25, 0x95, 0x12, 0x26, 0x95, 0xe7, 0xb0, 0xed, 0xe2, 0x76, 0x0f, 0xbc, 0xc8, 0x36,
-	0xe0, 0x13, 0x50, 0x88, 0x63, 0x26, 0xdc, 0xbe, 0x09, 0xce, 0xe2, 0x1d, 0xcb, 0xc5, 0xa8, 0xce,
-	0x0b, 0x91, 0x66, 0xa5, 0x42, 0x7a, 0x2e, 0xa3, 0xcf, 0x04, 0xdb, 0x2b, 0x7e, 0x3d, 0x52, 0xf8,
-	0x4d, 0x1a, 0x3c, 0xf2, 0x8d, 0xd9, 0x41, 0x7a, 0xd6, 0x2c, 0xb3, 0x63, 0xb8, 0xf8, 0xe9, 0x86,
-	0xd1, 0xc1, 0x74, 0x8d, 0x88, 0x60, 0x2f, 0x13, 0xa7, 0x89, 0x1d, 0x97, 0x9d, 0xa1, 0x30, 0xf0,
-	0x09, 0xc3, 0x30, 0xd0, 0x9e, 0xfa, 0xc3, 0xc0, 0x0f, 0xa0, 0x68, 0x59, 0x26, 0x98, 0xa5, 0x3e,
-	0x81, 0xba, 0x4b, 0xea, 0xad, 0x80, 0xd1, 0xf0, 0xfe, 0x55, 0xe0, 0xfd, 0x2b, 0xcb, 0x19, 0x1c,
-	0xb6, 0x00, 0xf5, 0xb3, 0x94, 0xbb, 0xc5, 0xbd, 0x94, 0x5f, 0x49, 0xe0, 0x8c, 0x4b, 0x36, 0xb1,
-	0x53, 0x27, 0x9e, 0x5b, 0x6f, 0xb1, 0x62, 0xc8, 0x0c, 0x2b, 0x86, 0x2a, 0x87, 0xb9, 0x10, 0xc0,
-	0x0c, 0xaa, 0xc3, 0x44, 0x55, 0x72, 0xda, 0x57, 0xfe, 0xcc, 0x73, 0x6b, 0x4c, 0xf5, 0x97, 0x34,
-	0x58, 0x1c, 0xf5, 0x2a, 0xc4, 0xbd, 0x3f, 0x03, 0x53, 0x46, 0x8b, 0x78, 0x8e, 0x3b, 0xcf, 0xef,
-	0x64, 0x91, 0xd1, 0xfd, 0xbd, 0xab, 0xdc, 0x3c, 0x06, 0xab, 0xaa, 0xe3, 0xf6, 0x6e, 0x85, 0x9b,
-	0x81, 0x7a, 0x68, 0xb0, 0x67, 0xbb, 0xe4, 0xdf, 0xe1, 0x07, 0xdb, 0x2e, 0x09, 0xdb, 0x25, 0x79,
-	0x1b, 0xcc, 0xda, 0xd6, 0x0b, 0xcf, 0x42, 0x96, 0xbb, 0x5b, 0x6f, 0xfa, 0x85, 0x8e, 0x82, 0x96,
-	0x51, 0x7e, 0x92, 0x00, 0xa5, 0x82, 0x9b, 0xbd, 0x0c, 0x38, 0x62, 0x10, 0xea, 0xe7, 0xc4, 0x5e,
-	0xd0, 0x4c, 0x90, 0xbc, 0x0e, 0x4e, 0x7d, 0x41, 0x2c, 0xa7, 0xce, 0x66, 0x3a, 0xbf, 0x13, 0x4d,
-	0xdf, 0xcd, 0xa9, 0xc1, 0xc0, 0xa7, 0x86, 0x03, 0x9f, 0xba, 0x16, 0x0e, 0x7c, 0xe5, 0x2b, 0xfc,
-	0xf6, 0xcf, 0x05, 0x10, 0x42, 0x15, 0xbe, 0x7e, 0xa7, 0x48, 0xfa, 0x49, 0xb6, 0x66, 0xc2, 0xf0,
-	0xd7, 0xa0, 0x77, 0x2f, 0x21, 0xb4, 0x46, 0xfa, 0x2f, 0x6c, 0x25, 0xc4, 0xef, 0xb5, 0x2c, 0x51,
-	0x4e, 0x0f, 0xc1, 0x74, 0xd8, 0x80, 0xc4, 0xcb, 0x59, 0xbe, 0x78, 0xd0, 0x55, 0xe4, 0xb0, 0x5d,
-	0x88, 0x43, 0xd8, 0xd7, 0xab, 0x50, 0x5f, 0x1d, 0xa6, 0x86, 0xd5, 0x61, 0x3d, 0x4c, 0x78, 0x84,
-	0xa9, 0xd5, 0xc1, 0x68, 0x7e, 0x78, 0x5d, 0x5d, 0x8d, 0x4a, 0xf8, 0x50, 0x1d, 0xea, 0x33, 0xfe,
-	0x46, 0x85, 0xaf, 0x8f, 0x00, 0x94, 0x78, 0x50, 0x47, 0x04, 0x28, 0x1d, 0x02, 0x28, 0xc1, 0x9f,
-	0xd3, 0xfe, 0x63, 0x90, 0x24, 0xb2, 0xa2, 0x3a, 0x46, 0x8e, 0x70, 0x5f, 0x59, 0xa5, 0xfe, 0xc5,
-	0xb2, 0x4a, 0x8f, 0xbb, 0xac, 0x36, 0xc1, 0x8c, 0x83, 0xb7, 0xeb, 0x22, 0xeb, 0xb3, 0x27, 0x7c,
-	0x84, 0xc7, 0x89, 0x4b, 0xea, 0x7c, 0x80, 0x30, 0x60, 0x0c, 0xea, 0xa7, 0x1d, 0xbc, 0x2d, 0xe2,
-	0xde, 0xdf, 0xe3, 0x33, 0xc3, 0x7a, 0xfc, 0xdd, 0xbf, 0x01, 0x48, 0xd7, 0xa8, 0x29, 0x77, 0x80,
-	0x1c, 0x35, 0xc6, 0xa8, 0x47, 0x3f, 0xf8, 0xd4, 0xc8, 0x6f, 0x94, 0x5c, 0xe9, 0xd8, 0xa2, 0x22,
-	0x0d, 0x76, 0xc0, 0xf9, 0xc8, 0x4f, 0x99, 0xdb, 0x43, 0x4d, 0xf5, 0x84, 0x73, 0xf7, 0x12, 0x08,
-	0xc7, 0x21, 0x8b, 0x41, 0xff, 0x38, 0xc8, 0xa1, 0xf0, 0xb1, 0x90, 0x8f, 0x8c, 0xe4, 0xdf, 0x49,
-	0xe0, 0xda, 0xf0, 0x0f, 0x8e, 0x47, 0x09, 0x9c, 0x1a, 0xd0, 0xcc, 0x2d, 0x8e, 0xaa, 0x29, 0x18,
-	0xbe, 0x94, 0xc0, 0xe5, 0xf8, 0x0f, 0x83, 0xf9, 0x18, 0xfb, 0xb1, 0x1a, 0xb9, 0x47, 0x49, 0x35,
-	0x04, 0x93, 0x9f, 0x24, 0x70, 0x27, 0xd1, 0xd4, 0xbd, 0x1c, 0x03, 0x95, 0xc4, 0x48, 0xee, 0xd3,
-	0x31, 0x18, 0x11, 0x2e, 0x7c, 0x09, 0x2e, 0x44, 0x8f, 0xae, 0x77, 0x62, 0x50, 0x22, 0xa5, 0x73,
-	0x1f, 0x27, 0x91, 0x16, 0xe0, 0x7f, 0x48, 0xe0, 0xfe, 0x68, 0x13, 0xe5, 0x4a, 0x2c, 0xde, 0x08,
-	0xd6, 0x72, 0x6b, 0xe3, 0xb4, 0x36, 0x90, 0x1d, 0x89, 0xde, 0xf5, 0xb8, 0xec, 0x48, 0x62, 0x24,
-	0x36, 0x3b, 0x46, 0x79, 0x07, 0xcb, 0xab, 0x6f, 0xf6, 0xf2, 0xd2, 0xdb, 0xbd, 0xbc, 0xf4, 0xe7,
-	0x5e, 0x5e, 0x7a, 0xbd, 0x9f, 0x9f, 0x78, 0xbb, 0x9f, 0x9f, 0xf8, 0x6d, 0x3f, 0x3f, 0xf1, 0xec,
-	0x41, 0xdf, 0x8b, 0xc0, 0x01, 0x8b, 0xb6, 0xd1, 0xa0, 0xe1, 0x42, 0xdb, 0x2a, 0xdd, 0xd7, 0x76,
-	0x06, 0xfe, 0x46, 0xc7, 0x5e, 0x89, 0xc6, 0xa4, 0x3f, 0x2b, 0xdd, 0xfb, 0x27, 0x00, 0x00, 0xff,
-	0xff, 0x58, 0x05, 0x7c, 0xf1, 0xc6, 0x13, 0x00, 0x00,
+	// 1288 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x73, 0xd3, 0x46,
+	0x14, 0x8f, 0x6c, 0x93, 0xc0, 0x86, 0x00, 0x51, 0xf9, 0x30, 0x2e, 0x58, 0x66, 0x61, 0x98, 0x50,
+	0xb0, 0x14, 0x43, 0x0b, 0x4c, 0x4e, 0x89, 0xe3, 0xa1, 0x63, 0x1a, 0x4f, 0x33, 0x22, 0x99, 0xce,
+	0x70, 0xf1, 0xc8, 0xde, 0x45, 0x51, 0x23, 0x6b, 0x8d, 0x57, 0xca, 0xc7, 0xf4, 0xd4, 0x5e, 0xe8,
+	0x70, 0xe2, 0xd8, 0x5b, 0xef, 0x3d, 0x74, 0xfa, 0x27, 0xf4, 0xd0, 0x03, 0xd3, 0x13, 0xb7, 0x76,
+	0xda, 0x19, 0xd3, 0x49, 0x0e, 0xbd, 0xe7, 0xd8, 0x53, 0x67, 0xa5, 0xd5, 0xda, 0x4e, 0x24, 0x1c,
+	0x19, 0xf7, 0xd0, 0x0b, 0x78, 0x77, 0xdf, 0x7b, 0xbf, 0xdf, 0x7b, 0xfb, 0xde, 0xdb, 0xa7, 0x80,
+	0x0f, 0x09, 0x6d, 0x11, 0x6a, 0x51, 0x8d, 0x7a, 0x6d, 0xdc, 0x79, 0x66, 0x7b, 0x16, 0xd2, 0xdc,
+	0x1d, 0xb5, 0xdd, 0x21, 0x2e, 0x91, 0x65, 0x7e, 0xa8, 0xf6, 0x0e, 0x73, 0xe7, 0x4d, 0x62, 0x12,
+	0xff, 0x58, 0x63, 0xbf, 0x02, 0xc9, 0xdc, 0xac, 0xd1, 0xb2, 0x1c, 0xa2, 0xf9, 0xff, 0xf2, 0xad,
+	0xbc, 0x49, 0x88, 0x69, 0x63, 0xcd, 0x5f, 0x35, 0xbc, 0x67, 0x1a, 0xf2, 0x3a, 0x86, 0x6b, 0x11,
+	0x27, 0x3c, 0x6f, 0xfa, 0xd6, 0xb5, 0x86, 0x41, 0xb1, 0xb6, 0x55, 0x6a, 0x60, 0xd7, 0x28, 0x69,
+	0x4d, 0x62, 0x85, 0xe7, 0xca, 0x61, 0x7d, 0xd7, 0x6a, 0x61, 0xea, 0x1a, 0xad, 0x36, 0x17, 0xb8,
+	0x1e, 0x41, 0xbd, 0xf7, 0x33, 0x10, 0x82, 0xdf, 0x49, 0xe0, 0x42, 0x8d, 0x9a, 0x4f, 0xc4, 0x7e,
+	0x05, 0xdb, 0xd8, 0x34, 0x5c, 0x2c, 0xdf, 0x02, 0x93, 0x14, 0x3b, 0x08, 0x77, 0xb2, 0x52, 0x41,
+	0x9a, 0x3b, 0x55, 0x9e, 0x3d, 0xe8, 0x2a, 0x33, 0xbb, 0x46, 0xcb, 0x5e, 0x80, 0xc1, 0x3e, 0xd4,
+	0xb9, 0x80, 0x7c, 0x09, 0x4c, 0xd9, 0xa4, 0xb9, 0x59, 0xb7, 0x50, 0x36, 0x55, 0x90, 0xe6, 0x32,
+	0xfa, 0x24, 0x5b, 0x56, 0x91, 0x7c, 0x19, 0x9c, 0xdc, 0x32, 0xec, 0xba, 0x81, 0x50, 0x27, 0x9b,
+	0x66, 0x56, 0xf4, 0xa9, 0x2d, 0xc3, 0x5e, 0x42, 0xa8, 0xb3, 0x50, 0x78, 0xf9, 0xf7, 0x4f, 0x1f,
+	0x45, 0x44, 0xb7, 0x88, 0x38, 0x01, 0xa8, 0x80, 0xab, 0x91, 0xcc, 0x74, 0x4c, 0xdb, 0xc4, 0xa1,
+	0x18, 0x7e, 0x2d, 0x81, 0x4b, 0x03, 0x12, 0xeb, 0x0e, 0x1a, 0x23, 0xfb, 0x05, 0xc8, 0x28, 0x5e,
+	0x8d, 0xa0, 0xe8, 0x09, 0x1c, 0x78, 0x0d, 0x28, 0x31, 0x14, 0x04, 0xcd, 0x6f, 0x8e, 0xd2, 0x6c,
+	0x10, 0x07, 0xad, 0x90, 0xe6, 0xe6, 0x58, 0x68, 0x5e, 0x67, 0x34, 0xf3, 0x91, 0x34, 0x19, 0x4e,
+	0x91, 0x89, 0x45, 0xf0, 0x0c, 0x39, 0x08, 0x9e, 0x3f, 0x4a, 0xe0, 0x46, 0x8c, 0x2f, 0x4b, 0xce,
+	0x98, 0x49, 0xcb, 0x65, 0x90, 0x61, 0xb9, 0xec, 0x67, 0xc5, 0xf4, 0xdd, 0xcb, 0x6a, 0x90, 0xec,
+	0x2a, 0x4b, 0x76, 0x95, 0x27, 0xbb, 0xba, 0x4c, 0x2c, 0xa7, 0xfc, 0xc1, 0xeb, 0xae, 0x32, 0x71,
+	0xd0, 0x55, 0xa6, 0x03, 0x00, 0xa6, 0x04, 0x75, 0x5f, 0x17, 0x7e, 0x0a, 0xee, 0x1c, 0x87, 0x6f,
+	0xe8, 0x60, 0x3f, 0x19, 0xa9, 0x9f, 0x0c, 0x3c, 0x90, 0xc0, 0x95, 0x1a, 0x35, 0x99, 0xf0, 0x92,
+	0x83, 0xde, 0xaf, 0x16, 0x0c, 0x70, 0x82, 0x91, 0xa3, 0xd9, 0x54, 0x21, 0xfd, 0x6e, 0xcf, 0xe6,
+	0x99, 0x67, 0x3f, 0xbc, 0x55, 0xe6, 0x4c, 0xcb, 0xdd, 0xf0, 0x1a, 0x6a, 0x93, 0xb4, 0x34, 0x5e,
+	0xf3, 0xc1, 0x7f, 0x45, 0x8a, 0x36, 0x35, 0x77, 0xb7, 0x8d, 0xa9, 0xaf, 0x40, 0xf5, 0xc0, 0xf2,
+	0xbb, 0xaa, 0xea, 0x16, 0xcb, 0x85, 0x1b, 0x61, 0x2e, 0x30, 0xf7, 0x8a, 0x86, 0x83, 0x8a, 0x51,
+	0xe5, 0x75, 0xdf, 0xbf, 0xed, 0x58, 0x9f, 0x45, 0xd4, 0xce, 0x80, 0x54, 0xb5, 0xc2, 0x03, 0x96,
+	0xaa, 0x56, 0xe0, 0x8b, 0x14, 0xd0, 0x6a, 0xd4, 0x5c, 0xee, 0x60, 0xc3, 0xc5, 0x8f, 0x3c, 0xdb,
+	0xd6, 0x0d, 0xc7, 0xc4, 0xab, 0x84, 0x5a, 0xac, 0x79, 0xfd, 0xbf, 0xe3, 0x27, 0xdf, 0x06, 0x53,
+	0x6d, 0x42, 0x6c, 0x96, 0x22, 0x19, 0xe6, 0x71, 0x59, 0x3e, 0xe8, 0x2a, 0x67, 0x02, 0xa6, 0xfc,
+	0x00, 0xea, 0x93, 0xec, 0x57, 0x15, 0xc1, 0xe7, 0xe0, 0x41, 0xc2, 0x40, 0x88, 0xa0, 0x5e, 0x04,
+	0x41, 0xee, 0x55, 0x06, 0x32, 0xb1, 0x22, 0xe7, 0x01, 0x68, 0x73, 0x03, 0xd5, 0x0a, 0x2f, 0x99,
+	0xbe, 0x1d, 0xd6, 0xae, 0xb3, 0x35, 0x6a, 0xae, 0x3b, 0xab, 0x84, 0xd8, 0x5f, 0x6c, 0x58, 0x2e,
+	0xb6, 0x2d, 0xea, 0x62, 0xc4, 0x96, 0x49, 0xa2, 0xdc, 0xe7, 0x67, 0x6a, 0x98, 0x9f, 0x0b, 0x37,
+	0x58, 0x52, 0x29, 0x61, 0x52, 0x79, 0x0e, 0xdb, 0x2e, 0x6e, 0xf7, 0xc0, 0x8b, 0x6c, 0x03, 0x3e,
+	0x06, 0x85, 0x38, 0x66, 0xc2, 0xed, 0x9b, 0xe0, 0x2c, 0xde, 0xb1, 0x5c, 0x8c, 0xea, 0xbc, 0x10,
+	0x69, 0x56, 0x2a, 0xa4, 0xe7, 0x32, 0xfa, 0x4c, 0xb0, 0xbd, 0xe2, 0xd7, 0x23, 0x85, 0xdf, 0xa6,
+	0xc1, 0x43, 0xdf, 0x98, 0x1d, 0xa4, 0x67, 0xcd, 0x32, 0x3b, 0x86, 0x8b, 0x9f, 0x6c, 0x18, 0x1d,
+	0x4c, 0xd7, 0x88, 0x08, 0xf6, 0x32, 0x71, 0x9a, 0xd8, 0x71, 0xd9, 0x19, 0x0a, 0x03, 0x9f, 0x30,
+	0x0c, 0x03, 0xed, 0xa9, 0x3f, 0x0c, 0xfc, 0x00, 0x8a, 0x96, 0x65, 0x82, 0x59, 0xea, 0x13, 0xa8,
+	0xbb, 0xa4, 0xde, 0x0a, 0x18, 0x0d, 0xef, 0x5f, 0x05, 0xde, 0xbf, 0xb2, 0x9c, 0xc1, 0x61, 0x0b,
+	0x50, 0x3f, 0x4b, 0xb9, 0x5b, 0xdc, 0x4b, 0xf9, 0xa5, 0x04, 0xce, 0xb8, 0x64, 0x13, 0x3b, 0x75,
+	0xe2, 0xb9, 0xf5, 0x16, 0x2b, 0x86, 0xcc, 0xb0, 0x62, 0xa8, 0x72, 0x98, 0x0b, 0x01, 0xcc, 0xa0,
+	0x3a, 0x4c, 0x54, 0x25, 0xa7, 0x7d, 0xe5, 0xcf, 0x3d, 0xb7, 0xc6, 0x54, 0x7f, 0x4d, 0x83, 0xc5,
+	0x51, 0xaf, 0x42, 0xdc, 0xfb, 0x53, 0x30, 0x65, 0xb4, 0x88, 0xe7, 0xb8, 0xf3, 0xfc, 0x4e, 0x16,
+	0x19, 0xdd, 0x3f, 0xba, 0xca, 0xcd, 0x63, 0xb0, 0xaa, 0x3a, 0x6e, 0xef, 0x56, 0xb8, 0x19, 0xa8,
+	0x87, 0x06, 0x7b, 0xb6, 0x4b, 0xfe, 0x1d, 0xbe, 0xb7, 0xed, 0x92, 0xb0, 0x5d, 0x92, 0xb7, 0xc1,
+	0xac, 0x6d, 0x3d, 0xf7, 0x2c, 0x64, 0xb9, 0xbb, 0xf5, 0xa6, 0x5f, 0xe8, 0x28, 0x68, 0x19, 0xe5,
+	0xc7, 0x09, 0x50, 0x2a, 0xb8, 0xd9, 0xcb, 0x80, 0x23, 0x06, 0xa1, 0x7e, 0x4e, 0xec, 0x05, 0xcd,
+	0x04, 0xc9, 0xeb, 0xe0, 0xd4, 0x97, 0xc4, 0x72, 0xea, 0x6c, 0xa6, 0xf3, 0x3b, 0xd1, 0xf4, 0xdd,
+	0x9c, 0x1a, 0x0c, 0x7c, 0x6a, 0x38, 0xf0, 0xa9, 0x6b, 0xe1, 0xc0, 0x57, 0xbe, 0xc2, 0x6f, 0xff,
+	0x5c, 0x00, 0x21, 0x54, 0xe1, 0xab, 0xb7, 0x8a, 0xa4, 0x9f, 0x64, 0x6b, 0x26, 0x0c, 0x7f, 0x0b,
+	0x7a, 0xf7, 0x12, 0x42, 0x6b, 0xa4, 0xff, 0xc2, 0x56, 0x42, 0xfc, 0x5e, 0xcb, 0x12, 0xe5, 0xf4,
+	0x00, 0x4c, 0x87, 0x0d, 0x48, 0xbc, 0x9c, 0xe5, 0x8b, 0x07, 0x5d, 0x45, 0x0e, 0xdb, 0x85, 0x38,
+	0x84, 0x7d, 0xbd, 0x0a, 0xf5, 0xd5, 0x61, 0x6a, 0x58, 0x1d, 0xd6, 0xc3, 0x84, 0x47, 0x98, 0x5a,
+	0x1d, 0x8c, 0xe6, 0x87, 0xd7, 0xd5, 0xd5, 0xa8, 0x84, 0x0f, 0xd5, 0xa1, 0x3e, 0xe3, 0x6f, 0x54,
+	0xf8, 0xfa, 0x08, 0x40, 0x89, 0x07, 0x75, 0x44, 0x80, 0xd2, 0x21, 0x80, 0x12, 0xfc, 0x25, 0xed,
+	0x3f, 0x06, 0x49, 0x22, 0x2b, 0xaa, 0x63, 0xe4, 0x08, 0xf7, 0x95, 0x55, 0xea, 0x3f, 0x2c, 0xab,
+	0xf4, 0xb8, 0xcb, 0x6a, 0x13, 0xcc, 0x38, 0x78, 0xbb, 0x2e, 0xb2, 0x3e, 0x7b, 0xc2, 0x47, 0x78,
+	0x94, 0xb8, 0xa4, 0xce, 0x07, 0x08, 0x03, 0xc6, 0xa0, 0x7e, 0xda, 0xc1, 0xdb, 0x22, 0xee, 0xfd,
+	0x3d, 0x3e, 0x33, 0xac, 0xc7, 0xdf, 0xfd, 0x07, 0x80, 0x74, 0x8d, 0x9a, 0x72, 0x07, 0xc8, 0x51,
+	0x63, 0x8c, 0x7a, 0xf4, 0x83, 0x4f, 0x8d, 0xfc, 0x46, 0xc9, 0x95, 0x8e, 0x2d, 0x2a, 0xd2, 0x60,
+	0x07, 0x9c, 0x8f, 0xfc, 0x94, 0xb9, 0x3d, 0xd4, 0x54, 0x4f, 0x38, 0x77, 0x2f, 0x81, 0x70, 0x1c,
+	0xb2, 0x18, 0xf4, 0x8f, 0x83, 0x1c, 0x0a, 0x1f, 0x0b, 0xf9, 0xc8, 0x48, 0xfe, 0xbd, 0x04, 0xae,
+	0x0d, 0xff, 0xe0, 0x78, 0x98, 0xc0, 0xa9, 0x01, 0xcd, 0xdc, 0xe2, 0xa8, 0x9a, 0x82, 0xe1, 0x0b,
+	0x09, 0x5c, 0x8e, 0xff, 0x30, 0x98, 0x8f, 0xb1, 0x1f, 0xab, 0x91, 0x7b, 0x98, 0x54, 0x43, 0x30,
+	0xf9, 0x59, 0x02, 0x77, 0x12, 0x4d, 0xdd, 0xcb, 0x31, 0x50, 0x49, 0x8c, 0xe4, 0x3e, 0x1b, 0x83,
+	0x11, 0xe1, 0xc2, 0x57, 0xe0, 0x42, 0xf4, 0xe8, 0x7a, 0x27, 0x06, 0x25, 0x52, 0x3a, 0xf7, 0x71,
+	0x12, 0x69, 0x01, 0xfe, 0xa7, 0x04, 0x3e, 0x19, 0x6d, 0xa2, 0x5c, 0x89, 0xc5, 0x1b, 0xc1, 0x5a,
+	0x6e, 0x6d, 0x9c, 0xd6, 0x06, 0xb2, 0x23, 0xd1, 0xbb, 0x1e, 0x97, 0x1d, 0x49, 0x8c, 0xc4, 0x66,
+	0xc7, 0x28, 0xef, 0x60, 0x79, 0xf5, 0xf5, 0x5e, 0x5e, 0x7a, 0xb3, 0x97, 0x97, 0xfe, 0xda, 0xcb,
+	0x4b, 0xaf, 0xf6, 0xf3, 0x13, 0x6f, 0xf6, 0xf3, 0x13, 0xbf, 0xef, 0xe7, 0x27, 0x9e, 0xde, 0xef,
+	0x7b, 0x11, 0x38, 0x60, 0xd1, 0x36, 0x1a, 0x34, 0x5c, 0x68, 0x5b, 0xa5, 0xfb, 0xda, 0xce, 0xc0,
+	0xdf, 0xe8, 0xd8, 0x2b, 0xd1, 0x98, 0xf4, 0x67, 0xa5, 0x7b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
+	0x7f, 0x02, 0xa2, 0xf3, 0xc6, 0x13, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/tokenfactory/client/cli/cli_test.go b/x/tokenfactory/client/cli/cli_test.go
index 47bc1b4cc4d..9f4658ecfd2 100644
--- a/x/tokenfactory/client/cli/cli_test.go
+++ b/x/tokenfactory/client/cli/cli_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func TestGetCmdDenomAuthorityMetadata(t *testing.T) {
diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go
index 39a37666661..8a4fa71c049 100644
--- a/x/tokenfactory/client/cli/query.go
+++ b/x/tokenfactory/client/cli/query.go
@@ -12,7 +12,7 @@ import (
 	// sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module
diff --git a/x/tokenfactory/client/cli/query_test.go b/x/tokenfactory/client/cli/query_test.go
index 790528e935e..2b4124e5cee 100644
--- a/x/tokenfactory/client/cli/query_test.go
+++ b/x/tokenfactory/client/cli/query_test.go
@@ -8,8 +8,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go
index ea06d648cef..e962ee22123 100644
--- a/x/tokenfactory/client/cli/tx.go
+++ b/x/tokenfactory/client/cli/tx.go
@@ -8,7 +8,7 @@ import (
 
 	// "github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // GetTxCmd returns the transaction commands for this module
diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go
index 2941d6d1480..8fb8e0f24b7 100644
--- a/x/tokenfactory/keeper/admins.go
+++ b/x/tokenfactory/keeper/admins.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // GetAuthorityMetadata returns the authority metadata for a specific denom
diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go
index ed49e0918e6..8dc31a01a97 100644
--- a/x/tokenfactory/keeper/admins_test.go
+++ b/x/tokenfactory/keeper/admins_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func (s *KeeperTestSuite) TestAdminMsgs() {
diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go
index 966a5d13384..e17b9df6c75 100644
--- a/x/tokenfactory/keeper/bankactions.go
+++ b/x/tokenfactory/keeper/bankactions.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error {
diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go
index 6c17d559b9c..9f5fc334e56 100644
--- a/x/tokenfactory/keeper/before_send.go
+++ b/x/tokenfactory/keeper/before_send.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	errorsmod "cosmossdk.io/errors"
 	wasmKeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
diff --git a/x/tokenfactory/keeper/before_send_test.go b/x/tokenfactory/keeper/before_send_test.go
index 98850dbc5d2..96dc740e93e 100644
--- a/x/tokenfactory/keeper/before_send_test.go
+++ b/x/tokenfactory/keeper/before_send_test.go
@@ -6,7 +6,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go
index c8a4cc62eeb..96b00eebc3b 100644
--- a/x/tokenfactory/keeper/createdenom.go
+++ b/x/tokenfactory/keeper/createdenom.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount
diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go
index 218a066d0d5..2140115fc0f 100644
--- a/x/tokenfactory/keeper/createdenom_test.go
+++ b/x/tokenfactory/keeper/createdenom_test.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func (s *KeeperTestSuite) TestMsgCreateDenom() {
diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go
index 30a5c73ccb5..457283a8c7f 100644
--- a/x/tokenfactory/keeper/genesis.go
+++ b/x/tokenfactory/keeper/genesis.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 // InitGenesis initializes the tokenfactory module's state from a provided genesis
diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go
index 64a3a1bfe69..cffd1b5927f 100644
--- a/x/tokenfactory/keeper/genesis_test.go
+++ b/x/tokenfactory/keeper/genesis_test.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func (s *KeeperTestSuite) TestGenesis() {
diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go
index 953d1e13904..afe2170702d 100644
--- a/x/tokenfactory/keeper/grpc_query.go
+++ b/x/tokenfactory/keeper/grpc_query.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 var _ types.QueryServer = Keeper{}
diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go
index f56c38d1ff4..bfb85932a93 100644
--- a/x/tokenfactory/keeper/keeper.go
+++ b/x/tokenfactory/keeper/keeper.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go
index f75e451f072..f09b4b672c7 100644
--- a/x/tokenfactory/keeper/keeper_test.go
+++ b/x/tokenfactory/keeper/keeper_test.go
@@ -13,9 +13,9 @@ import (
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go
index 5a0916e6693..9965c216da2 100644
--- a/x/tokenfactory/keeper/msg_server.go
+++ b/x/tokenfactory/keeper/msg_server.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 type msgServer struct {
diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go
index 2f01643af0f..1e63fdc195c 100644
--- a/x/tokenfactory/keeper/msg_server_test.go
+++ b/x/tokenfactory/keeper/msg_server_test.go
@@ -3,7 +3,7 @@ package keeper_test
 import (
 	"fmt"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go
index b352011f34b..9e60f8d6c0b 100644
--- a/x/tokenfactory/keeper/params.go
+++ b/x/tokenfactory/keeper/params.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go
index 60f116a7d98..298c9bf355f 100644
--- a/x/tokenfactory/module.go
+++ b/x/tokenfactory/module.go
@@ -23,12 +23,12 @@ import (
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	simulation "github.com/osmosis-labs/osmosis/v15/x/tokenfactory/simulation"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	simulation "github.com/osmosis-labs/osmosis/v16/x/tokenfactory/simulation"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 var (
diff --git a/x/tokenfactory/simulation/sim_msgs.go b/x/tokenfactory/simulation/sim_msgs.go
index 3bd9fbecf79..a7ff660139f 100644
--- a/x/tokenfactory/simulation/sim_msgs.go
+++ b/x/tokenfactory/simulation/sim_msgs.go
@@ -6,9 +6,9 @@ import (
 	legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go
index 1cffd2d7a11..915e30d241b 100644
--- a/x/tokenfactory/types/authorityMetadata.pb.go
+++ b/x/tokenfactory/types/authorityMetadata.pb.go
@@ -95,8 +95,8 @@ var fileDescriptor_99435de88ae175f7 = []byte{
 	0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3,
 	0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26,
 	0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x3d, 0xa0, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97,
-	0x19, 0x9a, 0xea, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89,
-	0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x66, 0x81, 0xb6, 0x2e, 0x01, 0x00, 0x00,
+	0x19, 0x9a, 0xe9, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89,
+	0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x25, 0x43, 0x20, 0xf2, 0x2e, 0x01, 0x00, 0x00,
 }
 
 func (this *DenomAuthorityMetadata) Equal(that interface{}) bool {
diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go
index 7778b3aa27f..80ec4a2b520 100644
--- a/x/tokenfactory/types/denoms_test.go
+++ b/x/tokenfactory/types/denoms_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	appparams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	appparams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func TestDeconstructDenom(t *testing.T) {
diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go
index 66ee49561fc..34f109234fc 100644
--- a/x/tokenfactory/types/genesis.pb.go
+++ b/x/tokenfactory/types/genesis.pb.go
@@ -164,8 +164,8 @@ var fileDescriptor_5749c3f71850298b = []byte{
 	0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78,
 	0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e,
 	0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xa1,
-	0xa9, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18,
-	0x10, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x40, 0x70, 0xdf, 0xac, 0x02, 0x00, 0x00,
+	0x99, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18,
+	0x10, 0x00, 0x00, 0xff, 0xff, 0x36, 0x65, 0xd1, 0x9b, 0xac, 0x02, 0x00, 0x00,
 }
 
 func (this *GenesisDenom) Equal(that interface{}) bool {
diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go
index 75e3d24d5ac..92f6843b3a5 100644
--- a/x/tokenfactory/types/genesis_test.go
+++ b/x/tokenfactory/types/genesis_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 )
 
 func TestGenesisState_Validate(t *testing.T) {
diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go
index d5f1497accd..301a7815012 100644
--- a/x/tokenfactory/types/msgs_test.go
+++ b/x/tokenfactory/types/msgs_test.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/tokenfactory/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/tokenfactory/types"
 
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/tendermint/tendermint/crypto/ed25519"
diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go
index ddfc0b5dd60..334a319e9df 100644
--- a/x/tokenfactory/types/params.pb.go
+++ b/x/tokenfactory/types/params.pb.go
@@ -96,28 +96,28 @@ func init() {
 
 var fileDescriptor_cc8299d306f3ff47 = []byte{
 	// 355 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x6e, 0xea, 0x30,
-	0x14, 0xc6, 0x63, 0xee, 0x15, 0x43, 0xee, 0x72, 0x15, 0x55, 0x2a, 0xa0, 0xca, 0xa1, 0x99, 0x60,
-	0x20, 0x16, 0xfd, 0x23, 0x55, 0x1d, 0x41, 0x6a, 0x27, 0xa4, 0x8a, 0xb1, 0x4b, 0x74, 0x12, 0x4c,
-	0x88, 0x20, 0x39, 0x28, 0x36, 0xa8, 0x79, 0x84, 0x6e, 0x9d, 0xfa, 0x10, 0x7d, 0x12, 0x46, 0xc6,
-	0x4e, 0x69, 0x05, 0x6f, 0xc0, 0x13, 0x54, 0x38, 0xa6, 0x82, 0xb6, 0xea, 0x64, 0x1f, 0x9d, 0xef,
-	0xfb, 0xf9, 0x3b, 0x3e, 0x66, 0x13, 0x45, 0x8c, 0x22, 0x12, 0x4c, 0xe2, 0x98, 0x27, 0x43, 0x08,
-	0x24, 0xa6, 0x19, 0x9b, 0xb7, 0x7d, 0x2e, 0xa1, 0xcd, 0xa6, 0x90, 0x42, 0x2c, 0xdc, 0x69, 0x8a,
-	0x12, 0xad, 0x13, 0x2d, 0x75, 0xf7, 0xa5, 0xae, 0x96, 0xd6, 0x8e, 0x42, 0x0c, 0x51, 0x09, 0xd9,
-	0xf6, 0x56, 0x78, 0x6a, 0x17, 0xbf, 0xe2, 0x61, 0x26, 0x47, 0x98, 0x46, 0x32, 0xeb, 0x71, 0x09,
-	0x03, 0x90, 0xa0, 0x5d, 0xd5, 0x40, 0xd9, 0xbc, 0x02, 0x57, 0x14, 0xba, 0x45, 0x8b, 0x8a, 0xf9,
-	0x20, 0xf8, 0x27, 0x27, 0xc0, 0x28, 0x29, 0xfa, 0xce, 0x63, 0xc9, 0x2c, 0xdf, 0xa9, 0xd4, 0xd6,
-	0x33, 0x31, 0xad, 0x01, 0x4f, 0x30, 0xf6, 0x82, 0x94, 0x83, 0x8c, 0x30, 0xf1, 0x86, 0x9c, 0x57,
-	0x48, 0xfd, 0x4f, 0xe3, 0xdf, 0x59, 0xd5, 0xd5, 0xd8, 0x2d, 0x68, 0x37, 0x84, 0xdb, 0xc5, 0x28,
-	0xe9, 0xf4, 0x16, 0xb9, 0x6d, 0x6c, 0x72, 0xbb, 0x9a, 0x41, 0x3c, 0xb9, 0x76, 0xbe, 0x23, 0x9c,
-	0x97, 0x37, 0xbb, 0x11, 0x46, 0x72, 0x34, 0xf3, 0xdd, 0x00, 0x63, 0x1d, 0x50, 0x1f, 0x2d, 0x31,
-	0x18, 0x33, 0x99, 0x4d, 0xb9, 0x50, 0x34, 0xd1, 0xff, 0xaf, 0x00, 0x5d, 0xed, 0xbf, 0xe1, 0xdc,
-	0x1a, 0x9a, 0xb5, 0x2f, 0xd0, 0x10, 0x84, 0x17, 0x60, 0x22, 0x66, 0x31, 0xaf, 0x94, 0xea, 0xa4,
-	0xf1, 0xb7, 0xd3, 0x5c, 0xe4, 0x36, 0xd9, 0xe4, 0xf6, 0xe9, 0x8f, 0x21, 0xf6, 0xf4, 0x4e, 0xff,
-	0xf8, 0xe0, 0x81, 0x5b, 0x10, 0xdd, 0xa2, 0xd3, 0xe9, 0x2f, 0x56, 0x94, 0x2c, 0x57, 0x94, 0xbc,
-	0xaf, 0x28, 0x79, 0x5a, 0x53, 0x63, 0xb9, 0xa6, 0xc6, 0xeb, 0x9a, 0x1a, 0xf7, 0x57, 0x7b, 0xe9,
-	0xf5, 0x86, 0x5a, 0x13, 0xf0, 0xc5, 0xae, 0x60, 0xf3, 0xf6, 0x25, 0x7b, 0x38, 0x5c, 0x9a, 0x9a,
-	0xc9, 0x2f, 0xab, 0x6f, 0x3e, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, 0x34, 0xd9, 0xad, 0x98, 0x38,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4e, 0xea, 0x40,
+	0x14, 0x86, 0x3b, 0xdc, 0x1b, 0x16, 0xbd, 0x9b, 0x9b, 0xc6, 0x44, 0x20, 0x66, 0x8a, 0x5d, 0xc1,
+	0x82, 0x4e, 0x50, 0x63, 0x8c, 0x4b, 0x48, 0x74, 0x45, 0x62, 0x58, 0xba, 0x69, 0x4e, 0xcb, 0x50,
+	0x1a, 0x68, 0x0f, 0xe9, 0x0c, 0xc4, 0x3e, 0x82, 0x3b, 0x57, 0x3e, 0x84, 0x4f, 0xc2, 0x92, 0xa5,
+	0xab, 0x6a, 0xe0, 0x0d, 0x78, 0x02, 0xc3, 0x74, 0x30, 0xa0, 0xc6, 0xd5, 0xcc, 0xc9, 0xf9, 0xff,
+	0x6f, 0xfe, 0x33, 0xc7, 0x6c, 0xa2, 0x88, 0x51, 0x44, 0x82, 0x49, 0x1c, 0xf3, 0x64, 0x08, 0x81,
+	0xc4, 0x34, 0x63, 0xf3, 0xb6, 0xcf, 0x25, 0xb4, 0xd9, 0x14, 0x52, 0x88, 0x85, 0x3b, 0x4d, 0x51,
+	0xa2, 0x75, 0xa2, 0xa5, 0xee, 0xbe, 0xd4, 0xd5, 0xd2, 0xda, 0x51, 0x88, 0x21, 0x2a, 0x21, 0xdb,
+	0xde, 0x0a, 0x4f, 0xed, 0xe2, 0x57, 0x3c, 0xcc, 0xe4, 0x08, 0xd3, 0x48, 0x66, 0x3d, 0x2e, 0x61,
+	0x00, 0x12, 0xb4, 0xab, 0x1a, 0x28, 0x9b, 0x57, 0xe0, 0x8a, 0x42, 0xb7, 0x68, 0x51, 0x31, 0x1f,
+	0x04, 0xff, 0xe4, 0x04, 0x18, 0x25, 0x45, 0xdf, 0x79, 0x2c, 0x99, 0xe5, 0x3b, 0x95, 0xda, 0x7a,
+	0x26, 0xa6, 0x35, 0xe0, 0x09, 0xc6, 0x5e, 0x90, 0x72, 0x90, 0x11, 0x26, 0xde, 0x90, 0xf3, 0x0a,
+	0xa9, 0xff, 0x69, 0xfc, 0x3b, 0xab, 0xba, 0x1a, 0xbb, 0x05, 0xed, 0x86, 0x70, 0xbb, 0x18, 0x25,
+	0x9d, 0xde, 0x22, 0xb7, 0x8d, 0x4d, 0x6e, 0x57, 0x33, 0x88, 0x27, 0xd7, 0xce, 0x77, 0x84, 0xf3,
+	0xf2, 0x66, 0x37, 0xc2, 0x48, 0x8e, 0x66, 0xbe, 0x1b, 0x60, 0xac, 0x03, 0xea, 0xa3, 0x25, 0x06,
+	0x63, 0x26, 0xb3, 0x29, 0x17, 0x8a, 0x26, 0xfa, 0xff, 0x15, 0xa0, 0xab, 0xfd, 0x37, 0x9c, 0x5b,
+	0x43, 0xb3, 0xf6, 0x05, 0x1a, 0x82, 0xf0, 0x02, 0x4c, 0xc4, 0x2c, 0xe6, 0x95, 0x52, 0x9d, 0x34,
+	0xfe, 0x76, 0x9a, 0x8b, 0xdc, 0x26, 0x9b, 0xdc, 0x3e, 0xfd, 0x31, 0xc4, 0x9e, 0xde, 0xe9, 0x1f,
+	0x1f, 0x3c, 0x70, 0x0b, 0xa2, 0x5b, 0x74, 0x3a, 0xfd, 0xc5, 0x8a, 0x92, 0xe5, 0x8a, 0x92, 0xf7,
+	0x15, 0x25, 0x4f, 0x6b, 0x6a, 0x2c, 0xd7, 0xd4, 0x78, 0x5d, 0x53, 0xe3, 0xfe, 0x6a, 0x2f, 0xbd,
+	0xde, 0x50, 0x6b, 0x02, 0xbe, 0xd8, 0x15, 0x6c, 0xde, 0xbe, 0x64, 0x0f, 0x87, 0x4b, 0x53, 0x33,
+	0xf9, 0x65, 0xf5, 0xcd, 0xe7, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xfc, 0x0c, 0xdc, 0x38,
 	0x02, 0x00, 0x00,
 }
 
diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go
index ef23dcb6d80..d5265a1dbac 100644
--- a/x/tokenfactory/types/query.pb.go
+++ b/x/tokenfactory/types/query.pb.go
@@ -406,7 +406,7 @@ var fileDescriptor_6f22013ad0f72e3f = []byte{
 	// 674 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x4e, 0x13, 0x5f,
 	0x14, 0xee, 0xfc, 0x7e, 0x52, 0xc3, 0xf5, 0x1f, 0x5c, 0xf1, 0x5f, 0xc5, 0xa9, 0x5c, 0x09, 0x01,
-	0x83, 0x1d, 0x8b, 0x98, 0x18, 0x91, 0x40, 0x07, 0x45, 0x13, 0x24, 0xd1, 0x71, 0xa5, 0x9b, 0xe6,
+	0x83, 0x1d, 0x8b, 0xc4, 0x18, 0x91, 0x40, 0x07, 0x45, 0x13, 0x24, 0xd1, 0x71, 0xa5, 0x9b, 0xe6,
 	0xb6, 0xbd, 0x94, 0x86, 0xce, 0x9c, 0x32, 0xf7, 0x16, 0x6d, 0x08, 0x1b, 0x17, 0xae, 0x4d, 0x5c,
 	0xfa, 0x0e, 0x3e, 0x07, 0x4b, 0x12, 0x36, 0xae, 0x1a, 0x05, 0xe3, 0x03, 0xf4, 0x09, 0x4c, 0xef,
 	0x3d, 0x45, 0xa0, 0x65, 0xd2, 0xe2, 0xaa, 0x93, 0x73, 0xbe, 0xf3, 0x9d, 0xef, 0xbb, 0xe7, 0x9c,
@@ -445,7 +445,7 @@ var fileDescriptor_6f22013ad0f72e3f = []byte{
 	0x3d, 0xdb, 0xfa, 0xb1, 0x67, 0x5b, 0x9f, 0xf7, 0xed, 0xd8, 0xce, 0xbe, 0x1d, 0xfb, 0xbe, 0x6f,
 	0xc7, 0xde, 0x3d, 0x2a, 0x96, 0xd4, 0x6a, 0x35, 0x97, 0xca, 0x83, 0xdf, 0x6a, 0x71, 0xaf, 0xcc,
 	0x73, 0xf2, 0xa0, 0xdf, 0x46, 0xfa, 0xa1, 0xf3, 0xe1, 0x68, 0x57, 0x55, 0xab, 0x08, 0x99, 0x8b,
-	0xeb, 0x3f, 0x9b, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x28, 0xe4, 0x1f, 0x52, 0x77, 0x07,
+	0xeb, 0x3f, 0x9b, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x30, 0xc1, 0xbe, 0x16, 0x77, 0x07,
 	0x00, 0x00,
 }
 
diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go
index 7c5b106e042..15aa52c066d 100644
--- a/x/tokenfactory/types/tx.pb.go
+++ b/x/tokenfactory/types/tx.pb.go
@@ -753,61 +753,61 @@ func init() {
 }
 
 var fileDescriptor_283b6c9a90a846b4 = []byte{
-	// 864 bytes of a gzipped FileDescriptorProto
+	// 863 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xbf, 0x6f, 0xdb, 0x46,
 	0x14, 0x36, 0x93, 0xd4, 0x75, 0x2e, 0x75, 0x25, 0xd1, 0x6e, 0xa2, 0x30, 0x0a, 0x99, 0x1e, 0x90,
-	0xa0, 0x2d, 0x2a, 0x12, 0x72, 0x7f, 0xa0, 0xd5, 0xd4, 0x28, 0x85, 0x90, 0xa1, 0x5a, 0x18, 0x4f,
+	0xa0, 0x2d, 0x2a, 0x12, 0x72, 0x8b, 0xa0, 0xd5, 0xd4, 0x28, 0x85, 0x90, 0xa1, 0x5a, 0x18, 0x4f,
 	0x45, 0x00, 0xe1, 0x24, 0x9d, 0x18, 0x42, 0xe1, 0x9d, 0xcb, 0x3b, 0x45, 0xf1, 0x56, 0xa0, 0x5b,
 	0xa7, 0x0e, 0xf9, 0x27, 0xb2, 0xb5, 0xff, 0x40, 0xe7, 0x8c, 0x19, 0x3b, 0x11, 0x81, 0x0d, 0xb4,
 	0x3b, 0xff, 0x82, 0xe2, 0x7e, 0x90, 0x12, 0x29, 0xc1, 0x92, 0x86, 0xc0, 0x8b, 0x61, 0xde, 0x7d,
 	0xdf, 0x77, 0xef, 0x7b, 0xf7, 0xde, 0x3b, 0x81, 0xfb, 0x94, 0x45, 0x94, 0x85, 0xcc, 0xe3, 0x74,
-	0x82, 0xc9, 0x18, 0x0d, 0x39, 0x8d, 0x4f, 0xbd, 0x17, 0xad, 0x01, 0xe6, 0xa8, 0xe5, 0xf1, 0x97,
+	0x82, 0xc9, 0x18, 0x0d, 0x39, 0x8d, 0x4f, 0xbd, 0x97, 0xad, 0x01, 0xe6, 0xa8, 0xe5, 0xf1, 0x57,
 	0xee, 0x49, 0x4c, 0x39, 0x35, 0x1b, 0x1a, 0xe6, 0x2e, 0xc2, 0x5c, 0x0d, 0xb3, 0x0e, 0x03, 0x1a,
 	0x50, 0x09, 0xf4, 0xc4, 0x7f, 0x8a, 0x63, 0xd5, 0x50, 0x14, 0x12, 0xea, 0xc9, 0xbf, 0x7a, 0xc9,
 	0x1e, 0x4a, 0x1d, 0x6f, 0x80, 0x18, 0xce, 0x0f, 0x19, 0xd2, 0x90, 0x2c, 0xed, 0x93, 0x49, 0xbe,
-	0x2f, 0x3e, 0xd4, 0x3e, 0x7c, 0x65, 0x80, 0x8f, 0x7b, 0x2c, 0x78, 0x14, 0x63, 0xc4, 0xf1, 0x8f,
-	0x98, 0xd0, 0xc8, 0xfc, 0x1c, 0xec, 0x32, 0x4c, 0x46, 0x38, 0xae, 0x1b, 0xf7, 0x8c, 0xcf, 0xae,
-	0x77, 0x6a, 0x69, 0xe2, 0xec, 0x9f, 0xa2, 0xe8, 0x79, 0x1b, 0xaa, 0x75, 0xe8, 0x6b, 0x80, 0xe9,
+	0x2f, 0x3e, 0xd4, 0x3e, 0x7c, 0x6d, 0x80, 0x4f, 0x7b, 0x2c, 0x78, 0x1c, 0x63, 0xc4, 0xf1, 0x8f,
+	0x98, 0xd0, 0xc8, 0xfc, 0x12, 0xec, 0x32, 0x4c, 0x46, 0x38, 0xae, 0x1b, 0xf7, 0x8c, 0x2f, 0xae,
+	0x77, 0x6a, 0x69, 0xe2, 0xec, 0x9f, 0xa2, 0xe8, 0x45, 0x1b, 0xaa, 0x75, 0xe8, 0x6b, 0x80, 0xe9,
 	0x81, 0x3d, 0x36, 0x1d, 0x8c, 0x04, 0xad, 0x7e, 0x45, 0x82, 0x0f, 0xd2, 0xc4, 0xa9, 0x68, 0xb0,
-	0xde, 0x81, 0x7e, 0x0e, 0x6a, 0x3f, 0xf8, 0xfd, 0xbf, 0x3f, 0xbf, 0xf8, 0x74, 0x65, 0x86, 0x86,
-	0x32, 0x84, 0xa6, 0xa2, 0x3c, 0x05, 0x37, 0x8b, 0x51, 0xf9, 0x98, 0x9d, 0x50, 0xc2, 0xb0, 0xd9,
+	0xde, 0x81, 0x7e, 0x0e, 0x6a, 0x3f, 0xf8, 0xfd, 0xbf, 0x3f, 0xbf, 0xfa, 0x7c, 0x65, 0x86, 0x86,
+	0x32, 0x84, 0xa6, 0xa2, 0x3c, 0x03, 0x37, 0x8b, 0x51, 0xf9, 0x98, 0x9d, 0x50, 0xc2, 0xb0, 0xd9,
 	0x01, 0x15, 0x82, 0x67, 0x7d, 0x49, 0xed, 0xab, 0x93, 0x55, 0x98, 0x56, 0x9a, 0x38, 0x37, 0xd5,
-	0xc9, 0x25, 0x00, 0xf4, 0xf7, 0x09, 0x9e, 0x1d, 0x8b, 0x05, 0xa9, 0x05, 0xdf, 0x19, 0xe0, 0xc3,
-	0x1e, 0x0b, 0x7a, 0x21, 0xe1, 0xdb, 0xb8, 0x7d, 0x0c, 0x76, 0x51, 0x44, 0xa7, 0x84, 0x4b, 0xaf,
-	0x37, 0x8e, 0x6e, 0xbb, 0x2a, 0xb9, 0xae, 0x48, 0x7e, 0x76, 0x75, 0xee, 0x23, 0x1a, 0x92, 0xce,
-	0x27, 0x6f, 0x12, 0x67, 0x67, 0xae, 0xa4, 0x68, 0xd0, 0xd7, 0x7c, 0xf3, 0x07, 0xb0, 0x1f, 0x85,
-	0x84, 0x1f, 0xd3, 0x87, 0xa3, 0x51, 0x8c, 0x19, 0xab, 0x5f, 0x2d, 0x5b, 0x10, 0xdb, 0x7d, 0x4e,
+	0xc9, 0x25, 0x00, 0xf4, 0xf7, 0x09, 0x9e, 0x1d, 0x8b, 0x05, 0xa9, 0x05, 0xdf, 0x1b, 0xe0, 0xe3,
+	0x1e, 0x0b, 0x7a, 0x21, 0xe1, 0xdb, 0xb8, 0x7d, 0x02, 0x76, 0x51, 0x44, 0xa7, 0x84, 0x4b, 0xaf,
+	0x37, 0x8e, 0x6e, 0xbb, 0x2a, 0xb9, 0xae, 0x48, 0x7e, 0x76, 0x75, 0xee, 0x63, 0x1a, 0x92, 0xce,
+	0x67, 0x6f, 0x13, 0x67, 0x67, 0xae, 0xa4, 0x68, 0xd0, 0xd7, 0x7c, 0xf3, 0x07, 0xb0, 0x1f, 0x85,
+	0x84, 0x1f, 0xd3, 0x47, 0xa3, 0x51, 0x8c, 0x19, 0xab, 0x5f, 0x2d, 0x5b, 0x10, 0xdb, 0x7d, 0x4e,
 	0xfb, 0x48, 0x01, 0xa0, 0x5f, 0x24, 0xb4, 0x6d, 0x91, 0xc8, 0xdb, 0x2b, 0x13, 0x29, 0x80, 0xb0,
 	0x06, 0x2a, 0xda, 0x61, 0x96, 0x39, 0xf8, 0xaf, 0x72, 0xdd, 0x99, 0xc6, 0xe4, 0x72, 0x5c, 0x77,
 	0x41, 0x65, 0x30, 0x8d, 0x49, 0x37, 0xa6, 0x51, 0xd1, 0x77, 0x23, 0x4d, 0x9c, 0xba, 0xe2, 0x08,
 	0x40, 0x7f, 0x1c, 0xd3, 0x68, 0xee, 0xbc, 0x4c, 0xba, 0xc8, 0xbb, 0x80, 0x6a, 0xef, 0xc2, 0x67,
-	0xee, 0xfd, 0x6f, 0x5d, 0xe6, 0xcf, 0x10, 0x09, 0xf0, 0xc3, 0x51, 0x14, 0x6e, 0x95, 0x82, 0x07,
-	0xe0, 0x83, 0xc5, 0x1a, 0xaf, 0xa6, 0x89, 0xf3, 0x91, 0x42, 0xea, 0xfa, 0x52, 0xdb, 0x66, 0x0b,
+	0xee, 0xfd, 0x6f, 0x5d, 0xe6, 0xcf, 0x11, 0x09, 0xf0, 0xa3, 0x51, 0x14, 0x6e, 0x95, 0x82, 0x07,
+	0xe0, 0xa3, 0xc5, 0x1a, 0xaf, 0xa6, 0x89, 0xf3, 0x89, 0x42, 0xea, 0xfa, 0x52, 0xdb, 0x66, 0x0b,
 	0x5c, 0x17, 0xa5, 0x87, 0x84, 0xbe, 0xb6, 0x76, 0x98, 0x26, 0x4e, 0x75, 0x5e, 0x95, 0x72, 0x0b,
 	0xfa, 0x7b, 0x04, 0xcf, 0x64, 0x14, 0x17, 0x36, 0x84, 0x0c, 0xb6, 0xa9, 0x28, 0x75, 0xd5, 0x10,
-	0xf3, 0xf8, 0x73, 0x6b, 0x7f, 0x19, 0xe0, 0xb0, 0xc7, 0x82, 0x27, 0x98, 0x77, 0xf0, 0x98, 0xc6,
-	0xf8, 0x09, 0x26, 0xa3, 0xc7, 0x94, 0x4e, 0xde, 0x87, 0xc1, 0x2e, 0xa8, 0x8a, 0xcb, 0x9f, 0x21,
+	0xf3, 0xf8, 0x73, 0x6b, 0x7f, 0x19, 0xe0, 0xb0, 0xc7, 0x82, 0xa7, 0x98, 0x77, 0xf0, 0x98, 0xc6,
+	0xf8, 0x29, 0x26, 0xa3, 0x27, 0x94, 0x4e, 0x3e, 0x84, 0xc1, 0x2e, 0xa8, 0x8a, 0xcb, 0x9f, 0x21,
 	0x96, 0xdf, 0x8f, 0xf6, 0x79, 0x27, 0x4d, 0x9c, 0x5b, 0x8a, 0x52, 0x46, 0x40, 0xbf, 0x92, 0x2d,
-	0xe9, 0x1b, 0x84, 0x36, 0x68, 0xac, 0x0a, 0x39, 0xf7, 0xf4, 0xca, 0x00, 0x07, 0x0a, 0x20, 0x1b,
+	0xe9, 0x1b, 0x84, 0x36, 0x68, 0xac, 0x0a, 0x39, 0xf7, 0xf4, 0xda, 0x00, 0x07, 0x0a, 0x20, 0x1b,
 	0xb6, 0x87, 0x39, 0x1a, 0x21, 0x8e, 0xb6, 0xb1, 0xe4, 0x83, 0xbd, 0x48, 0xd3, 0x74, 0xe1, 0xde,
 	0x9d, 0x17, 0x2e, 0x99, 0xe4, 0x85, 0x9b, 0x69, 0x77, 0x6e, 0xe9, 0xe2, 0xd5, 0xd3, 0x2b, 0x23,
-	0x43, 0x3f, 0xd7, 0x81, 0x77, 0xc1, 0x9d, 0x15, 0x51, 0xe5, 0x51, 0xbf, 0xbe, 0x02, 0xaa, 0x3d,
+	0x43, 0x3f, 0xd7, 0x81, 0x77, 0xc1, 0x9d, 0x15, 0x51, 0xe5, 0x51, 0xbf, 0xb9, 0x02, 0xaa, 0x3d,
 	0x16, 0x74, 0x69, 0x3c, 0xc4, 0xc7, 0x31, 0x22, 0x6c, 0x8c, 0xe3, 0xcb, 0xe9, 0x34, 0x1f, 0x1c,
 	0x70, 0x1d, 0xc0, 0x72, 0xb7, 0xdd, 0x4b, 0x13, 0xa7, 0xa1, 0x78, 0x19, 0xa8, 0xd4, 0x71, 0xab,
 	0xc8, 0xe6, 0x4f, 0xa0, 0x96, 0x2d, 0xcf, 0xe7, 0xd6, 0x35, 0xa9, 0x68, 0xa7, 0x89, 0x63, 0x95,
-	0x14, 0x17, 0x67, 0xd7, 0x32, 0x11, 0x5a, 0xa0, 0x5e, 0x4e, 0x55, 0x96, 0xc7, 0xa3, 0xd7, 0xbb,
-	0xe0, 0x6a, 0x8f, 0x05, 0xe6, 0x2f, 0xe0, 0xc6, 0xe2, 0xbb, 0xf4, 0xa5, 0x7b, 0xd1, 0x93, 0xe9,
-	0x16, 0xdf, 0x0b, 0xeb, 0xeb, 0x6d, 0xd0, 0xf9, 0xeb, 0xf2, 0x14, 0x5c, 0x93, 0xaf, 0xc2, 0xfd,
+	0x14, 0x17, 0x67, 0xd7, 0x32, 0x11, 0x5a, 0xa0, 0x5e, 0x4e, 0x55, 0x96, 0xc7, 0xa3, 0x37, 0xbb,
+	0xe0, 0x6a, 0x8f, 0x05, 0xe6, 0x2f, 0xe0, 0xc6, 0xe2, 0xbb, 0xf4, 0xb5, 0x7b, 0xd1, 0x93, 0xe9,
+	0x16, 0xdf, 0x0b, 0xeb, 0xdb, 0x6d, 0xd0, 0xf9, 0xeb, 0xf2, 0x0c, 0x5c, 0x93, 0xaf, 0xc2, 0xfd,
 	0xb5, 0x6c, 0x01, 0xb3, 0x9a, 0x1b, 0xc1, 0x16, 0xd5, 0xe5, 0xf4, 0x5d, 0xaf, 0x2e, 0x60, 0x1b,
 	0xa8, 0x2f, 0xce, 0x38, 0x99, 0xae, 0x85, 0xf9, 0xb6, 0x41, 0xba, 0xe6, 0xe8, 0x4d, 0xd2, 0xb5,
 	0x3c, 0x7b, 0xcc, 0x5f, 0x0d, 0x50, 0x5d, 0x6a, 0xd2, 0xd6, 0x5a, 0xa9, 0x32, 0xc5, 0xfa, 0x7e,
 	0x6b, 0x4a, 0x1e, 0xc2, 0x6f, 0x06, 0xa8, 0x2d, 0xcf, 0xbe, 0xa3, 0x4d, 0x04, 0x8b, 0x1c, 0xab,
-	0xbd, 0x3d, 0x27, 0x8f, 0x62, 0x06, 0xf6, 0x8b, 0x6d, 0xef, 0xae, 0x15, 0x2b, 0xe0, 0xad, 0x6f,
-	0xb7, 0xc3, 0x67, 0x07, 0x77, 0xfc, 0x37, 0x67, 0xb6, 0xf1, 0xf6, 0xcc, 0x36, 0xde, 0x9d, 0xd9,
-	0xc6, 0x1f, 0xe7, 0xf6, 0xce, 0xdb, 0x73, 0x7b, 0xe7, 0x9f, 0x73, 0x7b, 0xe7, 0xe7, 0xef, 0x82,
-	0x90, 0x3f, 0x9b, 0x0e, 0xdc, 0x21, 0x8d, 0x3c, 0xad, 0xdd, 0x7c, 0x8e, 0x06, 0x2c, 0xfb, 0xf0,
-	0x5e, 0xb4, 0xbe, 0xf1, 0x5e, 0x16, 0x9f, 0x1c, 0x7e, 0x7a, 0x82, 0xd9, 0x60, 0x57, 0xfe, 0x34,
-	0xfc, 0xea, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb2, 0xbc, 0xe6, 0xde, 0xca, 0x0a, 0x00, 0x00,
+	0xbd, 0x3d, 0x27, 0x8f, 0x62, 0x06, 0xf6, 0x8b, 0x6d, 0xef, 0xae, 0x15, 0x2b, 0xe0, 0xad, 0x87,
+	0xdb, 0xe1, 0xb3, 0x83, 0x3b, 0xfe, 0xdb, 0x33, 0xdb, 0x78, 0x77, 0x66, 0x1b, 0xef, 0xcf, 0x6c,
+	0xe3, 0x8f, 0x73, 0x7b, 0xe7, 0xdd, 0xb9, 0xbd, 0xf3, 0xcf, 0xb9, 0xbd, 0xf3, 0xf3, 0x77, 0x41,
+	0xc8, 0x9f, 0x4f, 0x07, 0xee, 0x90, 0x46, 0x9e, 0xd6, 0x6e, 0xbe, 0x40, 0x03, 0x96, 0x7d, 0x78,
+	0x2f, 0x5b, 0x0f, 0xbd, 0x57, 0xc5, 0x27, 0x87, 0x9f, 0x9e, 0x60, 0x36, 0xd8, 0x95, 0x3f, 0x0d,
+	0xbf, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x99, 0x47, 0x9a, 0xca, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/twap/api.go b/x/twap/api.go
index ca3893c2249..47ad7745d73 100644
--- a/x/twap/api.go
+++ b/x/twap/api.go
@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // GetArithmeticTwap returns an arithmetic time weighted average price.
diff --git a/x/twap/api_test.go b/x/twap/api_test.go
index 70ab4964080..e6049e1b7ea 100644
--- a/x/twap/api_test.go
+++ b/x/twap/api_test.go
@@ -9,10 +9,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	sdkrand "github.com/osmosis-labs/osmosis/v15/simulation/simtypes/random"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/pool-models/balancer"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	sdkrand "github.com/osmosis-labs/osmosis/v16/simulation/simtypes/random"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/pool-models/balancer"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 var (
diff --git a/x/twap/client/cli/query.go b/x/twap/client/cli/query.go
index a8b33696cfe..60373a182fa 100644
--- a/x/twap/client/cli/query.go
+++ b/x/twap/client/cli/query.go
@@ -11,9 +11,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	poolmanager "github.com/osmosis-labs/osmosis/v15/x/poolmanager/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	poolmanager "github.com/osmosis-labs/osmosis/v16/x/poolmanager/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/twap/client/grpc/grpc_query.go b/x/twap/client/grpc/grpc_query.go
index 929bec9728d..f3160bb616e 100644
--- a/x/twap/client/grpc/grpc_query.go
+++ b/x/twap/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/twap/client/query_proto_wrap.go b/x/twap/client/query_proto_wrap.go
index 35692fb02ce..a43ebf8808b 100644
--- a/x/twap/client/query_proto_wrap.go
+++ b/x/twap/client/query_proto_wrap.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
 )
 
 // This file should evolve to being code gen'd, off of `proto/twap/v1beta/query.yml`
diff --git a/x/twap/client/query_proto_wrap_test.go b/x/twap/client/query_proto_wrap_test.go
index 21bb73f471b..f380c0f271a 100644
--- a/x/twap/client/query_proto_wrap_test.go
+++ b/x/twap/client/query_proto_wrap_test.go
@@ -8,9 +8,9 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
 )
 
 type QueryTestSuite struct {
diff --git a/x/twap/client/queryproto/query.pb.go b/x/twap/client/queryproto/query.pb.go
index 37e64d42c3c..662c050ac00 100644
--- a/x/twap/client/queryproto/query.pb.go
+++ b/x/twap/client/queryproto/query.pb.go
@@ -16,7 +16,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
-	types1 "github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	types1 "github.com/osmosis-labs/osmosis/v16/x/twap/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -574,54 +574,54 @@ var fileDescriptor_141a22dba58615af = []byte{
 	// 800 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0x41, 0x4f, 0x1b, 0x47,
 	0x14, 0xc7, 0x3d, 0x2e, 0x98, 0x7a, 0x10, 0x46, 0x9d, 0x02, 0x85, 0x05, 0x76, 0xad, 0x85, 0x22,
-	0x17, 0xc3, 0x2e, 0xa6, 0xea, 0x05, 0xf5, 0x82, 0x55, 0x89, 0x56, 0xaa, 0xaa, 0x76, 0x85, 0xaa,
-	0xaa, 0x17, 0x6b, 0x6c, 0x4f, 0x96, 0x55, 0xbc, 0x3b, 0xeb, 0xdd, 0x31, 0xc4, 0xd7, 0x5c, 0x72,
-	0x48, 0x0e, 0x28, 0x51, 0x0e, 0x39, 0x24, 0xf7, 0x1c, 0xf2, 0x3d, 0x38, 0x25, 0x48, 0xb9, 0x44,
-	0x39, 0x38, 0x11, 0xe4, 0x13, 0xf0, 0x09, 0xa2, 0x9d, 0x99, 0x75, 0xbc, 0xce, 0x8a, 0x98, 0x13,
-	0x42, 0xca, 0xc9, 0xcc, 0x7b, 0xff, 0xf7, 0xde, 0x6f, 0xde, 0xec, 0x9b, 0x01, 0x16, 0x69, 0xe8,
-	0xd2, 0xd0, 0x09, 0x4d, 0x76, 0x84, 0x7d, 0xf3, 0xb0, 0x52, 0x27, 0x0c, 0x57, 0xcc, 0x76, 0x87,
-	0x04, 0x5d, 0xc3, 0x0f, 0x28, 0xa3, 0x68, 0x46, 0x2a, 0x8c, 0x48, 0x61, 0x48, 0x85, 0x32, 0x63,
-	0x53, 0x9b, 0x72, 0x81, 0x19, 0xfd, 0x25, 0xb4, 0xca, 0x5a, 0x6a, 0xb6, 0x68, 0x51, 0x0b, 0x48,
-	0x83, 0x06, 0x4d, 0xa9, 0xd3, 0x53, 0x75, 0x36, 0xf1, 0x48, 0x54, 0x48, 0x68, 0xd4, 0x06, 0x17,
-	0x99, 0x75, 0x1c, 0x92, 0xbe, 0xa4, 0x41, 0x1d, 0x4f, 0xfa, 0xd7, 0x07, 0xfd, 0x1c, 0xb8, 0xaf,
-	0xf2, 0xb1, 0xed, 0x78, 0x98, 0x39, 0x34, 0xd6, 0x2e, 0xd9, 0x94, 0xda, 0x2d, 0x62, 0x62, 0xdf,
-	0x31, 0xb1, 0xe7, 0x51, 0xc6, 0x9d, 0x71, 0xa5, 0x05, 0xe9, 0xe5, 0xab, 0x7a, 0xe7, 0x96, 0x89,
-	0xbd, 0x6e, 0xec, 0x12, 0x45, 0x6a, 0x62, 0xa7, 0x62, 0x21, 0x5d, 0xda, 0x70, 0x14, 0x73, 0x5c,
-	0x12, 0x32, 0xec, 0xfa, 0x42, 0xa0, 0x3f, 0xcb, 0xc2, 0xd9, 0xdd, 0xc0, 0x61, 0x07, 0x2e, 0x61,
-	0x4e, 0x63, 0xff, 0x08, 0xfb, 0x16, 0x69, 0x77, 0x48, 0xc8, 0xd0, 0x0f, 0x70, 0xc2, 0xa7, 0xb4,
-	0x55, 0x73, 0x9a, 0xf3, 0xa0, 0x08, 0x4a, 0x63, 0x56, 0x2e, 0x5a, 0xfe, 0xd1, 0x44, 0xcb, 0x10,
-	0x46, 0xdb, 0xa9, 0xe1, 0x30, 0x24, 0x6c, 0x3e, 0x5b, 0x04, 0xa5, 0xbc, 0x95, 0x8f, 0x2c, 0xbb,
-	0x91, 0x01, 0x69, 0x70, 0xb2, 0xdd, 0xa1, 0x2c, 0xf6, 0x7f, 0xc3, 0xfd, 0x90, 0x9b, 0x84, 0xe0,
-	0x3f, 0x08, 0x43, 0x86, 0x03, 0x56, 0x8b, 0x58, 0xe6, 0xc7, 0x8a, 0xa0, 0x34, 0xb9, 0xad, 0x18,
-	0x02, 0xd4, 0x88, 0x41, 0x8d, 0xfd, 0x18, 0xb4, 0xba, 0x7c, 0xd2, 0xd3, 0x32, 0x17, 0x3d, 0xed,
-	0xbb, 0x2e, 0x76, 0x5b, 0x3b, 0xfa, 0xa7, 0x58, 0xfd, 0xf8, 0x9d, 0x06, 0xac, 0x3c, 0x37, 0x44,
-	0x72, 0x64, 0xc1, 0x6f, 0x89, 0xd7, 0x14, 0x79, 0xc7, 0xbf, 0x98, 0x77, 0xf1, 0xa4, 0xa7, 0x81,
-	0x8b, 0x9e, 0x36, 0x2d, 0xf2, 0xc6, 0x91, 0x22, 0xeb, 0x04, 0xf1, 0x9a, 0x91, 0x54, 0xbf, 0x0f,
-	0xe0, 0xdc, 0x70, 0x83, 0x42, 0x9f, 0x7a, 0x21, 0x41, 0x6d, 0x38, 0x8d, 0xfb, 0x9e, 0x5a, 0xf4,
-	0x95, 0xf0, 0x4e, 0xe5, 0xab, 0xbf, 0x47, 0xc4, 0x6f, 0x7b, 0xda, 0x9a, 0xed, 0xb0, 0x83, 0x4e,
-	0xdd, 0x68, 0x50, 0x57, 0x1e, 0x8b, 0xfc, 0xd9, 0x0c, 0x9b, 0xb7, 0x4d, 0xd6, 0xf5, 0x49, 0x68,
-	0xfc, 0x46, 0x1a, 0x17, 0x3d, 0x6d, 0x4e, 0x30, 0x0c, 0xa5, 0xd3, 0xad, 0x02, 0x4e, 0x94, 0xd6,
-	0x5f, 0x01, 0xa8, 0x24, 0x69, 0xf6, 0xe9, 0x5f, 0xf4, 0xe8, 0xe6, 0x9e, 0x99, 0x7e, 0x0c, 0xe0,
-	0x62, 0xea, 0x8e, 0xae, 0xaf, 0xc9, 0x4f, 0xb3, 0x70, 0x66, 0x8f, 0x50, 0x97, 0xb0, 0xe0, 0xeb,
-	0x48, 0xa4, 0x8c, 0xc4, 0x3d, 0x00, 0x67, 0x87, 0xfa, 0x23, 0x0f, 0xcb, 0x83, 0x05, 0x3b, 0x76,
-	0x0c, 0x9e, 0xd5, 0xde, 0x95, 0xcf, 0x6a, 0x56, 0x10, 0x24, 0xb3, 0xe9, 0xd6, 0x94, 0x3d, 0x58,
-	0x57, 0x7f, 0x09, 0xe0, 0x42, 0x82, 0xe4, 0xa6, 0x4f, 0xc3, 0x03, 0x00, 0x95, 0xb4, 0x0d, 0x5d,
-	0x53, 0x7f, 0xa7, 0xe1, 0xd4, 0xdf, 0x38, 0xc0, 0x6e, 0x28, 0x5b, 0xaa, 0xff, 0x09, 0x0b, 0xb1,
-	0x41, 0x22, 0xed, 0xc0, 0x9c, 0xcf, 0x2d, 0x1c, 0x65, 0x72, 0x7b, 0xc9, 0x48, 0x7b, 0x8a, 0x0d,
-	0x11, 0x55, 0x1d, 0x8b, 0x40, 0x2d, 0x19, 0xb1, 0xfd, 0x30, 0x07, 0xc7, 0xff, 0x89, 0x1e, 0x45,
-	0xd4, 0x85, 0x39, 0xa1, 0x40, 0x2b, 0x97, 0xc5, 0x4b, 0x0c, 0x65, 0xf5, 0x72, 0x91, 0x40, 0xd3,
-	0x57, 0xef, 0xbe, 0xfe, 0xf0, 0x28, 0xab, 0xa2, 0x25, 0x33, 0xf5, 0x25, 0x97, 0x05, 0x9f, 0x00,
-	0x58, 0x48, 0x5e, 0x40, 0xa8, 0x9c, 0x9e, 0x3e, 0xf5, 0x9d, 0x54, 0x36, 0x46, 0x13, 0x4b, 0xa6,
-	0x0d, 0xce, 0xb4, 0x86, 0x56, 0xd3, 0x99, 0x86, 0x40, 0x5e, 0x00, 0xf8, 0x7d, 0xca, 0xe5, 0x88,
-	0xb6, 0x46, 0xa9, 0x39, 0x38, 0x0b, 0x4a, 0xe5, 0x0a, 0x11, 0x12, 0xb5, 0xc2, 0x51, 0xcb, 0xe8,
-	0xa7, 0x51, 0x50, 0x05, 0xd7, 0x63, 0x00, 0xa7, 0x12, 0x9f, 0x2f, 0x5a, 0x4f, 0xaf, 0x9b, 0x76,
-	0xbd, 0x2a, 0xe5, 0x91, 0xb4, 0x92, 0xae, 0xcc, 0xe9, 0x7e, 0x44, 0x2b, 0xe9, 0x74, 0x49, 0x8a,
-	0xe7, 0x00, 0xa2, 0xcf, 0xc7, 0x0a, 0x99, 0x23, 0x14, 0x4c, 0x74, 0x71, 0x6b, 0xf4, 0x00, 0x89,
-	0xb9, 0xc5, 0x31, 0xd7, 0x51, 0x69, 0x04, 0x4c, 0x1e, 0x59, 0xfd, 0xf7, 0xe4, 0x4c, 0x05, 0xa7,
-	0x67, 0x2a, 0x78, 0x7f, 0xa6, 0x82, 0xe3, 0x73, 0x35, 0x73, 0x7a, 0xae, 0x66, 0xde, 0x9c, 0xab,
-	0x99, 0xff, 0x7f, 0x1d, 0x98, 0x6e, 0x99, 0x6d, 0xb3, 0x85, 0xeb, 0x61, 0x3f, 0xf5, 0x61, 0xe5,
-	0x17, 0xf3, 0x8e, 0x28, 0xd0, 0x68, 0x39, 0xc4, 0x63, 0xe2, 0x5f, 0x4e, 0x71, 0x23, 0xe5, 0xf8,
-	0xcf, 0xcf, 0x1f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x37, 0x0b, 0xbf, 0xdc, 0x4d, 0x0b, 0x00, 0x00,
+	0x17, 0xc3, 0x2e, 0xa6, 0x52, 0x0f, 0xa8, 0x17, 0xac, 0x4a, 0xb4, 0x52, 0x55, 0xb5, 0x2b, 0x54,
+	0x55, 0xbd, 0x58, 0x63, 0x7b, 0xb2, 0xac, 0xe2, 0xdd, 0x59, 0xef, 0x8e, 0x21, 0xbe, 0xe6, 0x92,
+	0x43, 0x72, 0x40, 0x89, 0x72, 0xc8, 0x21, 0xb9, 0xe7, 0x90, 0xef, 0xc1, 0x29, 0x41, 0xca, 0x25,
+	0xca, 0xc1, 0x89, 0x20, 0x9f, 0x80, 0x4f, 0x10, 0xed, 0xcc, 0xac, 0xe3, 0x75, 0x56, 0xc4, 0x9c,
+	0x10, 0x52, 0x4e, 0x66, 0xde, 0xfb, 0xbf, 0xf7, 0x7e, 0xf3, 0x66, 0xdf, 0x0c, 0xb0, 0x48, 0x43,
+	0x97, 0x86, 0x4e, 0x68, 0xb2, 0x23, 0xec, 0x9b, 0x87, 0x95, 0x3a, 0x61, 0xb8, 0x62, 0xb6, 0x3b,
+	0x24, 0xe8, 0x1a, 0x7e, 0x40, 0x19, 0x45, 0x33, 0x52, 0x61, 0x44, 0x0a, 0x43, 0x2a, 0x94, 0x19,
+	0x9b, 0xda, 0x94, 0x0b, 0xcc, 0xe8, 0x2f, 0xa1, 0x55, 0xd6, 0x52, 0xb3, 0x45, 0x8b, 0x5a, 0x40,
+	0x1a, 0x34, 0x68, 0x4a, 0x9d, 0x9e, 0xaa, 0xb3, 0x89, 0x47, 0xa2, 0x42, 0x42, 0xa3, 0x36, 0xb8,
+	0xc8, 0xac, 0xe3, 0x90, 0xf4, 0x25, 0x0d, 0xea, 0x78, 0xd2, 0xbf, 0x3e, 0xe8, 0xe7, 0xc0, 0x7d,
+	0x95, 0x8f, 0x6d, 0xc7, 0xc3, 0xcc, 0xa1, 0xb1, 0x76, 0xc9, 0xa6, 0xd4, 0x6e, 0x11, 0x13, 0xfb,
+	0x8e, 0x89, 0x3d, 0x8f, 0x32, 0xee, 0x8c, 0x2b, 0x2d, 0x48, 0x2f, 0x5f, 0xd5, 0x3b, 0xb7, 0x4c,
+	0xec, 0x75, 0x63, 0x97, 0x28, 0x52, 0x13, 0x3b, 0x15, 0x0b, 0xe9, 0xd2, 0x86, 0xa3, 0x98, 0xe3,
+	0x92, 0x90, 0x61, 0xd7, 0x17, 0x02, 0xfd, 0x59, 0x16, 0xce, 0xee, 0x06, 0x0e, 0x3b, 0x70, 0x09,
+	0x73, 0x1a, 0xfb, 0x47, 0xd8, 0xb7, 0x48, 0xbb, 0x43, 0x42, 0x86, 0x7e, 0x80, 0x13, 0x3e, 0xa5,
+	0xad, 0x9a, 0xd3, 0x9c, 0x07, 0x45, 0x50, 0x1a, 0xb3, 0x72, 0xd1, 0xf2, 0x8f, 0x26, 0x5a, 0x86,
+	0x30, 0xda, 0x4e, 0x0d, 0x87, 0x21, 0x61, 0xf3, 0xd9, 0x22, 0x28, 0xe5, 0xad, 0x7c, 0x64, 0xd9,
+	0x8d, 0x0c, 0x48, 0x83, 0x93, 0xed, 0x0e, 0x65, 0xb1, 0xff, 0x1b, 0xee, 0x87, 0xdc, 0x24, 0x04,
+	0xff, 0x41, 0x18, 0x32, 0x1c, 0xb0, 0x5a, 0xc4, 0x32, 0x3f, 0x56, 0x04, 0xa5, 0xc9, 0x6d, 0xc5,
+	0x10, 0xa0, 0x46, 0x0c, 0x6a, 0xec, 0xc7, 0xa0, 0xd5, 0xe5, 0x93, 0x9e, 0x96, 0xb9, 0xe8, 0x69,
+	0xdf, 0x75, 0xb1, 0xdb, 0xda, 0xd1, 0x3f, 0xc5, 0xea, 0xc7, 0xef, 0x34, 0x60, 0xe5, 0xb9, 0x21,
+	0x92, 0x23, 0x0b, 0x7e, 0x4b, 0xbc, 0xa6, 0xc8, 0x3b, 0xfe, 0xc5, 0xbc, 0x8b, 0x27, 0x3d, 0x0d,
+	0x5c, 0xf4, 0xb4, 0x69, 0x91, 0x37, 0x8e, 0x14, 0x59, 0x27, 0x88, 0xd7, 0x8c, 0xa4, 0xfa, 0x7d,
+	0x00, 0xe7, 0x86, 0x1b, 0x14, 0xfa, 0xd4, 0x0b, 0x09, 0x6a, 0xc3, 0x69, 0xdc, 0xf7, 0xd4, 0xa2,
+	0xaf, 0x84, 0x77, 0x2a, 0x5f, 0xfd, 0x3d, 0x22, 0x7e, 0xdb, 0xd3, 0xd6, 0x6c, 0x87, 0x1d, 0x74,
+	0xea, 0x46, 0x83, 0xba, 0xf2, 0x58, 0xe4, 0xcf, 0x66, 0xd8, 0xbc, 0x6d, 0xb2, 0xae, 0x4f, 0x42,
+	0xe3, 0x37, 0xd2, 0xb8, 0xe8, 0x69, 0x73, 0x82, 0x61, 0x28, 0x9d, 0x6e, 0x15, 0x70, 0xa2, 0xb4,
+	0xfe, 0x0a, 0x40, 0x25, 0x49, 0xb3, 0x4f, 0xff, 0xa2, 0x47, 0x37, 0xf7, 0xcc, 0xf4, 0x63, 0x00,
+	0x17, 0x53, 0x77, 0x74, 0x7d, 0x4d, 0x7e, 0x9a, 0x85, 0x33, 0x7b, 0x84, 0xba, 0x84, 0x05, 0x5f,
+	0x47, 0x22, 0x65, 0x24, 0xee, 0x01, 0x38, 0x3b, 0xd4, 0x1f, 0x79, 0x58, 0x1e, 0x2c, 0xd8, 0xb1,
+	0x63, 0xf0, 0xac, 0xf6, 0xae, 0x7c, 0x56, 0xb3, 0x82, 0x20, 0x99, 0x4d, 0xb7, 0xa6, 0xec, 0xc1,
+	0xba, 0xfa, 0x4b, 0x00, 0x17, 0x12, 0x24, 0x37, 0x7d, 0x1a, 0x1e, 0x00, 0xa8, 0xa4, 0x6d, 0xe8,
+	0x9a, 0xfa, 0x3b, 0x0d, 0xa7, 0xfe, 0xc6, 0x01, 0x76, 0x43, 0xd9, 0x52, 0xfd, 0x4f, 0x58, 0x88,
+	0x0d, 0x12, 0x69, 0x07, 0xe6, 0x7c, 0x6e, 0xe1, 0x28, 0x93, 0xdb, 0x4b, 0x46, 0xda, 0x53, 0x6c,
+	0x88, 0xa8, 0xea, 0x58, 0x04, 0x6a, 0xc9, 0x88, 0xed, 0x87, 0x39, 0x38, 0xfe, 0x4f, 0xf4, 0x28,
+	0xa2, 0x2e, 0xcc, 0x09, 0x05, 0x5a, 0xb9, 0x2c, 0x5e, 0x62, 0x28, 0xab, 0x97, 0x8b, 0x04, 0x9a,
+	0xbe, 0x7a, 0xf7, 0xf5, 0x87, 0x47, 0x59, 0x15, 0x2d, 0x99, 0xa9, 0x2f, 0xb9, 0x2c, 0xf8, 0x04,
+	0xc0, 0x42, 0xf2, 0x02, 0x42, 0xe5, 0xf4, 0xf4, 0xa9, 0xef, 0xa4, 0xb2, 0x31, 0x9a, 0x58, 0x32,
+	0x6d, 0x70, 0xa6, 0x35, 0xb4, 0x9a, 0xce, 0x34, 0x04, 0xf2, 0x02, 0xc0, 0xef, 0x53, 0x2e, 0x47,
+	0xb4, 0x35, 0x4a, 0xcd, 0xc1, 0x59, 0x50, 0x2a, 0x57, 0x88, 0x90, 0xa8, 0x15, 0x8e, 0x5a, 0x46,
+	0x3f, 0x8d, 0x82, 0x2a, 0xb8, 0x1e, 0x03, 0x38, 0x95, 0xf8, 0x7c, 0xd1, 0x7a, 0x7a, 0xdd, 0xb4,
+	0xeb, 0x55, 0x29, 0x8f, 0xa4, 0x95, 0x74, 0x65, 0x4e, 0xf7, 0x23, 0x5a, 0x49, 0xa7, 0x4b, 0x52,
+	0x3c, 0x07, 0x10, 0x7d, 0x3e, 0x56, 0xc8, 0x1c, 0xa1, 0x60, 0xa2, 0x8b, 0x5b, 0xa3, 0x07, 0x48,
+	0xcc, 0x2d, 0x8e, 0xb9, 0x8e, 0x4a, 0x23, 0x60, 0xf2, 0xc8, 0xea, 0xbf, 0x27, 0x67, 0x2a, 0x38,
+	0x3d, 0x53, 0xc1, 0xfb, 0x33, 0x15, 0x1c, 0x9f, 0xab, 0x99, 0xd3, 0x73, 0x35, 0xf3, 0xe6, 0x5c,
+	0xcd, 0xfc, 0xff, 0xeb, 0xc0, 0x74, 0xcb, 0x6c, 0x9b, 0x2d, 0x5c, 0x0f, 0xfb, 0xa9, 0x0f, 0x2b,
+	0xbf, 0x98, 0x77, 0x44, 0x81, 0x46, 0xcb, 0x21, 0x1e, 0x13, 0xff, 0x72, 0x8a, 0x1b, 0x29, 0xc7,
+	0x7f, 0x7e, 0xfe, 0x18, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xf8, 0x39, 0xb1, 0x4d, 0x0b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/twap/export_test.go b/x/twap/export_test.go
index 69224b859c6..a69f248564d 100644
--- a/x/twap/export_test.go
+++ b/x/twap/export_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 type (
diff --git a/x/twap/keeper.go b/x/twap/keeper.go
index d6e64bf6cd8..182d8ab05e4 100644
--- a/x/twap/keeper.go
+++ b/x/twap/keeper.go
@@ -8,7 +8,7 @@ import (
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 type Keeper struct {
diff --git a/x/twap/keeper_test.go b/x/twap/keeper_test.go
index b67a36254a1..fbcc770c870 100644
--- a/x/twap/keeper_test.go
+++ b/x/twap/keeper_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // TODO: Consider switching this everywhere
diff --git a/x/twap/listeners.go b/x/twap/listeners.go
index e2a55f0ce5a..104db9dee21 100644
--- a/x/twap/listeners.go
+++ b/x/twap/listeners.go
@@ -3,8 +3,8 @@ package twap
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v15/x/concentrated-liquidity/types"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 	epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/twap/listeners_test.go b/x/twap/listeners_test.go
index 928f2d166f3..ba01f7a9a5f 100644
--- a/x/twap/listeners_test.go
+++ b/x/twap/listeners_test.go
@@ -7,10 +7,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 var defaultPoolId uint64 = 1
diff --git a/x/twap/logic.go b/x/twap/logic.go
index 9d7b3897bcb..d8bde3358b7 100644
--- a/x/twap/logic.go
+++ b/x/twap/logic.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 func newTwapRecord(k types.PoolManagerInterface, ctx sdk.Context, poolId uint64, denom0, denom1 string) (types.TwapRecord, error) {
diff --git a/x/twap/logic_test.go b/x/twap/logic_test.go
index d65caebe3db..7354c38fc0a 100644
--- a/x/twap/logic_test.go
+++ b/x/twap/logic_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types/twapmock"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types/twapmock"
 )
 
 var (
diff --git a/x/twap/migrate_test.go b/x/twap/migrate_test.go
index 3457d8102ee..b372be2cd72 100644
--- a/x/twap/migrate_test.go
+++ b/x/twap/migrate_test.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 func (s *TestSuite) TestMigrateExistingPools() {
diff --git a/x/twap/store.go b/x/twap/store.go
index 639a993c2eb..4ab8bdf4523 100644
--- a/x/twap/store.go
+++ b/x/twap/store.go
@@ -8,7 +8,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 type timeTooOldError struct {
diff --git a/x/twap/store_test.go b/x/twap/store_test.go
index 2f8af36340c..b61010f7546 100644
--- a/x/twap/store_test.go
+++ b/x/twap/store_test.go
@@ -7,10 +7,10 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 // TestTrackChangedPool takes a list of poolIds as test cases, and runs one list per block.
diff --git a/x/twap/strategy.go b/x/twap/strategy.go
index 8810c735a95..36eb36f8fe5 100644
--- a/x/twap/strategy.go
+++ b/x/twap/strategy.go
@@ -4,9 +4,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmomath"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 // twapStrategy is an interface for computing TWAPs.
diff --git a/x/twap/strategy_test.go b/x/twap/strategy_test.go
index 55c106c0e3b..20106751299 100644
--- a/x/twap/strategy_test.go
+++ b/x/twap/strategy_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 type computeTwapTestCase struct {
diff --git a/x/twap/twapmodule/module.go b/x/twap/twapmodule/module.go
index a32cfa6115e..8ec4094550d 100644
--- a/x/twap/twapmodule/module.go
+++ b/x/twap/twapmodule/module.go
@@ -16,12 +16,12 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap"
-	twapclient "github.com/osmosis-labs/osmosis/v15/x/twap/client"
-	twapcli "github.com/osmosis-labs/osmosis/v15/x/twap/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap"
+	twapclient "github.com/osmosis-labs/osmosis/v16/x/twap/client"
+	twapcli "github.com/osmosis-labs/osmosis/v16/x/twap/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 var (
diff --git a/x/twap/types/genesis.pb.go b/x/twap/types/genesis.pb.go
index cf517a16262..76e1a4e2d91 100644
--- a/x/twap/types/genesis.pb.go
+++ b/x/twap/types/genesis.pb.go
@@ -150,29 +150,29 @@ var fileDescriptor_3f4bdf49b69bd63c = []byte{
 	// 397 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xbd, 0xee, 0xd3, 0x30,
 	0x14, 0xc5, 0x63, 0x3e, 0x2a, 0x91, 0x3f, 0x53, 0x54, 0x41, 0x5b, 0xa1, 0x34, 0x64, 0x40, 0x5d,
-	0x6a, 0xd3, 0x02, 0x4b, 0xc5, 0x54, 0x81, 0xf8, 0x5a, 0xaa, 0xc0, 0xc4, 0x12, 0x39, 0xc9, 0x6d,
-	0x6a, 0xd1, 0xc4, 0x96, 0xed, 0xb4, 0xe4, 0x01, 0x90, 0x18, 0x19, 0x79, 0x22, 0xd4, 0xb1, 0x23,
-	0x53, 0x41, 0xed, 0x1b, 0xf0, 0x04, 0x28, 0xb1, 0xcb, 0x80, 0xfa, 0xdf, 0x72, 0xf5, 0x3b, 0xe7,
-	0xe8, 0xe4, 0x5e, 0xbb, 0x21, 0x57, 0x05, 0x57, 0x4c, 0x11, 0xbd, 0xa5, 0x82, 0x6c, 0x26, 0x09,
-	0x68, 0x3a, 0x21, 0x39, 0x94, 0xa0, 0x98, 0xc2, 0x42, 0x72, 0xcd, 0xbd, 0xae, 0xd5, 0xe0, 0x46,
-	0x83, 0xad, 0x66, 0xd0, 0xcd, 0x79, 0xce, 0x5b, 0x01, 0x69, 0xbe, 0x8c, 0x76, 0xf0, 0xe8, 0x62,
-	0x5e, 0x33, 0xc4, 0x12, 0x52, 0x2e, 0x33, 0xab, 0xeb, 0xe7, 0x9c, 0xe7, 0x6b, 0x20, 0xed, 0x94,
-	0x54, 0x4b, 0x42, 0xcb, 0xfa, 0x8c, 0xd2, 0x36, 0x23, 0x36, 0xd9, 0x66, 0xb0, 0xc8, 0xff, 0xdf,
-	0x95, 0x55, 0x92, 0x6a, 0xc6, 0x4b, 0xc3, 0xc3, 0x1f, 0xc8, 0xed, 0x2c, 0xa8, 0xa4, 0x85, 0xf2,
-	0x9e, 0xba, 0xf7, 0x84, 0xac, 0x4a, 0x88, 0x41, 0xf0, 0x74, 0x15, 0xb3, 0x0c, 0x4a, 0xcd, 0x96,
-	0x0c, 0x64, 0x0f, 0x05, 0x68, 0x74, 0x27, 0xea, 0xb6, 0xf4, 0x65, 0x03, 0xdf, 0xfc, 0x63, 0xde,
-	0x17, 0xe4, 0x0e, 0x4c, 0xcf, 0x78, 0xc5, 0x94, 0xe6, 0xb2, 0x8e, 0x3f, 0x01, 0x88, 0x58, 0x80,
-	0x64, 0x3c, 0xeb, 0xdd, 0x08, 0xd0, 0xe8, 0x6a, 0xda, 0xc7, 0xa6, 0x06, 0x3e, 0xd7, 0xc0, 0x2f,
-	0x6c, 0x8d, 0xf9, 0x78, 0x77, 0x18, 0x3a, 0x7f, 0x0e, 0xc3, 0x87, 0x35, 0x2d, 0xd6, 0xb3, 0xf0,
-	0xfa, 0xa8, 0xf0, 0xfb, 0xaf, 0x21, 0x8a, 0xee, 0x1b, 0xc1, 0x6b, 0xc3, 0xdf, 0x01, 0x88, 0x85,
-	0xa1, 0x5f, 0x91, 0x7b, 0xf7, 0x95, 0x39, 0xc2, 0x7b, 0x4d, 0x35, 0x78, 0xcf, 0xdd, 0xdb, 0xcd,
-	0x12, 0x55, 0x0f, 0x05, 0x37, 0x47, 0x57, 0xd3, 0x00, 0x5f, 0xba, 0x09, 0xfe, 0xb0, 0xa5, 0x22,
-	0x6a, 0x23, 0xe7, 0xb7, 0x9a, 0x26, 0x91, 0x31, 0x79, 0x33, 0xb7, 0x23, 0xda, 0xb5, 0xd8, 0x3f,
-	0x78, 0x70, 0xd9, 0x6e, 0x56, 0x67, 0xad, 0xd6, 0x31, 0x7f, 0xbb, 0x3b, 0xfa, 0x68, 0x7f, 0xf4,
-	0xd1, 0xef, 0xa3, 0x8f, 0xbe, 0x9d, 0x7c, 0x67, 0x7f, 0xf2, 0x9d, 0x9f, 0x27, 0xdf, 0xf9, 0xf8,
-	0x38, 0x67, 0x7a, 0x55, 0x25, 0x38, 0xe5, 0x05, 0xb1, 0x79, 0xe3, 0x35, 0x4d, 0xd4, 0x79, 0x20,
-	0x9b, 0xc9, 0x33, 0xf2, 0xd9, 0xbc, 0x04, 0x5d, 0x0b, 0x50, 0x49, 0xa7, 0xdd, 0xd8, 0x93, 0xbf,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x74, 0xe0, 0x28, 0x50, 0x76, 0x02, 0x00, 0x00,
+	0x6a, 0xd3, 0x82, 0x18, 0x2a, 0xa6, 0x0a, 0xc4, 0xd7, 0x52, 0x05, 0x26, 0x96, 0xc8, 0x49, 0x6e,
+	0x53, 0x8b, 0x26, 0xb6, 0x6c, 0xa7, 0x25, 0x0f, 0x80, 0xc4, 0xc8, 0xc8, 0x13, 0xa1, 0x8e, 0x1d,
+	0x99, 0x0a, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0x89, 0x5d, 0x06, 0xd4, 0xff, 0x96, 0xab, 0xdf, 0x39,
+	0x47, 0x27, 0xf7, 0xda, 0x0d, 0xb9, 0x2a, 0xb8, 0x62, 0x8a, 0xe8, 0x2d, 0x15, 0x64, 0x33, 0x49,
+	0x40, 0xd3, 0x09, 0xc9, 0xa1, 0x04, 0xc5, 0x14, 0x16, 0x92, 0x6b, 0xee, 0x75, 0xad, 0x06, 0x37,
+	0x1a, 0x6c, 0x35, 0x83, 0x6e, 0xce, 0x73, 0xde, 0x0a, 0x48, 0xf3, 0x65, 0xb4, 0x83, 0x47, 0x17,
+	0xf3, 0x9a, 0x21, 0x96, 0x90, 0x72, 0x99, 0x59, 0x5d, 0x3f, 0xe7, 0x3c, 0x5f, 0x03, 0x69, 0xa7,
+	0xa4, 0x5a, 0x12, 0x5a, 0xd6, 0x67, 0x94, 0xb6, 0x19, 0xb1, 0xc9, 0x36, 0x83, 0x45, 0xfe, 0xff,
+	0xae, 0xac, 0x92, 0x54, 0x33, 0x5e, 0x1a, 0x1e, 0xfe, 0x40, 0x6e, 0x67, 0x41, 0x25, 0x2d, 0x94,
+	0xf7, 0xd4, 0xbd, 0x27, 0x64, 0x55, 0x42, 0x0c, 0x82, 0xa7, 0xab, 0x98, 0x65, 0x50, 0x6a, 0xb6,
+	0x64, 0x20, 0x7b, 0x28, 0x40, 0xa3, 0x3b, 0x51, 0xb7, 0xa5, 0x2f, 0x1b, 0xf8, 0xe6, 0x1f, 0xf3,
+	0xbe, 0x20, 0x77, 0x60, 0x7a, 0xc6, 0x2b, 0xa6, 0x34, 0x97, 0x75, 0xfc, 0x09, 0x40, 0xc4, 0x02,
+	0x24, 0xe3, 0x59, 0xef, 0x46, 0x80, 0x46, 0x57, 0xd3, 0x3e, 0x36, 0x35, 0xf0, 0xb9, 0x06, 0x7e,
+	0x61, 0x6b, 0xcc, 0xc7, 0xbb, 0xc3, 0xd0, 0xf9, 0x73, 0x18, 0x3e, 0xac, 0x69, 0xb1, 0x9e, 0x85,
+	0xd7, 0x47, 0x85, 0xdf, 0x7f, 0x0d, 0x51, 0x74, 0xdf, 0x08, 0x5e, 0x1b, 0xfe, 0x0e, 0x40, 0x2c,
+	0x0c, 0xfd, 0x8a, 0xdc, 0xbb, 0xaf, 0xcc, 0x11, 0xde, 0x6b, 0xaa, 0xc1, 0x7b, 0xee, 0xde, 0x6e,
+	0x96, 0xa8, 0x7a, 0x28, 0xb8, 0x39, 0xba, 0x9a, 0x06, 0xf8, 0xd2, 0x4d, 0xf0, 0x87, 0x2d, 0x15,
+	0x51, 0x1b, 0x39, 0xbf, 0xd5, 0x34, 0x89, 0x8c, 0xc9, 0x9b, 0xb9, 0x1d, 0xd1, 0xae, 0xc5, 0xfe,
+	0xc1, 0x83, 0xcb, 0x76, 0xb3, 0x3a, 0x6b, 0xb5, 0x8e, 0xf9, 0xdb, 0xdd, 0xd1, 0x47, 0xfb, 0xa3,
+	0x8f, 0x7e, 0x1f, 0x7d, 0xf4, 0xed, 0xe4, 0x3b, 0xfb, 0x93, 0xef, 0xfc, 0x3c, 0xf9, 0xce, 0xc7,
+	0xc7, 0x39, 0xd3, 0xab, 0x2a, 0xc1, 0x29, 0x2f, 0x88, 0xcd, 0x1b, 0xaf, 0x69, 0xa2, 0xce, 0x03,
+	0xd9, 0x4c, 0x9e, 0x91, 0xcf, 0xe6, 0x25, 0xe8, 0x5a, 0x80, 0x4a, 0x3a, 0xed, 0xc6, 0x9e, 0xfc,
+	0x0d, 0x00, 0x00, 0xff, 0xff, 0x34, 0x4d, 0x50, 0x69, 0x76, 0x02, 0x00, 0x00,
 }
 
 func (m *Params) Marshal() (dAtA []byte, err error) {
diff --git a/x/twap/types/twap_record.pb.go b/x/twap/types/twap_record.pb.go
index 5e8507a79fa..5915a536aaa 100644
--- a/x/twap/types/twap_record.pb.go
+++ b/x/twap/types/twap_record.pb.go
@@ -149,38 +149,38 @@ var fileDescriptor_dbf5c78678e601aa = []byte{
 	// 540 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xbf, 0x6f, 0xd3, 0x40,
 	0x14, 0xc7, 0x63, 0x1a, 0x52, 0x7a, 0xa1, 0xaa, 0x64, 0x45, 0x60, 0x82, 0x64, 0x87, 0x0c, 0x55,
-	0x18, 0xea, 0x1f, 0x20, 0x16, 0xb6, 0x44, 0x65, 0x00, 0x21, 0x84, 0x4c, 0x27, 0x18, 0x4e, 0x67,
-	0xfb, 0xea, 0x58, 0xd8, 0xb9, 0xd3, 0xdd, 0xa5, 0x25, 0xff, 0x45, 0xff, 0xac, 0x8e, 0x1d, 0x11,
-	0x83, 0x41, 0xc9, 0xc6, 0xd8, 0x89, 0x11, 0xdd, 0x8f, 0x84, 0x26, 0xfc, 0x92, 0x32, 0x25, 0xef,
-	0xbd, 0xef, 0xfb, 0x7c, 0xdf, 0xb3, 0x9f, 0x0c, 0x0e, 0x09, 0xaf, 0x08, 0x2f, 0x78, 0x20, 0xce,
-	0x11, 0x0d, 0xce, 0xa2, 0x04, 0x0b, 0x14, 0xa9, 0x00, 0x32, 0x9c, 0x12, 0x96, 0xf9, 0x94, 0x11,
-	0x41, 0xec, 0x8e, 0xd1, 0xf9, 0xb2, 0xe4, 0x1b, 0x5d, 0xb7, 0x93, 0x93, 0x9c, 0x28, 0x41, 0x20,
-	0xff, 0x69, 0x6d, 0xf7, 0x41, 0x4e, 0x48, 0x5e, 0xe2, 0x40, 0x45, 0xc9, 0xf4, 0x34, 0x40, 0x93,
-	0xd9, 0xb2, 0x94, 0x2a, 0x0e, 0xd4, 0x3d, 0x3a, 0x30, 0x25, 0x57, 0x47, 0x41, 0x82, 0x38, 0x5e,
-	0x0d, 0x92, 0x92, 0x62, 0x62, 0xea, 0xde, 0x26, 0x55, 0x14, 0x15, 0xe6, 0x02, 0x55, 0x54, 0x0b,
-	0xfa, 0x3f, 0x5a, 0x00, 0x9c, 0x9c, 0x23, 0x1a, 0xab, 0xb9, 0xed, 0xfb, 0x60, 0x97, 0x12, 0x52,
-	0xc2, 0x22, 0x73, 0xac, 0x9e, 0x35, 0x68, 0xc6, 0x2d, 0x19, 0xbe, 0xcc, 0xec, 0x47, 0xe0, 0x2e,
-	0xe2, 0x1c, 0x8b, 0x10, 0x66, 0x78, 0x42, 0x2a, 0xe7, 0x56, 0xcf, 0x1a, 0xec, 0xc5, 0x6d, 0x9d,
-	0x3b, 0x96, 0xa9, 0x95, 0x24, 0x32, 0x92, 0x9d, 0x1b, 0x92, 0x48, 0x4b, 0x86, 0xa0, 0x35, 0xc6,
-	0x45, 0x3e, 0x16, 0x4e, 0xb3, 0x67, 0x0d, 0x76, 0x46, 0x8f, 0xbf, 0xd7, 0xde, 0xbe, 0x7e, 0x64,
-	0x50, 0x17, 0xae, 0x6b, 0xaf, 0x33, 0x43, 0x55, 0xf9, 0xbc, 0xbf, 0x96, 0xee, 0xc7, 0xa6, 0xd1,
-	0x7e, 0x03, 0x9a, 0x72, 0x07, 0xe7, 0x76, 0xcf, 0x1a, 0xb4, 0x9f, 0x74, 0x7d, 0xbd, 0xa0, 0xbf,
-	0x5c, 0xd0, 0x3f, 0x59, 0x2e, 0x38, 0x72, 0x2f, 0x6b, 0xaf, 0x71, 0x5d, 0x7b, 0xf6, 0x1a, 0x4f,
-	0x36, 0xf7, 0x2f, 0xbe, 0x7a, 0x56, 0xac, 0x38, 0xf6, 0x07, 0x60, 0xd3, 0x10, 0x96, 0x88, 0x0b,
-	0xc8, 0x29, 0x11, 0x90, 0xb2, 0x22, 0xc5, 0x4e, 0x4b, 0xce, 0x3e, 0xf2, 0x25, 0xe1, 0x4b, 0xed,
-	0x1d, 0xe6, 0x85, 0x18, 0x4f, 0x13, 0x3f, 0x25, 0x95, 0x79, 0xfc, 0xe6, 0xe7, 0x88, 0x67, 0x1f,
-	0x03, 0x31, 0xa3, 0x98, 0xfb, 0xc7, 0x38, 0x8d, 0x0f, 0x68, 0xf8, 0x1a, 0x71, 0xf1, 0x8e, 0x12,
-	0xf1, 0x56, 0x62, 0x14, 0x3c, 0xfa, 0x0d, 0xbe, 0xbb, 0x25, 0x3c, 0x5a, 0x87, 0x73, 0xe0, 0xd2,
-	0x10, 0x22, 0x56, 0x88, 0x71, 0x85, 0x45, 0x91, 0x42, 0x75, 0x80, 0x28, 0x4d, 0xa7, 0xd5, 0xb4,
-	0x44, 0x82, 0x30, 0xe7, 0xce, 0x56, 0x46, 0x0f, 0x69, 0x38, 0x5c, 0x41, 0xe5, 0x6d, 0x0c, 0x7f,
-	0x21, 0x95, 0x69, 0xf4, 0x4f, 0xd3, 0xbd, 0x2d, 0x4d, 0xa3, 0xbf, 0x9b, 0x96, 0xa0, 0x9b, 0x63,
-	0x52, 0x61, 0xc1, 0xfe, 0x64, 0x08, 0xb6, 0x32, 0x74, 0x56, 0xc4, 0x4d, 0xb7, 0x53, 0x70, 0xa0,
-	0xde, 0x18, 0x66, 0x8c, 0x30, 0x75, 0x2f, 0x4e, 0xfb, 0xbf, 0xc7, 0xd6, 0x37, 0xc7, 0x76, 0x4f,
-	0x1f, 0xdb, 0x06, 0x40, 0x1f, 0xdc, 0xbe, 0xcc, 0xbe, 0x90, 0x49, 0xd9, 0x37, 0x7a, 0x75, 0x39,
-	0x77, 0xad, 0xab, 0xb9, 0x6b, 0x7d, 0x9b, 0xbb, 0xd6, 0xc5, 0xc2, 0x6d, 0x5c, 0x2d, 0xdc, 0xc6,
-	0xe7, 0x85, 0xdb, 0x78, 0x1f, 0xde, 0xd8, 0xc1, 0x7c, 0x42, 0x8e, 0x4a, 0x94, 0xf0, 0x65, 0x10,
-	0x9c, 0x45, 0xcf, 0x82, 0x4f, 0xfa, 0xeb, 0xa3, 0x36, 0x4a, 0x5a, 0x6a, 0xa4, 0xa7, 0x3f, 0x03,
-	0x00, 0x00, 0xff, 0xff, 0x24, 0x49, 0x15, 0xbd, 0x9a, 0x04, 0x00, 0x00,
+	0x18, 0xea, 0x1f, 0x20, 0x31, 0xb0, 0x25, 0x2a, 0x03, 0x08, 0x21, 0x64, 0x3a, 0xc1, 0x70, 0x3a,
+	0xdb, 0x57, 0xc7, 0xc2, 0xce, 0x9d, 0xee, 0x2e, 0x2d, 0xf9, 0x2f, 0xfa, 0x67, 0x75, 0xec, 0x88,
+	0x18, 0x0c, 0x4a, 0x36, 0xc6, 0x4e, 0x8c, 0xe8, 0x7e, 0x24, 0x34, 0xe1, 0x97, 0x94, 0x29, 0x79,
+	0xef, 0x7d, 0xdf, 0xe7, 0xfb, 0x9e, 0xfd, 0x64, 0x70, 0x48, 0x78, 0x45, 0x78, 0xc1, 0x03, 0x71,
+	0x8e, 0x68, 0x70, 0x16, 0x25, 0x58, 0xa0, 0x48, 0x05, 0x90, 0xe1, 0x94, 0xb0, 0xcc, 0xa7, 0x8c,
+	0x08, 0x62, 0x77, 0x8c, 0xce, 0x97, 0x25, 0xdf, 0xe8, 0xba, 0x9d, 0x9c, 0xe4, 0x44, 0x09, 0x02,
+	0xf9, 0x4f, 0x6b, 0xbb, 0x0f, 0x72, 0x42, 0xf2, 0x12, 0x07, 0x2a, 0x4a, 0xa6, 0xa7, 0x01, 0x9a,
+	0xcc, 0x96, 0xa5, 0x54, 0x71, 0xa0, 0xee, 0xd1, 0x81, 0x29, 0xb9, 0x3a, 0x0a, 0x12, 0xc4, 0xf1,
+	0x6a, 0x90, 0x94, 0x14, 0x13, 0x53, 0xf7, 0x36, 0xa9, 0xa2, 0xa8, 0x30, 0x17, 0xa8, 0xa2, 0x5a,
+	0xd0, 0xff, 0xd1, 0x02, 0xe0, 0xe4, 0x1c, 0xd1, 0x58, 0xcd, 0x6d, 0xdf, 0x07, 0xbb, 0x94, 0x90,
+	0x12, 0x16, 0x99, 0x63, 0xf5, 0xac, 0x41, 0x33, 0x6e, 0xc9, 0xf0, 0x65, 0x66, 0x3f, 0x02, 0x77,
+	0x11, 0xe7, 0x58, 0x84, 0x30, 0xc3, 0x13, 0x52, 0x39, 0xb7, 0x7a, 0xd6, 0x60, 0x2f, 0x6e, 0xeb,
+	0xdc, 0xb1, 0x4c, 0xad, 0x24, 0x91, 0x91, 0xec, 0xdc, 0x90, 0x44, 0x5a, 0x32, 0x04, 0xad, 0x31,
+	0x2e, 0xf2, 0xb1, 0x70, 0x9a, 0x3d, 0x6b, 0xb0, 0x33, 0x7a, 0xfc, 0xbd, 0xf6, 0xf6, 0xf5, 0x23,
+	0x83, 0xba, 0x70, 0x5d, 0x7b, 0x9d, 0x19, 0xaa, 0xca, 0xe7, 0xfd, 0xb5, 0x74, 0x3f, 0x36, 0x8d,
+	0xf6, 0x1b, 0xd0, 0x94, 0x3b, 0x38, 0xb7, 0x7b, 0xd6, 0xa0, 0xfd, 0xa4, 0xeb, 0xeb, 0x05, 0xfd,
+	0xe5, 0x82, 0xfe, 0xc9, 0x72, 0xc1, 0x91, 0x7b, 0x59, 0x7b, 0x8d, 0xeb, 0xda, 0xb3, 0xd7, 0x78,
+	0xb2, 0xb9, 0x7f, 0xf1, 0xd5, 0xb3, 0x62, 0xc5, 0xb1, 0x3f, 0x00, 0x9b, 0x86, 0xb0, 0x44, 0x5c,
+	0x40, 0x4e, 0x89, 0x80, 0x94, 0x15, 0x29, 0x76, 0x5a, 0x72, 0xf6, 0x91, 0x2f, 0x09, 0x5f, 0x6a,
+	0xef, 0x30, 0x2f, 0xc4, 0x78, 0x9a, 0xf8, 0x29, 0xa9, 0xcc, 0xe3, 0x37, 0x3f, 0x47, 0x3c, 0xfb,
+	0x18, 0x88, 0x19, 0xc5, 0xdc, 0x3f, 0xc6, 0x69, 0x7c, 0x40, 0xc3, 0xd7, 0x88, 0x8b, 0x77, 0x94,
+	0x88, 0xb7, 0x12, 0xa3, 0xe0, 0xd1, 0x6f, 0xf0, 0xdd, 0x2d, 0xe1, 0xd1, 0x3a, 0x9c, 0x03, 0x97,
+	0x86, 0x10, 0xb1, 0x42, 0x8c, 0x2b, 0x2c, 0x8a, 0x14, 0xaa, 0x03, 0x44, 0x69, 0x3a, 0xad, 0xa6,
+	0x25, 0x12, 0x84, 0x39, 0x77, 0xb6, 0x32, 0x7a, 0x48, 0xc3, 0xe1, 0x0a, 0x2a, 0x6f, 0x63, 0xf8,
+	0x0b, 0xa9, 0x4c, 0xa3, 0x7f, 0x9a, 0xee, 0x6d, 0x69, 0x1a, 0xfd, 0xdd, 0xb4, 0x04, 0xdd, 0x1c,
+	0x93, 0x0a, 0x0b, 0xf6, 0x27, 0x43, 0xb0, 0x95, 0xa1, 0xb3, 0x22, 0x6e, 0xba, 0x9d, 0x82, 0x03,
+	0xf5, 0xc6, 0x30, 0x63, 0x84, 0xa9, 0x7b, 0x71, 0xda, 0xff, 0x3d, 0xb6, 0xbe, 0x39, 0xb6, 0x7b,
+	0xfa, 0xd8, 0x36, 0x00, 0xfa, 0xe0, 0xf6, 0x65, 0xf6, 0x85, 0x4c, 0xca, 0xbe, 0xd1, 0xab, 0xcb,
+	0xb9, 0x6b, 0x5d, 0xcd, 0x5d, 0xeb, 0xdb, 0xdc, 0xb5, 0x2e, 0x16, 0x6e, 0xe3, 0x6a, 0xe1, 0x36,
+	0x3e, 0x2f, 0xdc, 0xc6, 0xfb, 0xf0, 0xc6, 0x0e, 0xe6, 0x13, 0x72, 0x54, 0xa2, 0x84, 0x2f, 0x83,
+	0xe0, 0x2c, 0x7a, 0x16, 0x7c, 0xd2, 0x5f, 0x1f, 0xb5, 0x51, 0xd2, 0x52, 0x23, 0x3d, 0xfd, 0x19,
+	0x00, 0x00, 0xff, 0xff, 0x64, 0xe4, 0x6d, 0x84, 0x9a, 0x04, 0x00, 0x00,
 }
 
 func (m *TwapRecord) Marshal() (dAtA []byte, err error) {
diff --git a/x/twap/types/twapmock/amminterface.go b/x/twap/types/twapmock/amminterface.go
index d516cc97231..83db653a36a 100644
--- a/x/twap/types/twapmock/amminterface.go
+++ b/x/twap/types/twapmock/amminterface.go
@@ -3,7 +3,7 @@ package twapmock
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/twap/types"
+	"github.com/osmosis-labs/osmosis/v16/x/twap/types"
 )
 
 var _ types.PoolManagerInterface = &ProgrammedPoolManagerInterface{}
diff --git a/x/twap/types/utils_test.go b/x/twap/types/utils_test.go
index 399fad156c4..991cbe89f58 100644
--- a/x/twap/types/utils_test.go
+++ b/x/twap/types/utils_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmoassert"
-	"github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 )
 
 func TestMaxSpotPriceEquality(t *testing.T) {
diff --git a/x/txfees/client/cli/query.go b/x/txfees/client/cli/query.go
index 6ccfff6e45c..27839d6348c 100644
--- a/x/txfees/client/cli/query.go
+++ b/x/txfees/client/cli/query.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/txfees/client/cli/query_test.go b/x/txfees/client/cli/query_test.go
index f9cfa0362d3..0c949153fb4 100644
--- a/x/txfees/client/cli/query_test.go
+++ b/x/txfees/client/cli/query_test.go
@@ -8,8 +8,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/txfees/client/cli/tx.go b/x/txfees/client/cli/tx.go
index 27d6917059d..e32c3537937 100644
--- a/x/txfees/client/cli/tx.go
+++ b/x/txfees/client/cli/tx.go
@@ -15,7 +15,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 const FlagFeeTokens = "fee-tokens"
diff --git a/x/txfees/handler.go b/x/txfees/handler.go
index 42101c96df6..197b47bc7ca 100644
--- a/x/txfees/handler.go
+++ b/x/txfees/handler.go
@@ -7,8 +7,8 @@ import (
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 func NewUpdateFeeTokenProposalHandler(k keeper.Keeper) govtypes.Handler {
diff --git a/x/txfees/keeper/feedecorator.go b/x/txfees/keeper/feedecorator.go
index 36e4787b870..e311b4c3b86 100644
--- a/x/txfees/keeper/feedecorator.go
+++ b/x/txfees/keeper/feedecorator.go
@@ -7,8 +7,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/keeper/txfee_filters"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/keeper/txfee_filters"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
diff --git a/x/txfees/keeper/feedecorator_test.go b/x/txfees/keeper/feedecorator_test.go
index 8d579ee2624..435522a2f22 100644
--- a/x/txfees/keeper/feedecorator_test.go
+++ b/x/txfees/keeper/feedecorator_test.go
@@ -11,8 +11,8 @@ import (
 
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 func (s *KeeperTestSuite) TestFeeDecorator() {
diff --git a/x/txfees/keeper/feetokens.go b/x/txfees/keeper/feetokens.go
index cd41902077f..7ebe8048ac0 100644
--- a/x/txfees/keeper/feetokens.go
+++ b/x/txfees/keeper/feetokens.go
@@ -5,7 +5,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/txfees/keeper/feetokens_test.go b/x/txfees/keeper/feetokens_test.go
index 119acf1ee9c..22c62f4c68a 100644
--- a/x/txfees/keeper/feetokens_test.go
+++ b/x/txfees/keeper/feetokens_test.go
@@ -1,7 +1,7 @@
 package keeper_test
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/txfees/keeper/genesis.go b/x/txfees/keeper/genesis.go
index 74d403aac5a..8285cbfa870 100644
--- a/x/txfees/keeper/genesis.go
+++ b/x/txfees/keeper/genesis.go
@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/txfees/keeper/gov.go b/x/txfees/keeper/gov.go
index 2d37ef13d33..cda9fe0d414 100644
--- a/x/txfees/keeper/gov.go
+++ b/x/txfees/keeper/gov.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 func (k Keeper) HandleUpdateFeeTokenProposal(ctx sdk.Context, p *types.UpdateFeeTokenProposal) error {
diff --git a/x/txfees/keeper/grpc_query.go b/x/txfees/keeper/grpc_query.go
index f4ec3249527..68bf345bd6c 100644
--- a/x/txfees/keeper/grpc_query.go
+++ b/x/txfees/keeper/grpc_query.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 var _ types.QueryServer = Querier{}
diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go
index a78e7221cda..9b6c931da7f 100644
--- a/x/txfees/keeper/hooks.go
+++ b/x/txfees/keeper/hooks.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	txfeestypes "github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	txfeestypes "github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
 )
 
diff --git a/x/txfees/keeper/hooks_test.go b/x/txfees/keeper/hooks_test.go
index bbc783731f8..1150900cd61 100644
--- a/x/txfees/keeper/hooks_test.go
+++ b/x/txfees/keeper/hooks_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 var defaultPooledAssetAmount = int64(500)
diff --git a/x/txfees/keeper/keeper.go b/x/txfees/keeper/keeper.go
index 8fe19b44cdd..1cca6e04b05 100644
--- a/x/txfees/keeper/keeper.go
+++ b/x/txfees/keeper/keeper.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 type Keeper struct {
diff --git a/x/txfees/keeper/keeper_test.go b/x/txfees/keeper/keeper_test.go
index 136e53f165c..b61a72bd198 100644
--- a/x/txfees/keeper/keeper_test.go
+++ b/x/txfees/keeper/keeper_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	osmosisapp "github.com/osmosis-labs/osmosis/v15/app"
+	osmosisapp "github.com/osmosis-labs/osmosis/v16/app"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/txfees/keeper/txfee_filters/arb_tx.go b/x/txfees/keeper/txfee_filters/arb_tx.go
index 86147e936d8..2fdaea1d2f4 100644
--- a/x/txfees/keeper/txfee_filters/arb_tx.go
+++ b/x/txfees/keeper/txfee_filters/arb_tx.go
@@ -1,7 +1,7 @@
 package txfee_filters
 
 import (
-	gammtypes "github.com/osmosis-labs/osmosis/v15/x/gamm/types"
+	gammtypes "github.com/osmosis-labs/osmosis/v16/x/gamm/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
diff --git a/x/txfees/module.go b/x/txfees/module.go
index e9d68706311..3c28008161c 100644
--- a/x/txfees/module.go
+++ b/x/txfees/module.go
@@ -25,9 +25,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/keeper"
-	"github.com/osmosis-labs/osmosis/v15/x/txfees/types"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/keeper"
+	"github.com/osmosis-labs/osmosis/v16/x/txfees/types"
 )
 
 var (
diff --git a/x/txfees/module_test.go b/x/txfees/module_test.go
index 939e528e106..62279cddc1e 100644
--- a/x/txfees/module_test.go
+++ b/x/txfees/module_test.go
@@ -7,7 +7,7 @@ import (
 	abcitypes "github.com/tendermint/tendermint/abci/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	simapp "github.com/osmosis-labs/osmosis/v15/app"
+	simapp "github.com/osmosis-labs/osmosis/v16/app"
 )
 
 func TestSetBaseDenomOnInitBlock(t *testing.T) {
diff --git a/x/txfees/types/expected_keepers.go b/x/txfees/types/expected_keepers.go
index f2696d55f75..943c954e9d3 100644
--- a/x/txfees/types/expected_keepers.go
+++ b/x/txfees/types/expected_keepers.go
@@ -4,7 +4,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
+	poolmanagertypes "github.com/osmosis-labs/osmosis/v16/x/poolmanager/types"
 )
 
 // SpotPriceCalculator defines the contract that must be fulfilled by a spot price calculator
diff --git a/x/txfees/types/feetoken.pb.go b/x/txfees/types/feetoken.pb.go
index bb7f8497ef8..6c092e8f6d1 100644
--- a/x/txfees/types/feetoken.pb.go
+++ b/x/txfees/types/feetoken.pb.go
@@ -101,9 +101,9 @@ var fileDescriptor_c50689857adfcfe0 = []byte{
 	0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x73, 0xe2, 0x91, 0x1c,
 	0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1,
 	0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x46, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9,
-	0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x86, 0xa6,
+	0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x86, 0x66,
 	0xfa, 0x15, 0x30, 0x2f, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x9d, 0x6e, 0x0c, 0x08,
-	0x00, 0x00, 0xff, 0xff, 0xec, 0x68, 0xb6, 0x00, 0x11, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xc4, 0xc1, 0xa8, 0x58, 0x11, 0x01, 0x00, 0x00,
 }
 
 func (this *FeeToken) Equal(that interface{}) bool {
diff --git a/x/txfees/types/genesis.pb.go b/x/txfees/types/genesis.pb.go
index 70385e422a9..663041dcfdc 100644
--- a/x/txfees/types/genesis.pb.go
+++ b/x/txfees/types/genesis.pb.go
@@ -98,9 +98,9 @@ var fileDescriptor_4423c18e3d020b37 = []byte{
 	0x85, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x34, 0x3a, 0xf9, 0x9c, 0x78, 0x24, 0xc7,
 	0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c,
 	0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72,
-	0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x54,
+	0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xd0, 0x4c,
 	0xbf, 0x02, 0xe6, 0xa5, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x47, 0x8c, 0x01, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0xed, 0xa8, 0x00, 0x25, 0x45, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xc5, 0x01, 0x1e, 0x7d, 0x45, 0x01, 0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/txfees/types/gov.pb.go b/x/txfees/types/gov.pb.go
index 4ba518cbf55..ab488605b6e 100644
--- a/x/txfees/types/gov.pb.go
+++ b/x/txfees/types/gov.pb.go
@@ -96,9 +96,9 @@ var fileDescriptor_2c4a51bafc82863d = []byte{
 	0xf9, 0x06, 0x2d, 0x39, 0x58, 0x68, 0x61, 0x0f, 0x0b, 0x27, 0x9f, 0x13, 0x8f, 0xe4, 0x18, 0x2f,
 	0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18,
 	0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf,
-	0xd5, 0x87, 0x1a, 0xa2, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xea, 0x57,
+	0xd5, 0x87, 0x1a, 0xa2, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x9a, 0xe9, 0x57,
 	0xc0, 0x62, 0xa1, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xf6, 0xc6, 0x80, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xf3, 0xd9, 0x7e, 0x03, 0x22, 0x02, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xdb, 0x70, 0x60, 0x5b, 0x22, 0x02, 0x00, 0x00,
 }
 
 func (this *UpdateFeeTokenProposal) Equal(that interface{}) bool {
diff --git a/x/txfees/types/query.pb.go b/x/txfees/types/query.pb.go
index 44a8da5efaf..af7e4772e39 100644
--- a/x/txfees/types/query.pb.go
+++ b/x/txfees/types/query.pb.go
@@ -388,46 +388,46 @@ func init() {
 }
 
 var fileDescriptor_6cbc1b48c44dfdd6 = []byte{
-	// 611 bytes of a gzipped FileDescriptorProto
+	// 612 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6f, 0x12, 0x4f,
 	0x18, 0xc6, 0x99, 0xfe, 0xff, 0x34, 0x61, 0x6a, 0x1a, 0x9d, 0xd8, 0x16, 0x57, 0xb3, 0x90, 0x89,
-	0x36, 0x4d, 0x0d, 0x3b, 0x02, 0xf6, 0xe2, 0x4d, 0x24, 0x4d, 0x4c, 0x8c, 0xa9, 0xab, 0xa7, 0x5e,
-	0x36, 0xbb, 0xf0, 0x82, 0x9b, 0x02, 0xb3, 0x65, 0x86, 0xa6, 0xc4, 0x78, 0xf1, 0x13, 0x98, 0x68,
-	0xfc, 0x0a, 0x9e, 0xf4, 0x73, 0xf4, 0xd8, 0xc4, 0x8b, 0xf1, 0x40, 0x0c, 0xf8, 0x09, 0xf8, 0x04,
-	0x66, 0x67, 0x67, 0x59, 0xda, 0x82, 0x94, 0x13, 0xec, 0xbc, 0xcf, 0x3c, 0xef, 0xf3, 0xee, 0xfc,
-	0x66, 0x31, 0xe5, 0xa2, 0xcd, 0x85, 0x2f, 0x98, 0x3c, 0x6d, 0x00, 0x08, 0x76, 0x52, 0xf4, 0x40,
-	0xba, 0x45, 0x76, 0xdc, 0x83, 0x6e, 0xdf, 0x0a, 0xba, 0x5c, 0x72, 0xb2, 0xa9, 0x35, 0x56, 0xa4,
-	0xb1, 0xb4, 0xc6, 0xb8, 0xdd, 0xe4, 0x4d, 0xae, 0x24, 0x2c, 0xfc, 0x17, 0xa9, 0x8d, 0x7b, 0x4d,
-	0xce, 0x9b, 0x2d, 0x60, 0x6e, 0xe0, 0x33, 0xb7, 0xd3, 0xe1, 0xd2, 0x95, 0x3e, 0xef, 0x08, 0x5d,
-	0x35, 0x75, 0x55, 0x3d, 0x79, 0xbd, 0x06, 0xab, 0xf7, 0xba, 0x4a, 0xa0, 0xeb, 0x0f, 0xe6, 0xe4,
-	0x69, 0x00, 0x48, 0x7e, 0x04, 0x5a, 0x46, 0xb7, 0xf0, 0xc6, 0xab, 0x30, 0xe1, 0x3e, 0xc0, 0x9b,
-	0x70, 0x59, 0xd8, 0x70, 0xdc, 0x03, 0x21, 0xa9, 0xc4, 0x9b, 0x97, 0x0b, 0x22, 0xe0, 0x1d, 0x01,
-	0xe4, 0x10, 0xe3, 0x06, 0x80, 0xa3, 0x5c, 0x44, 0x16, 0xe5, 0xff, 0xdb, 0x59, 0x2b, 0xe5, 0xad,
-	0xd9, 0xa3, 0x59, 0xf1, 0xf6, 0xca, 0x9d, 0xb3, 0x41, 0x2e, 0x35, 0x1e, 0xe4, 0x6e, 0xf5, 0xdd,
-	0x76, 0xeb, 0x09, 0x4d, 0x1c, 0xa8, 0x9d, 0x69, 0xc4, 0x3d, 0x68, 0x15, 0x1b, 0xaa, 0x6b, 0x15,
-	0x3a, 0xbc, 0xfd, 0x3a, 0xe0, 0xf2, 0xa0, 0xeb, 0xd7, 0x40, 0x67, 0x22, 0xdb, 0x38, 0x5d, 0x0f,
-	0x0b, 0x59, 0x94, 0x47, 0x3b, 0x99, 0xca, 0xcd, 0xf1, 0x20, 0x77, 0x23, 0xb2, 0x53, 0xcb, 0xd4,
-	0x8e, 0xca, 0xf4, 0x1b, 0xc2, 0x77, 0x67, 0xda, 0xe8, 0x09, 0x76, 0xf1, 0x6a, 0xc0, 0x79, 0xeb,
-	0x79, 0x55, 0x19, 0xfd, 0x5f, 0x21, 0xe3, 0x41, 0x6e, 0x3d, 0x32, 0x0a, 0xd7, 0x1d, 0xbf, 0x4e,
-	0x6d, 0xad, 0x20, 0x1e, 0xc6, 0x22, 0xe0, 0xd2, 0x09, 0x42, 0x87, 0xec, 0x8a, 0x6a, 0xfc, 0x2c,
-	0x9c, 0xe5, 0xd7, 0x20, 0xb7, 0xdd, 0xf4, 0xe5, 0xdb, 0x9e, 0x67, 0xd5, 0x78, 0x9b, 0xd5, 0xd4,
-	0x0b, 0xd0, 0x3f, 0x05, 0x51, 0x3f, 0x62, 0xb2, 0x1f, 0x80, 0xb0, 0xaa, 0x50, 0x4b, 0xa6, 0x4e,
-	0x9c, 0xa8, 0x9d, 0x11, 0x71, 0x2e, 0xfa, 0x14, 0x6f, 0x25, 0x71, 0x0f, 0xc2, 0xbe, 0xf5, 0x65,
-	0x47, 0xde, 0xc7, 0xd9, 0xab, 0x16, 0xcb, 0x8f, 0x3b, 0xe1, 0xa1, 0xe2, 0x0a, 0x50, 0x5e, 0x31,
-	0x0f, 0x2f, 0x35, 0x0f, 0x53, 0x05, 0x6d, 0xff, 0x18, 0x63, 0xcf, 0x15, 0xe0, 0x4c, 0xe7, 0xdc,
-	0x48, 0x66, 0x4e, 0x6a, 0xd4, 0xce, 0x78, 0xf1, 0xee, 0xd2, 0xe7, 0x34, 0x4e, 0x2b, 0x43, 0xf2,
-	0x05, 0xe1, 0xcc, 0x84, 0x32, 0x52, 0x98, 0x47, 0xd2, 0x4c, 0x4c, 0x0d, 0xeb, 0xba, 0xf2, 0x28,
-	0x2c, 0xdd, 0xfd, 0xf0, 0xe3, 0xcf, 0xa7, 0x95, 0xfb, 0x84, 0xb2, 0xf9, 0xf7, 0x43, 0x83, 0x49,
-	0xbe, 0x23, 0xbc, 0x7e, 0x91, 0x20, 0x52, 0xfa, 0x67, 0xbb, 0x99, 0xd4, 0x1a, 0xe5, 0xa5, 0xf6,
-	0xe8, 0x9c, 0x65, 0x95, 0xb3, 0x40, 0x1e, 0xce, 0xcb, 0x99, 0xa0, 0xe4, 0x78, 0xfd, 0xe8, 0xfd,
-	0x92, 0xaf, 0x08, 0xaf, 0x4d, 0x01, 0x40, 0xd8, 0xe2, 0xce, 0x17, 0x68, 0x33, 0x1e, 0x5d, 0x7f,
-	0x83, 0xce, 0xb9, 0xa7, 0x72, 0x32, 0x52, 0x98, 0x97, 0x53, 0x25, 0x73, 0x34, 0x67, 0xec, 0x9d,
-	0x7a, 0x7c, 0xaf, 0xce, 0x7c, 0x42, 0xd2, 0x82, 0x33, 0xbf, 0x8c, 0xe2, 0x82, 0x33, 0xbf, 0x02,
-	0xe8, 0xe2, 0x33, 0x4f, 0x10, 0xad, 0xbc, 0x38, 0x1b, 0x9a, 0xe8, 0x7c, 0x68, 0xa2, 0xdf, 0x43,
-	0x13, 0x7d, 0x1c, 0x99, 0xa9, 0xf3, 0x91, 0x99, 0xfa, 0x39, 0x32, 0x53, 0x87, 0xa5, 0xa9, 0xcb,
-	0xae, 0x7d, 0x0a, 0x2d, 0xd7, 0x13, 0x13, 0xd3, 0x93, 0xe2, 0x1e, 0x3b, 0x8d, 0xad, 0xd5, 0xe5,
-	0xf7, 0x56, 0xd5, 0x47, 0xb6, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x2a, 0x56, 0x13, 0x1d,
-	0x06, 0x00, 0x00,
+	0x36, 0x4d, 0x0d, 0x3b, 0x02, 0xea, 0xc1, 0x9b, 0x48, 0x9a, 0x98, 0x18, 0x53, 0x57, 0x4f, 0xbd,
+	0x6c, 0x76, 0xe1, 0x05, 0x37, 0x05, 0x66, 0xcb, 0x0c, 0x4d, 0x89, 0xf1, 0xe2, 0x27, 0x30, 0xd1,
+	0xf8, 0x15, 0x3c, 0xe9, 0xe7, 0xe8, 0xb1, 0x89, 0x17, 0xe3, 0x81, 0x18, 0xf0, 0x13, 0xf0, 0x09,
+	0xcc, 0xce, 0xce, 0xb2, 0xb4, 0x05, 0x29, 0x27, 0xd8, 0x79, 0x9f, 0x79, 0xde, 0xe7, 0xdd, 0xf9,
+	0xcd, 0x62, 0xca, 0x45, 0x9b, 0x0b, 0x5f, 0x30, 0x79, 0xd2, 0x00, 0x10, 0xec, 0xb8, 0xe8, 0x81,
+	0x74, 0x8b, 0xec, 0xa8, 0x07, 0xdd, 0xbe, 0x15, 0x74, 0xb9, 0xe4, 0x64, 0x53, 0x6b, 0xac, 0x48,
+	0x63, 0x69, 0x8d, 0x71, 0xb3, 0xc9, 0x9b, 0x5c, 0x49, 0x58, 0xf8, 0x2f, 0x52, 0x1b, 0x77, 0x9a,
+	0x9c, 0x37, 0x5b, 0xc0, 0xdc, 0xc0, 0x67, 0x6e, 0xa7, 0xc3, 0xa5, 0x2b, 0x7d, 0xde, 0x11, 0xba,
+	0x6a, 0xea, 0xaa, 0x7a, 0xf2, 0x7a, 0x0d, 0x56, 0xef, 0x75, 0x95, 0x40, 0xd7, 0xef, 0xcd, 0xc9,
+	0xd3, 0x00, 0x90, 0xfc, 0x10, 0xb4, 0x8c, 0x6e, 0xe1, 0x8d, 0x57, 0x61, 0xc2, 0x3d, 0x80, 0x37,
+	0xe1, 0xb2, 0xb0, 0xe1, 0xa8, 0x07, 0x42, 0x52, 0x89, 0x37, 0x2f, 0x16, 0x44, 0xc0, 0x3b, 0x02,
+	0xc8, 0x01, 0xc6, 0x0d, 0x00, 0x47, 0xb9, 0x88, 0x2c, 0xca, 0xff, 0xb7, 0xb3, 0x56, 0xca, 0x5b,
+	0xb3, 0x47, 0xb3, 0xe2, 0xed, 0x95, 0x5b, 0xa7, 0x83, 0x5c, 0x6a, 0x3c, 0xc8, 0xdd, 0xe8, 0xbb,
+	0xed, 0xd6, 0x13, 0x9a, 0x38, 0x50, 0x3b, 0xd3, 0x88, 0x7b, 0xd0, 0x2a, 0x36, 0x54, 0xd7, 0x2a,
+	0x74, 0x78, 0xfb, 0x75, 0xc0, 0xe5, 0x7e, 0xd7, 0xaf, 0x81, 0xce, 0x44, 0xb6, 0x71, 0xba, 0x1e,
+	0x16, 0xb2, 0x28, 0x8f, 0x76, 0x32, 0x95, 0xeb, 0xe3, 0x41, 0xee, 0x5a, 0x64, 0xa7, 0x96, 0xa9,
+	0x1d, 0x95, 0xe9, 0x37, 0x84, 0x6f, 0xcf, 0xb4, 0xd1, 0x13, 0xec, 0xe2, 0xd5, 0x80, 0xf3, 0xd6,
+	0xf3, 0xaa, 0x32, 0xfa, 0xbf, 0x42, 0xc6, 0x83, 0xdc, 0x7a, 0x64, 0x14, 0xae, 0x3b, 0x7e, 0x9d,
+	0xda, 0x5a, 0x41, 0x3c, 0x8c, 0x45, 0xc0, 0xa5, 0x13, 0x84, 0x0e, 0xd9, 0x15, 0xd5, 0xf8, 0x59,
+	0x38, 0xcb, 0xaf, 0x41, 0x6e, 0xbb, 0xe9, 0xcb, 0xb7, 0x3d, 0xcf, 0xaa, 0xf1, 0x36, 0xab, 0xa9,
+	0x17, 0xa0, 0x7f, 0x0a, 0xa2, 0x7e, 0xc8, 0x64, 0x3f, 0x00, 0x61, 0x55, 0xa1, 0x96, 0x4c, 0x9d,
+	0x38, 0x51, 0x3b, 0x23, 0xe2, 0x5c, 0xf4, 0x29, 0xde, 0x4a, 0xe2, 0xee, 0x87, 0x7d, 0xeb, 0xcb,
+	0x8e, 0xbc, 0x87, 0xb3, 0x97, 0x2d, 0x96, 0x1f, 0x77, 0xc2, 0x43, 0xc5, 0x15, 0xa0, 0xbc, 0x62,
+	0x1e, 0x5e, 0x6a, 0x1e, 0xa6, 0x0a, 0xda, 0xfe, 0x21, 0xc6, 0x9e, 0x2b, 0xc0, 0x99, 0xce, 0xb9,
+	0x91, 0xcc, 0x9c, 0xd4, 0xa8, 0x9d, 0xf1, 0xe2, 0xdd, 0xa5, 0xcf, 0x69, 0x9c, 0x56, 0x86, 0xe4,
+	0x0b, 0xc2, 0x99, 0x09, 0x65, 0xa4, 0x30, 0x8f, 0xa4, 0x99, 0x98, 0x1a, 0xd6, 0x55, 0xe5, 0x51,
+	0x58, 0xba, 0xfb, 0xe1, 0xc7, 0x9f, 0x4f, 0x2b, 0x77, 0x09, 0x65, 0xf3, 0xef, 0x87, 0x06, 0x93,
+	0x7c, 0x47, 0x78, 0xfd, 0x3c, 0x41, 0xa4, 0xf4, 0xcf, 0x76, 0x33, 0xa9, 0x35, 0xca, 0x4b, 0xed,
+	0xd1, 0x39, 0xcb, 0x2a, 0x67, 0x81, 0xdc, 0x9f, 0x97, 0x33, 0x41, 0xc9, 0xf1, 0xfa, 0xd1, 0xfb,
+	0x25, 0x5f, 0x11, 0x5e, 0x9b, 0x02, 0x80, 0xb0, 0xc5, 0x9d, 0xcf, 0xd1, 0x66, 0x3c, 0xb8, 0xfa,
+	0x06, 0x9d, 0xf3, 0x91, 0xca, 0xc9, 0x48, 0x61, 0x5e, 0x4e, 0x95, 0xcc, 0xd1, 0x9c, 0xb1, 0x77,
+	0xea, 0xf1, 0xbd, 0x3a, 0xf3, 0x09, 0x49, 0x0b, 0xce, 0xfc, 0x22, 0x8a, 0x0b, 0xce, 0xfc, 0x12,
+	0xa0, 0x8b, 0xcf, 0x3c, 0x41, 0xb4, 0xf2, 0xe2, 0x74, 0x68, 0xa2, 0xb3, 0xa1, 0x89, 0x7e, 0x0f,
+	0x4d, 0xf4, 0x71, 0x64, 0xa6, 0xce, 0x46, 0x66, 0xea, 0xe7, 0xc8, 0x4c, 0x1d, 0x94, 0xa6, 0x2e,
+	0xbb, 0xf6, 0x29, 0xb4, 0x5c, 0x4f, 0x4c, 0x4c, 0x8f, 0x8b, 0x8f, 0xd9, 0x49, 0x6c, 0xad, 0x2e,
+	0xbf, 0xb7, 0xaa, 0x3e, 0xb2, 0xe5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x83, 0x48, 0x4b,
+	0x1d, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/valset-pref/client/cli/query.go b/x/valset-pref/client/cli/query.go
index 49dc40eeefe..b379974180c 100644
--- a/x/valset-pref/client/cli/query.go
+++ b/x/valset-pref/client/cli/query.go
@@ -4,8 +4,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 // GetQueryCmd returns the cli query commands for this module.
diff --git a/x/valset-pref/client/cli/query_test.go b/x/valset-pref/client/cli/query_test.go
index e822a1b7731..118151fc203 100644
--- a/x/valset-pref/client/cli/query_test.go
+++ b/x/valset-pref/client/cli/query_test.go
@@ -7,10 +7,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	valPref "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	valPref "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 type QueryTestSuite struct {
diff --git a/x/valset-pref/client/cli/tx.go b/x/valset-pref/client/cli/tx.go
index 573256fbfe1..36efe9a3a6f 100644
--- a/x/valset-pref/client/cli/tx.go
+++ b/x/valset-pref/client/cli/tx.go
@@ -11,7 +11,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/osmosis-labs/osmosis/osmoutils"
 	"github.com/osmosis-labs/osmosis/osmoutils/osmocli"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 func GetTxCmd() *cobra.Command {
diff --git a/x/valset-pref/client/grpc/grpc_query.go b/x/valset-pref/client/grpc/grpc_query.go
index 25733f32d02..629db9d6d79 100644
--- a/x/valset-pref/client/grpc/grpc_query.go
+++ b/x/valset-pref/client/grpc/grpc_query.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/status"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/valset-pref/client/query_proto_wrap.go b/x/valset-pref/client/query_proto_wrap.go
index 94df6db38dd..6a9fe94edba 100644
--- a/x/valset-pref/client/query_proto_wrap.go
+++ b/x/valset-pref/client/query_proto_wrap.go
@@ -5,8 +5,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	validatorprefkeeper "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto"
+	validatorprefkeeper "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"
 )
 
 type Querier struct {
diff --git a/x/valset-pref/client/queryproto/query.pb.go b/x/valset-pref/client/queryproto/query.pb.go
index e7f94d55c73..7721f81d20b 100644
--- a/x/valset-pref/client/queryproto/query.pb.go
+++ b/x/valset-pref/client/queryproto/query.pb.go
@@ -9,7 +9,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	types "github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	types "github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -120,26 +120,26 @@ var fileDescriptor_9ffbeb4123fe56ae = []byte{
 	// 343 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x4a, 0xc3, 0x40,
 	0x10, 0xc6, 0xb3, 0xfe, 0xc5, 0xf4, 0x16, 0x3c, 0x84, 0x20, 0xdb, 0xd2, 0x83, 0xf6, 0xd2, 0x5d,
-	0x5a, 0xf1, 0x54, 0x4f, 0xf5, 0x05, 0xb4, 0xa0, 0x82, 0xb7, 0x4d, 0x3b, 0x8d, 0x81, 0x34, 0x93,
-	0xee, 0x6c, 0x8b, 0x52, 0xbc, 0xf8, 0x04, 0x82, 0xcf, 0x24, 0xf4, 0x66, 0xc1, 0x8b, 0x27, 0xd1,
-	0xd6, 0x07, 0x91, 0x36, 0x29, 0x55, 0xb0, 0x15, 0x3c, 0x25, 0xbb, 0xfb, 0x9b, 0xef, 0xdb, 0x6f,
-	0x66, 0xed, 0x03, 0xa4, 0x0e, 0x52, 0x48, 0xb2, 0xaf, 0x22, 0x02, 0x53, 0x4e, 0x34, 0xb4, 0x65,
-	0xbf, 0xe2, 0x83, 0x51, 0x15, 0xd9, 0xed, 0x81, 0xbe, 0x15, 0x89, 0x46, 0x83, 0x8e, 0x97, 0x81,
-	0x22, 0x05, 0xa7, 0x9c, 0xc8, 0x38, 0x6f, 0x37, 0xc0, 0x00, 0x67, 0x98, 0x9c, 0xfe, 0xa5, 0x15,
-	0xde, 0x5e, 0x80, 0x18, 0x44, 0x20, 0x55, 0x12, 0x4a, 0x15, 0xc7, 0x68, 0x94, 0x09, 0x31, 0xa6,
-	0xec, 0x74, 0xa5, 0x31, 0x19, 0x65, 0x20, 0x05, 0x8b, 0x35, 0x3b, 0x7f, 0x4e, 0xa0, 0x2f, 0x54,
-	0x14, 0xb6, 0x94, 0x41, 0x7d, 0xaa, 0xa1, 0x0d, 0x1a, 0xe2, 0x26, 0x50, 0x03, 0xba, 0x3d, 0x20,
-	0xe3, 0xb8, 0xf6, 0xb6, 0x6a, 0xb5, 0x34, 0x10, 0xb9, 0xac, 0xc0, 0x4a, 0x3b, 0x8d, 0xf9, 0xb2,
-	0x38, 0xb0, 0x0b, 0xcb, 0x8b, 0x29, 0xc1, 0x98, 0xc0, 0xb9, 0xb4, 0x73, 0xc9, 0x62, 0xdb, 0x65,
-	0x85, 0xf5, 0x52, 0xae, 0x2a, 0xc5, 0xf2, 0xbc, 0xe2, 0x17, 0xb9, 0xfa, 0xc6, 0xf0, 0x2d, 0x6f,
-	0x35, 0xbe, 0x2b, 0x55, 0x9f, 0x99, 0xbd, 0x79, 0x36, 0x6d, 0xa1, 0xf3, 0xc4, 0x6c, 0x77, 0xd9,
-	0x3d, 0x9c, 0xda, 0x2a, 0xab, 0x3f, 0xa2, 0x7b, 0xc7, 0xff, 0x2b, 0x4e, 0xa3, 0x17, 0xc5, 0xfd,
-	0xcb, 0xe7, 0xe3, 0x5a, 0xc9, 0xd9, 0x97, 0xab, 0xa6, 0x31, 0xc8, 0xba, 0x79, 0x57, 0x57, 0xc3,
-	0x0f, 0x6e, 0x0d, 0xc7, 0x9c, 0x8d, 0xc6, 0x9c, 0xbd, 0x8f, 0x39, 0x7b, 0x98, 0x70, 0x6b, 0x34,
-	0xe1, 0xd6, 0xeb, 0x84, 0x5b, 0x57, 0x27, 0x41, 0x68, 0xae, 0x7b, 0xbe, 0x68, 0x62, 0x67, 0xae,
-	0x57, 0x8e, 0x94, 0x4f, 0x0b, 0xf1, 0xca, 0x91, 0xbc, 0xf9, 0x61, 0xd1, 0x8c, 0x42, 0x88, 0x4d,
-	0xfa, 0xd0, 0x66, 0xe3, 0xf6, 0xb7, 0x66, 0x9f, 0xc3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20,
-	0x78, 0x7d, 0x80, 0x99, 0x02, 0x00, 0x00,
+	0x5a, 0xc1, 0x4b, 0x3d, 0xd5, 0x17, 0xd0, 0x82, 0x0a, 0xde, 0x36, 0xed, 0x34, 0x06, 0xd2, 0x4c,
+	0xba, 0xb3, 0x2d, 0x4a, 0xf1, 0xe2, 0x13, 0x08, 0x3e, 0x93, 0xd0, 0x9b, 0x05, 0x2f, 0x9e, 0x44,
+	0x5b, 0x1f, 0x44, 0xda, 0xa4, 0x54, 0xc1, 0x56, 0xf0, 0x94, 0xec, 0xee, 0x6f, 0xbe, 0x6f, 0xbf,
+	0x99, 0xb5, 0x0f, 0x90, 0x3a, 0x48, 0x21, 0xc9, 0xbe, 0x8a, 0x08, 0x4c, 0x39, 0xd1, 0xd0, 0x96,
+	0xfd, 0x8a, 0x0f, 0x46, 0x55, 0x64, 0xb7, 0x07, 0xfa, 0x56, 0x24, 0x1a, 0x0d, 0x3a, 0x5e, 0x06,
+	0x8a, 0x14, 0x9c, 0x72, 0x22, 0xe3, 0xbc, 0xdd, 0x00, 0x03, 0x9c, 0x61, 0x72, 0xfa, 0x97, 0x56,
+	0x78, 0x7b, 0x01, 0x62, 0x10, 0x81, 0x54, 0x49, 0x28, 0x55, 0x1c, 0xa3, 0x51, 0x26, 0xc4, 0x98,
+	0xb2, 0xd3, 0x95, 0xc6, 0x64, 0x94, 0x81, 0x14, 0x2c, 0xd6, 0xec, 0xfc, 0x39, 0x81, 0xbe, 0x50,
+	0x51, 0xd8, 0x52, 0x06, 0xf5, 0xa9, 0x86, 0x36, 0x68, 0x88, 0x9b, 0x40, 0x0d, 0xe8, 0xf6, 0x80,
+	0x8c, 0xe3, 0xda, 0xdb, 0xaa, 0xd5, 0xd2, 0x40, 0xe4, 0xb2, 0x02, 0x2b, 0xed, 0x34, 0xe6, 0xcb,
+	0xe2, 0xc0, 0x2e, 0x2c, 0x2f, 0xa6, 0x04, 0x63, 0x02, 0xe7, 0xd2, 0xce, 0x25, 0x8b, 0x6d, 0x97,
+	0x15, 0xd6, 0x4b, 0xb9, 0xaa, 0x14, 0xcb, 0xf3, 0x8a, 0x5f, 0xe4, 0xea, 0x1b, 0xc3, 0xb7, 0xbc,
+	0xd5, 0xf8, 0xae, 0x54, 0x7d, 0x66, 0xf6, 0xe6, 0xd9, 0xb4, 0x85, 0xce, 0x13, 0xb3, 0xdd, 0x65,
+	0xf7, 0x70, 0x6a, 0xab, 0xac, 0xfe, 0x88, 0xee, 0x1d, 0xff, 0xaf, 0x38, 0x8d, 0x5e, 0x14, 0xf7,
+	0x2f, 0x9f, 0x8f, 0x6b, 0x25, 0x67, 0x5f, 0xae, 0x9a, 0xc6, 0x20, 0xeb, 0xe6, 0x5d, 0x5d, 0x0d,
+	0x3f, 0xb8, 0x35, 0x1c, 0x73, 0x36, 0x1a, 0x73, 0xf6, 0x3e, 0xe6, 0xec, 0x61, 0xc2, 0xad, 0xd1,
+	0x84, 0x5b, 0xaf, 0x13, 0x6e, 0x5d, 0x9d, 0x04, 0xa1, 0xb9, 0xee, 0xf9, 0xa2, 0x89, 0x9d, 0xb9,
+	0x5e, 0x39, 0x52, 0x3e, 0x2d, 0xc4, 0x2b, 0x47, 0xf2, 0xe6, 0x87, 0x45, 0x33, 0x0a, 0x21, 0x36,
+	0xe9, 0x43, 0x9b, 0x8d, 0xdb, 0xdf, 0x9a, 0x7d, 0x0e, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x82,
+	0xcf, 0x34, 0x63, 0x99, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/valset-pref/export_test.go b/x/valset-pref/export_test.go
index e94243f8456..01ed960d9ab 100644
--- a/x/valset-pref/export_test.go
+++ b/x/valset-pref/export_test.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 type (
diff --git a/x/valset-pref/keeper.go b/x/valset-pref/keeper.go
index 30d41283814..8987ddc319d 100644
--- a/x/valset-pref/keeper.go
+++ b/x/valset-pref/keeper.go
@@ -9,7 +9,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 type Keeper struct {
diff --git a/x/valset-pref/keeper_test.go b/x/valset-pref/keeper_test.go
index b0af0c3f1b0..fe07cfac238 100644
--- a/x/valset-pref/keeper_test.go
+++ b/x/valset-pref/keeper_test.go
@@ -10,12 +10,12 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 
-	valPref "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
+	valPref "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
 )
 
 type KeeperTestSuite struct {
diff --git a/x/valset-pref/msg_server.go b/x/valset-pref/msg_server.go
index 2d6a2663780..e111717c320 100644
--- a/x/valset-pref/msg_server.go
+++ b/x/valset-pref/msg_server.go
@@ -6,7 +6,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 type msgServer struct {
diff --git a/x/valset-pref/msg_server_test.go b/x/valset-pref/msg_server_test.go
index b91d0209f50..636c749b498 100644
--- a/x/valset-pref/msg_server_test.go
+++ b/x/valset-pref/msg_server_test.go
@@ -3,9 +3,9 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	valPref "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	valPref "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 func (s *KeeperTestSuite) TestSetValidatorSetPreference() {
diff --git a/x/valset-pref/simulation/sim_msgs.go b/x/valset-pref/simulation/sim_msgs.go
index 4f1045f0fd0..f5b259cd5a6 100644
--- a/x/valset-pref/simulation/sim_msgs.go
+++ b/x/valset-pref/simulation/sim_msgs.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	osmosimtypes "github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	valsetkeeper "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	osmosimtypes "github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	valsetkeeper "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 func RandomMsgSetValSetPreference(k valsetkeeper.Keeper, sim *osmosimtypes.SimCtx, ctx sdk.Context) (*types.MsgSetValidatorSetPreference, error) {
diff --git a/x/valset-pref/types/expected_interfaces.go b/x/valset-pref/types/expected_interfaces.go
index 03fe0191332..16e93a5ead0 100644
--- a/x/valset-pref/types/expected_interfaces.go
+++ b/x/valset-pref/types/expected_interfaces.go
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
 )
 
 // StakingInterface expected staking keeper.
diff --git a/x/valset-pref/types/msgs_test.go b/x/valset-pref/types/msgs_test.go
index 4ce0eec9da5..92e73023610 100644
--- a/x/valset-pref/types/msgs_test.go
+++ b/x/valset-pref/types/msgs_test.go
@@ -6,9 +6,9 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/osmosis-labs/osmosis/v15/app/apptesting"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/app/apptesting"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 func TestMsgSetValidatorSetPreference(t *testing.T) {
diff --git a/x/valset-pref/types/state.pb.go b/x/valset-pref/types/state.pb.go
index 7a8f487409f..75089c5bbaa 100644
--- a/x/valset-pref/types/state.pb.go
+++ b/x/valset-pref/types/state.pb.go
@@ -126,7 +126,7 @@ var fileDescriptor_d3010474a5b89fce = []byte{
 	// 355 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40,
 	0x18, 0xc5, 0x93, 0x5e, 0x28, 0xdc, 0x14, 0x44, 0xa2, 0xd0, 0x12, 0x25, 0x29, 0x59, 0x68, 0x37,
-	0x9d, 0xa1, 0x8a, 0x08, 0xee, 0x2c, 0xea, 0x56, 0xa9, 0xe8, 0xc2, 0x4d, 0x99, 0x24, 0x5f, 0xd3,
+	0x9d, 0xa1, 0x0a, 0x0a, 0xee, 0x2c, 0xea, 0x56, 0xa9, 0xe8, 0xc2, 0x4d, 0x99, 0x24, 0x5f, 0xd3,
 	0xe0, 0x24, 0x33, 0xcc, 0x8c, 0xd1, 0xbe, 0x81, 0x4b, 0x1f, 0xc2, 0x87, 0xe9, 0xb2, 0x4b, 0x71,
 	0x11, 0xb4, 0x7d, 0x83, 0x3e, 0x81, 0x34, 0x09, 0x6d, 0x15, 0x5d, 0xcd, 0xbf, 0xdf, 0xf9, 0x38,
 	0x67, 0x8e, 0xb1, 0xcf, 0x64, 0xcc, 0x64, 0x24, 0x71, 0x4a, 0xa8, 0x04, 0xd5, 0xe6, 0x02, 0x06,
@@ -145,7 +145,7 @@ var fileDescriptor_d3010474a5b89fce = []byte{
 	0x6e, 0x6f, 0x7d, 0x7e, 0xf7, 0x66, 0xfc, 0x69, 0x6b, 0xe3, 0xa9, 0xad, 0x4f, 0xa6, 0xb6, 0xfe,
 	0x31, 0xb5, 0xf5, 0x97, 0x99, 0xad, 0x4d, 0x66, 0xb6, 0xf6, 0x36, 0xb3, 0xb5, 0xbb, 0xe3, 0xb5,
 	0x60, 0xa5, 0x83, 0x36, 0x25, 0x9e, 0xc4, 0xcb, 0x82, 0x3b, 0x47, 0xf8, 0xe9, 0x5b, 0xcd, 0x79,
-	0x5a, 0xaf, 0x9a, 0xf7, 0x71, 0xf8, 0x15, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x82, 0x40, 0xa3, 0x0a,
+	0x5a, 0xaf, 0x9a, 0xf7, 0x71, 0xf8, 0x15, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xe9, 0x48, 0x06, 0x0a,
 	0x02, 0x00, 0x00,
 }
 
diff --git a/x/valset-pref/types/tx.pb.go b/x/valset-pref/types/tx.pb.go
index 59204105ea0..66ce3b9eae8 100644
--- a/x/valset-pref/types/tx.pb.go
+++ b/x/valset-pref/types/tx.pb.go
@@ -597,51 +597,51 @@ func init() {
 }
 
 var fileDescriptor_daa95be02b2fc560 = []byte{
-	// 691 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x4f, 0xd4, 0x50,
-	0x14, 0x9e, 0x0b, 0x04, 0xc3, 0x65, 0xa3, 0x0d, 0x41, 0x68, 0xb4, 0x03, 0x15, 0x85, 0x98, 0x4c,
-	0xaf, 0x33, 0x04, 0x1f, 0x18, 0x13, 0x1d, 0x89, 0x89, 0x8b, 0x49, 0xb4, 0xa0, 0x26, 0x2e, 0x4c,
-	0x3a, 0xd3, 0x43, 0x69, 0x68, 0x7b, 0x27, 0xbd, 0x97, 0xd7, 0xda, 0x8d, 0xba, 0x30, 0xee, 0x4c,
-	0xfc, 0x09, 0xae, 0xfc, 0x05, 0xae, 0x59, 0xb2, 0x74, 0x85, 0x86, 0x59, 0xb8, 0x70, 0xc7, 0xca,
-	0xa5, 0x69, 0x7b, 0xa7, 0x0c, 0x49, 0x6f, 0x6b, 0xea, 0x63, 0x03, 0xd3, 0x39, 0xdf, 0x77, 0x1e,
-	0xdf, 0x79, 0x74, 0xf0, 0x1c, 0x65, 0x3e, 0x65, 0x2e, 0x23, 0xdb, 0x96, 0xc7, 0x80, 0xd7, 0xba,
-	0x21, 0xac, 0x93, 0xed, 0x7a, 0x1b, 0xb8, 0x55, 0x27, 0x7c, 0xd7, 0xe8, 0x86, 0x94, 0x53, 0x45,
-	0x15, 0x28, 0x23, 0x41, 0x45, 0x20, 0x43, 0x80, 0xd4, 0x09, 0x87, 0x3a, 0x34, 0x86, 0x91, 0xe8,
-	0x53, 0xc2, 0x50, 0xcf, 0x59, 0xbe, 0x1b, 0x50, 0x12, 0xff, 0x15, 0x5f, 0x55, 0x1d, 0x4a, 0x1d,
-	0x0f, 0x48, 0xfc, 0xd4, 0xde, 0x5a, 0x27, 0xdc, 0xf5, 0x81, 0x71, 0xcb, 0xef, 0x0a, 0x80, 0xd6,
-	0x89, 0xc3, 0x90, 0xb6, 0xc5, 0x20, 0xcd, 0xa1, 0x43, 0xdd, 0x40, 0xd8, 0xe7, 0xf3, 0x72, 0x65,
-	0xdc, 0xe2, 0x90, 0x00, 0xf5, 0x9f, 0x08, 0x5f, 0x68, 0x31, 0x67, 0x15, 0xf8, 0x53, 0xcb, 0x73,
-	0x6d, 0x8b, 0xd3, 0x70, 0x15, 0xf8, 0xa3, 0x10, 0xd6, 0x21, 0x84, 0xa0, 0x03, 0x4a, 0x03, 0x8f,
-	0xd9, 0xe0, 0x81, 0x13, 0x59, 0xa6, 0xd0, 0x0c, 0x5a, 0x18, 0x6b, 0x4e, 0x1c, 0x1f, 0x56, 0xcf,
-	0xee, 0x59, 0xbe, 0xb7, 0xac, 0xa7, 0x26, 0xdd, 0x3c, 0x81, 0x29, 0x3e, 0x1e, 0xef, 0xa6, 0x1e,
-	0xd8, 0xd4, 0xd0, 0xcc, 0xf0, 0xc2, 0x78, 0x83, 0x18, 0x72, 0x65, 0x8c, 0x34, 0xf8, 0x49, 0xe4,
-	0xa6, 0xba, 0x7f, 0x58, 0xad, 0x1c, 0x1f, 0x56, 0x95, 0x24, 0xd4, 0x80, 0x47, 0xdd, 0x1c, 0xf4,
-	0xbf, 0xbc, 0xf4, 0xe6, 0xfb, 0xa7, 0xab, 0xd7, 0xb2, 0x2a, 0xce, 0xab, 0x4c, 0xbf, 0x82, 0xe7,
-	0xf2, 0xec, 0x26, 0xb0, 0x2e, 0x0d, 0x18, 0xe8, 0x3d, 0x84, 0xa7, 0x5b, 0xcc, 0x59, 0x49, 0xca,
-	0x83, 0x35, 0x3a, 0x88, 0x2f, 0xa5, 0xcf, 0x0b, 0x3c, 0x12, 0xf5, 0x6a, 0x6a, 0x68, 0x06, 0x2d,
-	0x8c, 0x37, 0xa6, 0x8d, 0xa4, 0x99, 0x46, 0xd4, 0xcc, 0x54, 0x91, 0xfb, 0xd4, 0x0d, 0x9a, 0x24,
-	0x92, 0xe0, 0xe3, 0xd7, 0xea, 0xbc, 0xe3, 0xf2, 0x8d, 0xad, 0xb6, 0xd1, 0xa1, 0x3e, 0x11, 0x9d,
-	0x4f, 0xfe, 0xd5, 0x98, 0xbd, 0x49, 0xf8, 0x5e, 0x17, 0x58, 0x4c, 0x30, 0x63, 0xbf, 0xcb, 0x8d,
-	0x48, 0x90, 0x9a, 0x44, 0x90, 0xec, 0x3a, 0xf4, 0x4b, 0x78, 0x56, 0x6a, 0x4c, 0xa5, 0xf8, 0x81,
-	0xf0, 0xc5, 0x16, 0x73, 0x9e, 0x04, 0xa2, 0x16, 0x78, 0x10, 0x52, 0xff, 0xaf, 0xc9, 0x31, 0xfc,
-	0x8f, 0xe4, 0xb8, 0x1e, 0xc9, 0x51, 0x97, 0xc8, 0x21, 0xaf, 0x45, 0x9f, 0xc7, 0x97, 0x73, 0x01,
-	0xa9, 0x2c, 0x9f, 0x93, 0x09, 0x31, 0xa1, 0x8f, 0xfc, 0x63, 0x49, 0xfe, 0xef, 0x06, 0x89, 0xe6,
-	0x67, 0xe7, 0x9f, 0x56, 0xf9, 0x3a, 0x39, 0x15, 0xcf, 0x5c, 0xbe, 0x61, 0x87, 0xd6, 0x8e, 0x18,
-	0x15, 0x97, 0x06, 0x26, 0xec, 0x58, 0xa1, 0xcd, 0xca, 0x14, 0x9a, 0xbf, 0xbb, 0xd2, 0x50, 0x62,
-	0x77, 0xa5, 0xf6, 0x34, 0x67, 0xc0, 0xe7, 0x07, 0xa6, 0xba, 0x49, 0x03, 0x1b, 0xec, 0x35, 0xba,
-	0x09, 0x41, 0xa9, 0x6c, 0x95, 0x49, 0x3c, 0xea, 0xd1, 0xce, 0xe6, 0xc3, 0x95, 0x78, 0x75, 0x47,
-	0x4c, 0xf1, 0xa4, 0xcf, 0xe2, 0xaa, 0x24, 0x4c, 0x3f, 0x93, 0xc6, 0xcb, 0x33, 0x78, 0xb8, 0xc5,
-	0x1c, 0xe5, 0x3d, 0xc2, 0xd3, 0xf2, 0x6b, 0x7b, 0x33, 0xaf, 0xc5, 0x79, 0xd7, 0x4a, 0xbd, 0x5b,
-	0x96, 0xd9, 0xcf, 0x50, 0x79, 0x8b, 0xf0, 0xa4, 0xe4, 0xc8, 0x2d, 0x15, 0x38, 0xcf, 0xa6, 0xa9,
-	0x77, 0x4a, 0xd1, 0xd2, 0x84, 0x3e, 0x20, 0xac, 0xe6, 0x9c, 0x9a, 0x5b, 0x05, 0xde, 0xe5, 0x54,
-	0xf5, 0x5e, 0x69, 0xea, 0x29, 0xb5, 0x24, 0x0b, 0x5f, 0xa4, 0x56, 0x36, 0xad, 0x50, 0xad, 0xfc,
-	0xf5, 0x8c, 0x07, 0x4b, 0xbe, 0x9b, 0x45, 0x83, 0x25, 0x65, 0x16, 0x0e, 0x56, 0xe1, 0x12, 0x2a,
-	0xaf, 0x10, 0x9e, 0xc8, 0x5c, 0xc1, 0xc5, 0xdf, 0x9c, 0x8f, 0x41, 0x92, 0x7a, 0xbb, 0x04, 0xa9,
-	0x9f, 0x4a, 0xf3, 0xf1, 0xfe, 0x91, 0x86, 0x0e, 0x8e, 0x34, 0xf4, 0xed, 0x48, 0x43, 0xef, 0x7a,
-	0x5a, 0xe5, 0xa0, 0xa7, 0x55, 0xbe, 0xf4, 0xb4, 0xca, 0xf3, 0x1b, 0x03, 0xef, 0x14, 0x11, 0xa0,
-	0xe6, 0x59, 0x6d, 0x46, 0xd2, 0xdb, 0x54, 0x5f, 0x22, 0xbb, 0xa7, 0x2e, 0x54, 0xfc, 0xa2, 0x69,
-	0x8f, 0xc6, 0x3f, 0xa4, 0x16, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xce, 0xc9, 0x86, 0x57, 0x1f,
-	0x0a, 0x00, 0x00,
+	// 693 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcd, 0x4f, 0xd4, 0x4e,
+	0x18, 0xde, 0x01, 0xc2, 0x2f, 0x0c, 0x97, 0x9f, 0x0d, 0x41, 0x68, 0xb4, 0x0b, 0x15, 0x85, 0x98,
+	0x6c, 0xc7, 0x5d, 0x02, 0x2a, 0xc6, 0x44, 0x57, 0x62, 0xe2, 0x61, 0x13, 0x2d, 0xa8, 0x89, 0x07,
+	0x93, 0xee, 0xf6, 0xa5, 0x34, 0xb4, 0x9d, 0x4d, 0x67, 0xf8, 0x3a, 0x7b, 0x51, 0x0f, 0xc6, 0x9b,
+	0x89, 0x7f, 0x82, 0x27, 0xff, 0x02, 0xcf, 0x1c, 0x39, 0x7a, 0x42, 0xc3, 0x1e, 0x3c, 0x78, 0xe3,
+	0xe4, 0xd1, 0xb4, 0x9d, 0x2d, 0x4b, 0xd2, 0x69, 0x4d, 0xfd, 0xb8, 0xc0, 0x76, 0xdf, 0xe7, 0x79,
+	0x3f, 0x9e, 0xf7, 0xa3, 0x8b, 0xe7, 0x28, 0xf3, 0x29, 0x73, 0x19, 0xd9, 0xb1, 0x3c, 0x06, 0xbc,
+	0xd6, 0x0d, 0x61, 0x83, 0xec, 0xd4, 0xdb, 0xc0, 0xad, 0x3a, 0xe1, 0x7b, 0x46, 0x37, 0xa4, 0x9c,
+	0x2a, 0xaa, 0x40, 0x19, 0x09, 0x2a, 0x02, 0x19, 0x02, 0xa4, 0x4e, 0x38, 0xd4, 0xa1, 0x31, 0x8c,
+	0x44, 0x9f, 0x12, 0x86, 0x7a, 0xce, 0xf2, 0xdd, 0x80, 0x92, 0xf8, 0xaf, 0xf8, 0xaa, 0xea, 0x50,
+	0xea, 0x78, 0x40, 0xe2, 0xa7, 0xf6, 0xf6, 0x06, 0xe1, 0xae, 0x0f, 0x8c, 0x5b, 0x7e, 0x57, 0x00,
+	0xb4, 0x4e, 0x1c, 0x86, 0xb4, 0x2d, 0x06, 0x69, 0x0e, 0x1d, 0xea, 0x06, 0xc2, 0x3e, 0x9f, 0x97,
+	0x2b, 0xe3, 0x16, 0x87, 0x04, 0xa8, 0xff, 0x40, 0xf8, 0x42, 0x8b, 0x39, 0x6b, 0xc0, 0x9f, 0x58,
+	0x9e, 0x6b, 0x5b, 0x9c, 0x86, 0x6b, 0xc0, 0x1f, 0x86, 0xb0, 0x01, 0x21, 0x04, 0x1d, 0x50, 0x1a,
+	0x78, 0xcc, 0x06, 0x0f, 0x9c, 0xc8, 0x32, 0x85, 0x66, 0xd0, 0xc2, 0x58, 0x73, 0xe2, 0xe4, 0xa8,
+	0xfa, 0xff, 0xbe, 0xe5, 0x7b, 0x2b, 0x7a, 0x6a, 0xd2, 0xcd, 0x53, 0x98, 0xe2, 0xe3, 0xf1, 0x6e,
+	0xea, 0x81, 0x4d, 0x0d, 0xcd, 0x0c, 0x2f, 0x8c, 0x37, 0x88, 0x21, 0x57, 0xc6, 0x48, 0x83, 0x9f,
+	0x46, 0x6e, 0xaa, 0x07, 0x47, 0xd5, 0xca, 0xc9, 0x51, 0x55, 0x49, 0x42, 0x0d, 0x78, 0xd4, 0xcd,
+	0x41, 0xff, 0x2b, 0x4b, 0xaf, 0xbf, 0x7d, 0xbc, 0x7a, 0x2d, 0xab, 0xe2, 0xbc, 0xca, 0xf4, 0x2b,
+	0x78, 0x2e, 0xcf, 0x6e, 0x02, 0xeb, 0xd2, 0x80, 0x81, 0xde, 0x43, 0x78, 0xba, 0xc5, 0x9c, 0xd5,
+	0xa4, 0x3c, 0x58, 0xa7, 0x83, 0xf8, 0x52, 0xfa, 0x3c, 0xc7, 0x23, 0x51, 0xaf, 0xa6, 0x86, 0x66,
+	0xd0, 0xc2, 0x78, 0x63, 0xda, 0x48, 0x9a, 0x69, 0x44, 0xcd, 0x4c, 0x15, 0xb9, 0x47, 0xdd, 0xa0,
+	0x49, 0x22, 0x09, 0x3e, 0x7c, 0xa9, 0xce, 0x3b, 0x2e, 0xdf, 0xdc, 0x6e, 0x1b, 0x1d, 0xea, 0x13,
+	0xd1, 0xf9, 0xe4, 0x5f, 0x8d, 0xd9, 0x5b, 0x84, 0xef, 0x77, 0x81, 0xc5, 0x04, 0x33, 0xf6, 0xbb,
+	0xd2, 0x88, 0x04, 0xa9, 0x49, 0x04, 0xc9, 0xae, 0x43, 0xbf, 0x84, 0x67, 0xa5, 0xc6, 0x54, 0x8a,
+	0xef, 0x08, 0x5f, 0x6c, 0x31, 0xe7, 0x71, 0x20, 0x6a, 0x81, 0xfb, 0x21, 0xf5, 0xff, 0x98, 0x1c,
+	0xc3, 0x7f, 0x49, 0x8e, 0xe5, 0x48, 0x8e, 0xba, 0x44, 0x0e, 0x79, 0x2d, 0xfa, 0x3c, 0xbe, 0x9c,
+	0x0b, 0x48, 0x65, 0xf9, 0x94, 0x4c, 0x88, 0x09, 0x7d, 0xe4, 0x6f, 0x4b, 0xf2, 0x6f, 0x37, 0x48,
+	0x34, 0x3f, 0x3b, 0xff, 0xb4, 0xca, 0x57, 0xc9, 0xa9, 0x78, 0xea, 0xf2, 0x4d, 0x3b, 0xb4, 0x76,
+	0xc5, 0xa8, 0xb8, 0x34, 0x30, 0x61, 0xd7, 0x0a, 0x6d, 0x56, 0xa6, 0xd0, 0xfc, 0xdd, 0x95, 0x86,
+	0x12, 0xbb, 0x2b, 0xb5, 0xa7, 0x39, 0x03, 0x3e, 0x3f, 0x30, 0xd5, 0x4d, 0x1a, 0xd8, 0x60, 0xaf,
+	0xd3, 0x2d, 0x08, 0x4a, 0x65, 0xab, 0x4c, 0xe2, 0x51, 0x8f, 0x76, 0xb6, 0x1e, 0xac, 0xc6, 0xab,
+	0x3b, 0x62, 0x8a, 0x27, 0x7d, 0x16, 0x57, 0x25, 0x61, 0xfa, 0x99, 0x34, 0x5e, 0xfc, 0x87, 0x87,
+	0x5b, 0xcc, 0x51, 0xde, 0x21, 0x3c, 0x2d, 0xbf, 0xb6, 0x37, 0xf2, 0x5a, 0x9c, 0x77, 0xad, 0xd4,
+	0x3b, 0x65, 0x99, 0xfd, 0x0c, 0x95, 0x37, 0x08, 0x4f, 0x4a, 0x8e, 0xdc, 0x52, 0x81, 0xf3, 0x6c,
+	0x9a, 0x7a, 0xbb, 0x14, 0x2d, 0x4d, 0xe8, 0x3d, 0xc2, 0x6a, 0xce, 0xa9, 0xb9, 0x59, 0xe0, 0x5d,
+	0x4e, 0x55, 0xef, 0x96, 0xa6, 0x9e, 0x51, 0x4b, 0xb2, 0xf0, 0x45, 0x6a, 0x65, 0xd3, 0x0a, 0xd5,
+	0xca, 0x5f, 0xcf, 0x78, 0xb0, 0xe4, 0xbb, 0x59, 0x34, 0x58, 0x52, 0x66, 0xe1, 0x60, 0x15, 0x2e,
+	0xa1, 0xf2, 0x12, 0xe1, 0x89, 0xcc, 0x15, 0x5c, 0xfc, 0xc5, 0xf9, 0x18, 0x24, 0xa9, 0xb7, 0x4a,
+	0x90, 0xfa, 0xa9, 0x34, 0x1f, 0x1d, 0x1c, 0x6b, 0xe8, 0xf0, 0x58, 0x43, 0x5f, 0x8f, 0x35, 0xf4,
+	0xb6, 0xa7, 0x55, 0x0e, 0x7b, 0x5a, 0xe5, 0x73, 0x4f, 0xab, 0x3c, 0xbb, 0x3e, 0xf0, 0x4e, 0x11,
+	0x01, 0x6a, 0x9e, 0xd5, 0x66, 0x24, 0xbd, 0x4d, 0xf5, 0x65, 0xb2, 0x77, 0xe6, 0x42, 0xc5, 0x2f,
+	0x9a, 0xf6, 0x68, 0xfc, 0x43, 0x6a, 0xf1, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xa2, 0x8e,
+	0xf2, 0x1f, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/valset-pref/validator_set.go b/x/valset-pref/validator_set.go
index 599606696ac..4870b580380 100644
--- a/x/valset-pref/validator_set.go
+++ b/x/valset-pref/validator_set.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/osmosis-labs/osmosis/osmomath"
 	"github.com/osmosis-labs/osmosis/osmoutils"
-	appParams "github.com/osmosis-labs/osmosis/v15/app/params"
-	lockuptypes "github.com/osmosis-labs/osmosis/v15/x/lockup/types"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	appParams "github.com/osmosis-labs/osmosis/v16/app/params"
+	lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 type valSet struct {
diff --git a/x/valset-pref/validator_set_test.go b/x/valset-pref/validator_set_test.go
index ffe3159fbdf..93e98424f3a 100644
--- a/x/valset-pref/validator_set_test.go
+++ b/x/valset-pref/validator_set_test.go
@@ -3,7 +3,7 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 func (s *KeeperTestSuite) TestValidateLockForForceUnlock() {
diff --git a/x/valset-pref/valpref-module/module.go b/x/valset-pref/valpref-module/module.go
index cf92b8cfc6e..8d3900bceb9 100644
--- a/x/valset-pref/valpref-module/module.go
+++ b/x/valset-pref/valpref-module/module.go
@@ -17,13 +17,13 @@ import (
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/osmosis-labs/osmosis/v15/simulation/simtypes"
-	keeper "github.com/osmosis-labs/osmosis/v15/x/valset-pref"
-	validatorprefclient "github.com/osmosis-labs/osmosis/v15/x/valset-pref/client"
-	valsetprefcli "github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/cli"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/grpc"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/client/queryproto"
-	"github.com/osmosis-labs/osmosis/v15/x/valset-pref/types"
+	"github.com/osmosis-labs/osmosis/v16/simulation/simtypes"
+	keeper "github.com/osmosis-labs/osmosis/v16/x/valset-pref"
+	validatorprefclient "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client"
+	valsetprefcli "github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/cli"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/grpc"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/client/queryproto"
+	"github.com/osmosis-labs/osmosis/v16/x/valset-pref/types"
 )
 
 var (