diff --git a/app/ante/vesting_test.go b/app/ante/vesting_test.go
index a8f13c5b..beea72a4 100644
--- a/app/ante/vesting_test.go
+++ b/app/ante/vesting_test.go
@@ -34,7 +34,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"MsgCreateVestingAccount",
 			vesting.NewMsgCreateVestingAccount(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100_000_000)),
+				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100)),
 				time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC).Unix(),
 				false,
 			),
@@ -45,7 +45,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"MsgCreateVestingAccount",
 			vesting.NewMsgCreatePermanentLockedAccount(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100_000_000)),
+				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100)),
 			),
 			true,
 			"MsgTypeURL /cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount not supported",
@@ -64,7 +64,7 @@ func TestVestingMempoolDecorator_MsgCreateVestingAccount_Unauthorized(t *testing
 			"other messages not affected",
 			banktypes.NewMsgSend(
 				testAddresses[0], testAddresses[1],
-				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100_000_000)),
+				sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 100)),
 			),
 			false,
 			"",
diff --git a/app/app.go b/app/app.go
index a3ed9bcb..04af80ff 100644
--- a/app/app.go
+++ b/app/app.go
@@ -868,7 +868,7 @@ func RegisterAPIRouteRewrites(router *mux.Router) {
 	// Eg: querying /cosmos/distribution/v1beta1/community_pool will return
 	// the same response as querying /kava/community/v1beta1/total_balance
 	routeMap := map[string]string{
-		"/cosmos/distribution/v1beta1/community_pool": "/0g-chain/community/v1beta1/total_balance",
+		"/cosmos/distribution/v1beta1/community_pool": "/0g/community/v1beta1/total_balance",
 	}
 
 	for clientPath, backendPath := range routeMap {
diff --git a/migrate/utils/periodic_vesting_reset_test.go b/migrate/utils/periodic_vesting_reset_test.go
index 55c75b1a..06789f86 100644
--- a/migrate/utils/periodic_vesting_reset_test.go
+++ b/migrate/utils/periodic_vesting_reset_test.go
@@ -42,7 +42,7 @@ func TestResetPeriodVestingAccount_NoVestingPeriods(t *testing.T) {
 }
 
 func TestResetPeriodVestingAccount_SingleVestingPeriod_Vested(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
@@ -65,7 +65,7 @@ func TestResetPeriodVestingAccount_SingleVestingPeriod_Vested(t *testing.T) {
 }
 
 func TestResetPeriodVestingAccount_SingleVestingPeriod_Vesting(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
@@ -98,7 +98,7 @@ func TestResetPeriodVestingAccount_SingleVestingPeriod_Vesting(t *testing.T) {
 }
 
 func TestResetPeriodVestingAccount_SingleVestingPeriod_ExactStartTime(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
@@ -126,25 +126,25 @@ func TestResetPeriodVestingAccount_SingleVestingPeriod_ExactStartTime(t *testing
 }
 
 func TestResetPeriodVestingAccount_MultiplePeriods(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(4e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(4)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // -15 days - vested
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // 0 days - exact on the start time
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // +15 days - vesting
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // +30 days - vesting
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 	}
 
@@ -160,36 +160,36 @@ func TestResetPeriodVestingAccount_MultiplePeriods(t *testing.T) {
 	expectedPeriods := []vestingtypes.Period{
 		{
 			Length: 15 * 24 * 60 * 60, // 15 days
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		{
 			Length: 15 * 24 * 60 * 60, // 15 days
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 	}
 
-	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(2e6))), vacc.OriginalVesting, "expected original vesting to be updated")
+	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(2))), vacc.OriginalVesting, "expected original vesting to be updated")
 	assert.Equal(t, newVestingStartTime.Unix(), vacc.StartTime, "expected vesting start time to be updated")
 	assert.Equal(t, expectedEndtime, vacc.EndTime, "expected vesting end time end at last period")
 	assert.Equal(t, expectedPeriods, vacc.VestingPeriods, "expected vesting periods to be updated")
 }
 
 func TestResetPeriodVestingAccount_DelegatedVesting_GreaterThanVesting(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(3e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(3)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // -15 days - vested
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // 0 days - exact on the start time
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // +15 days - vesting
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 	}
 
@@ -199,35 +199,35 @@ func TestResetPeriodVestingAccount_DelegatedVesting_GreaterThanVesting(t *testin
 	newVestingStartTime := vestingStartTime.Add(30 * 24 * time.Hour)
 	ResetPeriodicVestingAccount(vacc, newVestingStartTime)
 
-	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(2e6))), vacc.DelegatedFree, "expected delegated free to be updated")
-	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))), vacc.DelegatedVesting, "expected delegated vesting to be updated")
+	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(2))), vacc.DelegatedFree, "expected delegated free to be updated")
+	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))), vacc.DelegatedVesting, "expected delegated vesting to be updated")
 }
 
 func TestResetPeriodVestingAccount_DelegatedVesting_LessThanVested(t *testing.T) {
-	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(3e6)))
+	balance := sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(3)))
 	vestingStartTime := time.Now().Add(-30 * 24 * time.Hour) // 30 days in past
 
 	periods := vestingtypes.Periods{
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // -15 days - vested
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // 0 days - exact on the start time
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 		vestingtypes.Period{
 			Length: 15 * 24 * 60 * 60, // +15 days - vesting
-			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))),
+			Amount: sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))),
 		},
 	}
 
 	vacc := createVestingAccount(balance, vestingStartTime, periods)
-	vacc.TrackDelegation(vestingStartTime, balance, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))))
+	vacc.TrackDelegation(vestingStartTime, balance, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))))
 
 	newVestingStartTime := vestingStartTime.Add(30 * 24 * time.Hour)
 	ResetPeriodicVestingAccount(vacc, newVestingStartTime)
 
 	assert.Equal(t, sdk.Coins(nil), vacc.DelegatedFree, "expected delegrated free to be unmodified")
-	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1e6))), vacc.DelegatedVesting, "expected delegated vesting to be unmodified")
+	assert.Equal(t, sdk.NewCoins(sdk.NewCoin(chaincfg.DisplayDenom, sdkmath.NewInt(1))), vacc.DelegatedVesting, "expected delegated vesting to be unmodified")
 }
diff --git a/proto/zgc/bep3/v1beta1/query.proto b/proto/zgc/bep3/v1beta1/query.proto
index ffebce48..1e9da22a 100644
--- a/proto/zgc/bep3/v1beta1/query.proto
+++ b/proto/zgc/bep3/v1beta1/query.proto
@@ -15,27 +15,27 @@ option go_package = "github.com/0glabs/0g-chain/x/bep3/types";
 service Query {
   // Params queries module params
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/0g-chain/bep3/v1beta1/params";
+    option (google.api.http).get = "/0g/bep3/v1beta1/params";
   }
 
   // AssetSupply queries info about an asset's supply
   rpc AssetSupply(QueryAssetSupplyRequest) returns (QueryAssetSupplyResponse) {
-    option (google.api.http).get = "/0g-chain/bep3/v1beta1/assetsupply/{denom}";
+    option (google.api.http).get = "/0g/bep3/v1beta1/assetsupply/{denom}";
   }
 
   // AssetSupplies queries a list of asset supplies
   rpc AssetSupplies(QueryAssetSuppliesRequest) returns (QueryAssetSuppliesResponse) {
-    option (google.api.http).get = "/0g-chain/bep3/v1beta1/assetsupplies";
+    option (google.api.http).get = "/0g/bep3/v1beta1/assetsupplies";
   }
 
   // AtomicSwap queries info about an atomic swap
   rpc AtomicSwap(QueryAtomicSwapRequest) returns (QueryAtomicSwapResponse) {
-    option (google.api.http).get = "/0g-chain/bep3/v1beta1/atomicswap/{swap_id}";
+    option (google.api.http).get = "/0g/bep3/v1beta1/atomicswap/{swap_id}";
   }
 
   // AtomicSwaps queries a list of atomic swaps
   rpc AtomicSwaps(QueryAtomicSwapsRequest) returns (QueryAtomicSwapsResponse) {
-    option (google.api.http).get = "/0g-chain/bep3/v1beta1/atomicswaps";
+    option (google.api.http).get = "/0g/bep3/v1beta1/atomicswaps";
   }
 }
 
diff --git a/proto/zgc/committee/v1beta1/query.proto b/proto/zgc/committee/v1beta1/query.proto
index e74f4d9c..76c21f47 100644
--- a/proto/zgc/committee/v1beta1/query.proto
+++ b/proto/zgc/committee/v1beta1/query.proto
@@ -16,39 +16,39 @@ option (gogoproto.goproto_getters_all) = false;
 service Query {
   // Committees queries all committess of the committee module.
   rpc Committees(QueryCommitteesRequest) returns (QueryCommitteesResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/committees";
+    option (google.api.http).get = "/0g/committee/v1beta1/committees";
   }
   // Committee queries a committee based on committee ID.
   rpc Committee(QueryCommitteeRequest) returns (QueryCommitteeResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/committees/{committee_id}";
+    option (google.api.http).get = "/0g/committee/v1beta1/committees/{committee_id}";
   }
   // Proposals queries proposals based on committee ID.
   rpc Proposals(QueryProposalsRequest) returns (QueryProposalsResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/proposals";
+    option (google.api.http).get = "/0g/committee/v1beta1/proposals";
   }
   // Deposits queries a proposal based on proposal ID.
   rpc Proposal(QueryProposalRequest) returns (QueryProposalResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/proposals/{proposal_id}";
+    option (google.api.http).get = "/0g/committee/v1beta1/proposals/{proposal_id}";
   }
   // NextProposalID queries the next proposal ID of the committee module.
   rpc NextProposalID(QueryNextProposalIDRequest) returns (QueryNextProposalIDResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/next-proposal-id";
+    option (google.api.http).get = "/0g/committee/v1beta1/next-proposal-id";
   }
   // Votes queries all votes for a single proposal ID.
   rpc Votes(QueryVotesRequest) returns (QueryVotesResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/proposals/{proposal_id}/votes";
+    option (google.api.http).get = "/0g/committee/v1beta1/proposals/{proposal_id}/votes";
   }
   // Vote queries the vote of a single voter for a single proposal ID.
   rpc Vote(QueryVoteRequest) returns (QueryVoteResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/proposals/{proposal_id}/votes/{voter}";
+    option (google.api.http).get = "/0g/committee/v1beta1/proposals/{proposal_id}/votes/{voter}";
   }
   // Tally queries the tally of a single proposal ID.
   rpc Tally(QueryTallyRequest) returns (QueryTallyResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/proposals/{proposal_id}/tally";
+    option (google.api.http).get = "/0g/committee/v1beta1/proposals/{proposal_id}/tally";
   }
   // RawParams queries the raw params data of any subspace and key.
   rpc RawParams(QueryRawParamsRequest) returns (QueryRawParamsResponse) {
-    option (google.api.http).get = "/0g-chain/committee/v1beta1/raw-params";
+    option (google.api.http).get = "/0g/committee/v1beta1/raw-params";
   }
 }
 
diff --git a/proto/zgc/evmutil/v1beta1/query.proto b/proto/zgc/evmutil/v1beta1/query.proto
index 5c40abb8..42997040 100644
--- a/proto/zgc/evmutil/v1beta1/query.proto
+++ b/proto/zgc/evmutil/v1beta1/query.proto
@@ -12,12 +12,12 @@ option go_package = "github.com/0glabs/0g-chain/x/evmutil/types";
 service Query {
   // Params queries all parameters of the evmutil module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/0g-chain/evmutil/v1beta1/params";
+    option (google.api.http).get = "/0g/evmutil/v1beta1/params";
   }
 
   // DeployedCosmosCoinContracts queries a list cosmos coin denom and their deployed erc20 address
   rpc DeployedCosmosCoinContracts(QueryDeployedCosmosCoinContractsRequest) returns (QueryDeployedCosmosCoinContractsResponse) {
-    option (google.api.http).get = "/0g-chain/evmutil/v1beta1/deployed_cosmos_coin_contracts";
+    option (google.api.http).get = "/0g/evmutil/v1beta1/deployed_cosmos_coin_contracts";
   }
 }
 
diff --git a/proto/zgc/issuance/v1beta1/query.proto b/proto/zgc/issuance/v1beta1/query.proto
index 8c02d227..0157a182 100644
--- a/proto/zgc/issuance/v1beta1/query.proto
+++ b/proto/zgc/issuance/v1beta1/query.proto
@@ -11,7 +11,7 @@ option go_package = "github.com/0glabs/0g-chain/x/issuance/types";
 service Query {
   // Params queries all parameters of the issuance module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/0g-chain/issuance/v1beta1/params";
+    option (google.api.http).get = "/0g/issuance/v1beta1/params";
   }
 }
 
diff --git a/proto/zgc/pricefeed/v1beta1/query.proto b/proto/zgc/pricefeed/v1beta1/query.proto
index a264e54f..5148e5b4 100644
--- a/proto/zgc/pricefeed/v1beta1/query.proto
+++ b/proto/zgc/pricefeed/v1beta1/query.proto
@@ -14,32 +14,32 @@ option (gogoproto.verbose_equal_all) = true;
 service Query {
   // Params queries all parameters of the pricefeed module.
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/params";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/params";
   }
 
   // Price queries price details based on a market
   rpc Price(QueryPriceRequest) returns (QueryPriceResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/prices/{market_id}";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/prices/{market_id}";
   }
 
   // Prices queries all prices
   rpc Prices(QueryPricesRequest) returns (QueryPricesResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/prices";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/prices";
   }
 
   // RawPrices queries all raw prices based on a market
   rpc RawPrices(QueryRawPricesRequest) returns (QueryRawPricesResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/rawprices/{market_id}";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/rawprices/{market_id}";
   }
 
   // Oracles queries all oracles based on a market
   rpc Oracles(QueryOraclesRequest) returns (QueryOraclesResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/oracles/{market_id}";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/oracles/{market_id}";
   }
 
   // Markets queries all markets
   rpc Markets(QueryMarketsRequest) returns (QueryMarketsResponse) {
-    option (google.api.http).get = "/0g-chain/pricefeed/v1beta1/markets";
+    option (google.api.http).get = "/0g/pricefeed/v1beta1/markets";
   }
 }
 
diff --git a/x/bep3/integration_test.go b/x/bep3/integration_test.go
index 46142cbb..5b5105aa 100644
--- a/x/bep3/integration_test.go
+++ b/x/bep3/integration_test.go
@@ -16,8 +16,8 @@ import (
 const (
 	TestSenderOtherChain    = "bnb1uky3me9ggqypmrsvxk7ur6hqkzq7zmv4ed4ng7"
 	TestRecipientOtherChain = "bnb1urfermcg92dwq36572cx4xg84wpk3lfpksr5g7"
-	TestDeputy              = "0g1xy7hrjy9r0algz9w3gzm8u6mrpq97kwta747gj"
-	TestUser                = "0g1vry5lhegzlulehuutcr7nmdlmktw88awp0a39p"
+	TestDeputy              = "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
+	TestUser                = "0g10wlnqzyss4accfqmyxwx5jy5x9nfkwh6ceq5f5"
 )
 
 var (
diff --git a/x/bep3/keeper/integration_test.go b/x/bep3/keeper/integration_test.go
index e258dc54..ac6f3aaf 100644
--- a/x/bep3/keeper/integration_test.go
+++ b/x/bep3/keeper/integration_test.go
@@ -18,7 +18,7 @@ import (
 const (
 	TestSenderOtherChain    = "bnb1uky3me9ggqypmrsvxk7ur6hqkzq7zmv4ed4ng7"
 	TestRecipientOtherChain = "bnb1urfermcg92dwq36572cx4xg84wpk3lfpksr5g7"
-	TestDeputy              = "0g1xy7hrjy9r0algz9w3gzm8u6mrpq97kwta747gj"
+	TestDeputy              = "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 )
 
 var (
diff --git a/x/bep3/types/query.pb.go b/x/bep3/types/query.pb.go
index 45eb649d..38b56ca0 100644
--- a/x/bep3/types/query.pb.go
+++ b/x/bep3/types/query.pb.go
@@ -726,81 +726,81 @@ func init() {
 func init() { proto.RegisterFile("zgc/bep3/v1beta1/query.proto", fileDescriptor_9e51cf9dab3c34ac) }
 
 var fileDescriptor_9e51cf9dab3c34ac = []byte{
-	// 1180 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xb6, 0x1d, 0xc7, 0x8d, 0x9f, 0x9d, 0x50, 0x4d, 0x03, 0xdd, 0xba, 0xc1, 0x2e, 0x4b, 0xd3,
-	0xa6, 0x69, 0xe2, 0x4d, 0x5d, 0x54, 0x09, 0x10, 0x87, 0xa6, 0x25, 0x04, 0x41, 0x0b, 0x6c, 0x6e,
-	0x1c, 0x58, 0x8d, 0x77, 0xa7, 0xeb, 0xa1, 0xde, 0x9d, 0xed, 0xce, 0x3a, 0x6d, 0x5a, 0x7a, 0xe1,
-	0xc4, 0xb1, 0x12, 0x12, 0x2a, 0xb7, 0x9e, 0x39, 0xa2, 0xfe, 0x11, 0x3d, 0x56, 0x70, 0xe1, 0x44,
-	0x51, 0x82, 0x04, 0xff, 0x05, 0x68, 0x7e, 0xac, 0xbd, 0x8e, 0x9d, 0xda, 0x39, 0xd9, 0xfb, 0xde,
-	0xfb, 0xbe, 0xf7, 0xcd, 0xcc, 0x37, 0x3f, 0x60, 0xe9, 0xa1, 0xef, 0x5a, 0x6d, 0x12, 0x5d, 0xb5,
-	0x76, 0xaf, 0xb4, 0x49, 0x82, 0xaf, 0x58, 0xf7, 0x7a, 0x24, 0xde, 0x6b, 0x46, 0x31, 0x4b, 0x18,
-	0x3a, 0xf9, 0xd0, 0x77, 0x9b, 0x22, 0xdb, 0xd4, 0xd9, 0xda, 0xaa, 0xcb, 0x78, 0xc0, 0xb8, 0xd5,
-	0xc6, 0x9c, 0xa8, 0xd2, 0x3e, 0x30, 0xc2, 0x3e, 0x0d, 0x71, 0x42, 0x59, 0xa8, 0xd0, 0xb5, 0x7a,
-	0xb6, 0x36, 0xad, 0x72, 0x19, 0x4d, 0xf3, 0x67, 0x54, 0xde, 0x91, 0x5f, 0x96, 0xfa, 0xd0, 0xa9,
-	0x45, 0x9f, 0xf9, 0x4c, 0xc5, 0xc5, 0x3f, 0x1d, 0x5d, 0xf2, 0x19, 0xf3, 0xbb, 0xc4, 0xc2, 0x11,
-	0xb5, 0x70, 0x18, 0xb2, 0x44, 0x76, 0x4b, 0x31, 0x75, 0x9d, 0x95, 0x5f, 0xed, 0xde, 0x1d, 0xcb,
-	0xeb, 0xc5, 0x59, 0x39, 0x67, 0x47, 0x86, 0x2a, 0x47, 0x26, 0x93, 0xe6, 0x22, 0xa0, 0xaf, 0xc4,
-	0x68, 0xbe, 0xc4, 0x31, 0x0e, 0xb8, 0x4d, 0xee, 0xf5, 0x08, 0x4f, 0xcc, 0x5b, 0x70, 0x6a, 0x28,
-	0xca, 0x23, 0x16, 0x72, 0x82, 0xae, 0x41, 0x29, 0x92, 0x11, 0x23, 0x7f, 0x2e, 0xbf, 0x52, 0x69,
-	0x19, 0xcd, 0xc3, 0xf3, 0xd4, 0x54, 0x88, 0xcd, 0xe2, 0x8b, 0x3f, 0x1b, 0x39, 0x5b, 0x57, 0x9b,
-	0xef, 0xc3, 0x69, 0x49, 0x77, 0x9d, 0x73, 0x92, 0xec, 0xf4, 0xa2, 0xa8, 0xbb, 0xa7, 0x3b, 0xa1,
-	0x45, 0x98, 0xf5, 0x48, 0xc8, 0x02, 0xc9, 0x58, 0xb6, 0xd5, 0xc7, 0x07, 0x73, 0x3f, 0x3c, 0x6b,
-	0xe4, 0xfe, 0x7d, 0xd6, 0xc8, 0x99, 0x3f, 0xcf, 0xc0, 0xa9, 0x21, 0x98, 0x96, 0xb2, 0x0d, 0x6f,
-	0xd0, 0xd0, 0x65, 0x01, 0x0d, 0x7d, 0x87, 0xcb, 0x94, 0xd6, 0x74, 0xa6, 0xa9, 0x27, 0x54, 0xcc,
-	0x7e, 0x5f, 0xd6, 0x0d, 0x46, 0x43, 0x2d, 0x6a, 0x21, 0xc5, 0x29, 0x46, 0xc1, 0xc4, 0x7a, 0x89,
-	0xcf, 0x32, 0x4c, 0x85, 0x29, 0x99, 0x52, 0x9c, 0x66, 0xda, 0x82, 0x05, 0xb7, 0x17, 0xc7, 0x24,
-	0x4c, 0x52, 0xa2, 0x99, 0xe9, 0x88, 0xe6, 0x35, 0x4c, 0xf3, 0x7c, 0x03, 0x67, 0x13, 0x1a, 0x10,
-	0xa7, 0x4b, 0x03, 0x9a, 0x10, 0xcf, 0x39, 0x44, 0x5a, 0x9c, 0x8e, 0xd4, 0x10, 0x1c, 0x9f, 0x2b,
-	0x8a, 0x1b, 0x43, 0xfc, 0x5b, 0x50, 0x95, 0xfc, 0xa4, 0x8b, 0x23, 0x4e, 0x3c, 0x63, 0x56, 0x13,
-	0x2a, 0x1f, 0x35, 0x53, 0x1f, 0x35, 0x6f, 0x6a, 0x1f, 0x6d, 0xce, 0x09, 0xc2, 0xa7, 0xaf, 0x1a,
-	0x79, 0xbb, 0x22, 0x80, 0x1f, 0x2b, 0x9c, 0xf9, 0x2d, 0x18, 0xa3, 0xcb, 0xaa, 0xd7, 0xe7, 0x36,
-	0x54, 0xb1, 0x08, 0x0f, 0x2f, 0xce, 0xf2, 0xa8, 0x61, 0xc6, 0x80, 0xf5, 0x00, 0x2a, 0x78, 0x90,
-	0x32, 0x97, 0xe1, 0xcc, 0xa1, 0x5e, 0x94, 0xa4, 0x76, 0xcd, 0xd8, 0x25, 0x82, 0xda, 0xb8, 0x32,
-	0x2d, 0xca, 0x86, 0x85, 0x8c, 0x28, 0x4a, 0x84, 0x8f, 0x67, 0x8e, 0x2b, 0x6b, 0x1e, 0x67, 0xb9,
-	0xcd, 0x0f, 0xe1, 0x2d, 0xd5, 0x31, 0x61, 0x01, 0x75, 0x77, 0xee, 0xe3, 0x28, 0xb5, 0xf6, 0x69,
-	0x38, 0xc1, 0xef, 0xe3, 0xc8, 0xa1, 0x9e, 0x36, 0x77, 0x49, 0x7c, 0x7e, 0xea, 0x65, 0xe4, 0xde,
-	0x49, 0x37, 0x46, 0x06, 0xac, 0xb5, 0x7e, 0x06, 0x15, 0x2c, 0xa3, 0x8e, 0x40, 0x69, 0x4b, 0x9e,
-	0x1f, 0x23, 0x74, 0x04, 0xaa, 0x75, 0x02, 0xee, 0x67, 0xcc, 0xff, 0x8a, 0x80, 0xc6, 0xf4, 0x58,
-	0x80, 0x42, 0x5f, 0x5c, 0x81, 0x7a, 0xc8, 0x85, 0x12, 0x0e, 0x58, 0x2f, 0x4c, 0x8c, 0x82, 0x9c,
-	0x97, 0xd7, 0x78, 0x6c, 0x43, 0xf4, 0xf8, 0xe5, 0x55, 0x63, 0xc5, 0xa7, 0x49, 0xa7, 0xd7, 0x6e,
-	0xba, 0x2c, 0xd0, 0x27, 0x99, 0xfe, 0x59, 0xe7, 0xde, 0x5d, 0x2b, 0xd9, 0x8b, 0x08, 0x97, 0x00,
-	0x6e, 0x6b, 0x6a, 0xb4, 0x06, 0x28, 0xc6, 0xa1, 0xc7, 0x02, 0x27, 0xec, 0x05, 0x6d, 0x12, 0x3b,
-	0x1d, 0xcc, 0x3b, 0x72, 0xa7, 0x94, 0xed, 0x93, 0x2a, 0x73, 0x5b, 0x26, 0xb6, 0x31, 0xef, 0xa0,
-	0x77, 0x61, 0x9e, 0x3c, 0x88, 0x68, 0x4c, 0x9c, 0x0e, 0xa1, 0x7e, 0x27, 0x91, 0xee, 0x2f, 0xda,
-	0x55, 0x15, 0xdc, 0x96, 0x31, 0xb4, 0x04, 0x65, 0xe1, 0x4b, 0x9e, 0xe0, 0x20, 0x92, 0x6e, 0x9e,
-	0xb1, 0x07, 0x01, 0xb4, 0x01, 0x25, 0x4e, 0x42, 0x8f, 0xc4, 0x46, 0x49, 0x34, 0xd9, 0x34, 0x7e,
-	0x7b, 0xbe, 0xbe, 0xa8, 0x07, 0x76, 0xdd, 0xf3, 0x62, 0xc2, 0xf9, 0x4e, 0x12, 0xd3, 0xd0, 0xb7,
-	0x75, 0x1d, 0xba, 0x06, 0xe5, 0x98, 0xb8, 0x34, 0xa2, 0x24, 0x4c, 0x8c, 0x13, 0x13, 0x40, 0x83,
-	0x52, 0x31, 0x34, 0xc5, 0xe0, 0xb0, 0xa4, 0x43, 0x62, 0xc7, 0xed, 0x60, 0x1a, 0x1a, 0x73, 0x6a,
-	0x68, 0x2a, 0xf3, 0x85, 0x48, 0xdc, 0x10, 0x71, 0xd4, 0x82, 0x37, 0xfb, 0xd0, 0x21, 0x40, 0x59,
-	0x02, 0x4e, 0xf5, 0x93, 0x19, 0xcc, 0x3b, 0x50, 0x75, 0xbb, 0x8c, 0x13, 0xcf, 0x69, 0x77, 0x99,
-	0x7b, 0xd7, 0x00, 0x39, 0xd8, 0x8a, 0x8a, 0x6d, 0x8a, 0x10, 0x7a, 0x0f, 0x4a, 0x3c, 0xc1, 0x49,
-	0x8f, 0x1b, 0x95, 0x73, 0xf9, 0x95, 0x85, 0xd6, 0xd2, 0xa8, 0x67, 0x84, 0x09, 0x76, 0x64, 0x8d,
-	0xad, 0x6b, 0x51, 0x03, 0x2a, 0x6e, 0xcc, 0x38, 0xd7, 0x12, 0xaa, 0xe7, 0xf2, 0x2b, 0x73, 0x36,
-	0xc8, 0x90, 0xea, 0xfc, 0x11, 0x94, 0x3d, 0x1a, 0x13, 0x57, 0x1c, 0x08, 0xc6, 0xbc, 0x64, 0x6e,
-	0x8c, 0x67, 0xbe, 0x99, 0x96, 0xd9, 0x03, 0x84, 0xf9, 0xbc, 0x30, 0x62, 0xf5, 0x74, 0xfb, 0xa2,
-	0x16, 0x9c, 0xa0, 0xe1, 0x2e, 0xeb, 0xee, 0x12, 0xe5, 0xc5, 0xd7, 0x4c, 0x76, 0x5a, 0x88, 0xea,
-	0x00, 0xd2, 0x02, 0xf2, 0x80, 0x92, 0xbb, 0xa3, 0x68, 0x67, 0x22, 0x99, 0x59, 0x98, 0x39, 0xc6,
-	0x2c, 0x0c, 0x0d, 0xb2, 0x78, 0xdc, 0x41, 0xa2, 0x2d, 0x80, 0xc1, 0x63, 0x40, 0x1f, 0xab, 0x17,
-	0x86, 0xf6, 0x90, 0x7a, 0x64, 0x0c, 0x2e, 0x4b, 0x9f, 0xe8, 0x49, 0xb0, 0x33, 0xc8, 0xcc, 0x01,
-	0xf1, 0x6b, 0x3e, 0x3d, 0x63, 0xb3, 0xd3, 0xa6, 0xb7, 0xef, 0x2d, 0xa8, 0x66, 0x8e, 0x88, 0xf4,
-	0x30, 0x3b, 0xce, 0x19, 0x51, 0x19, 0x9c, 0x11, 0x1c, 0x7d, 0x32, 0xa4, 0x5e, 0x5d, 0x5d, 0x17,
-	0x27, 0xaa, 0x57, 0x7c, 0x59, 0xf9, 0xad, 0x7f, 0x66, 0x61, 0x56, 0x8a, 0x46, 0xdf, 0x41, 0x49,
-	0x3d, 0x08, 0xd0, 0x18, 0x55, 0xa3, 0xef, 0x8e, 0xda, 0xf2, 0x84, 0x2a, 0xd5, 0xcc, 0x5c, 0xfe,
-	0xfe, 0xf7, 0xbf, 0x7f, 0x2c, 0x34, 0xd0, 0xdb, 0xd6, 0x86, 0xbf, 0x2e, 0x0d, 0x3b, 0xfc, 0xbe,
-	0x51, 0xcf, 0x0e, 0xf4, 0x34, 0x0f, 0x95, 0xcc, 0x39, 0x8e, 0x2e, 0x1d, 0xc1, 0x3e, 0xfa, 0x2c,
-	0xa9, 0xad, 0x4e, 0x53, 0xaa, 0xd5, 0xb4, 0xa4, 0x9a, 0x35, 0xb4, 0x7a, 0x84, 0x1a, 0x79, 0x5f,
-	0xa8, 0x6b, 0xd0, 0x7a, 0x24, 0xdf, 0x37, 0x8f, 0x85, 0xb4, 0xf9, 0xa1, 0x3b, 0x0a, 0x5d, 0x9e,
-	0xd8, 0x71, 0x70, 0xe1, 0xd5, 0xd6, 0xa6, 0x2b, 0xd6, 0x02, 0xd7, 0xa4, 0xc0, 0x0b, 0xe8, 0xfc,
-	0x44, 0x81, 0x42, 0xc8, 0x4f, 0x79, 0x80, 0x81, 0x61, 0xd0, 0xca, 0x51, 0xad, 0x0e, 0xdf, 0x77,
-	0xb5, 0x4b, 0x53, 0x54, 0x6a, 0x45, 0x57, 0xa5, 0xa2, 0x75, 0x74, 0xf9, 0x28, 0x45, 0x12, 0x22,
-	0x5c, 0x6d, 0x3d, 0xd2, 0x77, 0xe8, 0x63, 0xf4, 0x44, 0x2c, 0x67, 0xc6, 0xaf, 0x93, 0xfb, 0xf1,
-	0x89, 0xcb, 0x39, 0xba, 0xab, 0xcc, 0x55, 0xa9, 0xed, 0x3c, 0x32, 0x27, 0x6a, 0xe3, 0x9b, 0xd7,
-	0x5f, 0xec, 0xd7, 0xf3, 0x2f, 0xf7, 0xeb, 0xf9, 0xbf, 0xf6, 0xeb, 0xf9, 0x27, 0x07, 0xf5, 0xdc,
-	0xcb, 0x83, 0x7a, 0xee, 0x8f, 0x83, 0x7a, 0xee, 0xeb, 0x8b, 0x99, 0x7b, 0x71, 0xc3, 0xef, 0xe2,
-	0x36, 0x1f, 0xd0, 0x3d, 0x50, 0x84, 0xf2, 0x72, 0x6c, 0x97, 0xe4, 0x73, 0xeb, 0xea, 0xff, 0x01,
-	0x00, 0x00, 0xff, 0xff, 0xfe, 0x10, 0x7b, 0x0a, 0x91, 0x0c, 0x00, 0x00,
+	// 1182 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x73, 0x1b, 0xc5,
+	0x13, 0x95, 0x64, 0x59, 0xb1, 0x5a, 0xb2, 0x7f, 0xa9, 0xb1, 0x7f, 0x78, 0xad, 0xb8, 0x24, 0x23,
+	0xfc, 0x2f, 0xc1, 0xd6, 0x3a, 0x0e, 0x95, 0x2a, 0xa0, 0x38, 0xd8, 0x0e, 0xc6, 0x14, 0x24, 0xc0,
+	0xfa, 0xc6, 0x81, 0xad, 0xd1, 0xee, 0x64, 0x35, 0x44, 0xbb, 0xb3, 0xd9, 0x59, 0x39, 0x71, 0x52,
+	0xb9, 0x70, 0xa2, 0x38, 0xa5, 0xe0, 0x02, 0xb7, 0x9c, 0x39, 0x52, 0xf9, 0x10, 0xe1, 0x96, 0x82,
+	0x0b, 0x27, 0x42, 0xd9, 0x1c, 0xf8, 0x16, 0x50, 0xf3, 0x67, 0xa5, 0x95, 0xa5, 0x58, 0xf2, 0xc9,
+	0x56, 0x77, 0xbf, 0xd7, 0x6f, 0x66, 0xdf, 0xf4, 0x0c, 0x2c, 0x3e, 0xf2, 0x1c, 0xb3, 0x49, 0xc2,
+	0x1b, 0xe6, 0xd1, 0xf5, 0x26, 0x89, 0xf1, 0x75, 0xf3, 0x7e, 0x87, 0x44, 0xc7, 0x8d, 0x30, 0x62,
+	0x31, 0x43, 0x97, 0x1f, 0x79, 0x4e, 0x43, 0x64, 0x1b, 0x3a, 0x5b, 0xb9, 0xe6, 0x30, 0xee, 0x33,
+	0x6e, 0x36, 0x31, 0x27, 0xaa, 0xb4, 0x0b, 0x0c, 0xb1, 0x47, 0x03, 0x1c, 0x53, 0x16, 0x28, 0x74,
+	0xa5, 0x9a, 0xae, 0x4d, 0xaa, 0x1c, 0x46, 0x93, 0xfc, 0x82, 0xca, 0xdb, 0xf2, 0x97, 0xa9, 0x7e,
+	0xe8, 0xd4, 0x9c, 0xc7, 0x3c, 0xa6, 0xe2, 0xe2, 0x3f, 0x1d, 0x5d, 0xf4, 0x18, 0xf3, 0xda, 0xc4,
+	0xc4, 0x21, 0x35, 0x71, 0x10, 0xb0, 0x58, 0x76, 0x4b, 0x30, 0x55, 0x9d, 0x95, 0xbf, 0x9a, 0x9d,
+	0xbb, 0xa6, 0xdb, 0x89, 0xd2, 0x72, 0xae, 0x0c, 0x2c, 0x55, 0xae, 0x4c, 0x26, 0xeb, 0x73, 0x80,
+	0xbe, 0x10, 0xab, 0xf9, 0x1c, 0x47, 0xd8, 0xe7, 0x16, 0xb9, 0xdf, 0x21, 0x3c, 0xae, 0xdf, 0x86,
+	0xd9, 0xbe, 0x28, 0x0f, 0x59, 0xc0, 0x09, 0xba, 0x09, 0x85, 0x50, 0x46, 0x8c, 0xec, 0x52, 0x76,
+	0xbd, 0xb4, 0x6d, 0x34, 0xce, 0xee, 0x53, 0x43, 0x21, 0x76, 0xf3, 0x2f, 0xfe, 0xac, 0x65, 0x2c,
+	0x5d, 0x5d, 0x7f, 0x17, 0xe6, 0x25, 0xdd, 0x0e, 0xe7, 0x24, 0x3e, 0xec, 0x84, 0x61, 0xfb, 0x58,
+	0x77, 0x42, 0x73, 0x30, 0xe9, 0x92, 0x80, 0xf9, 0x92, 0xb1, 0x68, 0xa9, 0x1f, 0xef, 0x4d, 0x7d,
+	0xfb, 0xac, 0x96, 0xf9, 0xe7, 0x59, 0x2d, 0x53, 0xff, 0x69, 0x02, 0x66, 0xfb, 0x60, 0x5a, 0xca,
+	0x01, 0xfc, 0x8f, 0x06, 0x0e, 0xf3, 0x69, 0xe0, 0xd9, 0x5c, 0xa6, 0xb4, 0xa6, 0x85, 0x86, 0xde,
+	0x50, 0xb1, 0xfb, 0x5d, 0x59, 0x7b, 0x8c, 0x06, 0x5a, 0xd4, 0x4c, 0x82, 0x53, 0x8c, 0x82, 0x89,
+	0x75, 0x62, 0x8f, 0xa5, 0x98, 0x72, 0x63, 0x32, 0x25, 0x38, 0xcd, 0xb4, 0x0f, 0x33, 0x4e, 0x27,
+	0x8a, 0x48, 0x10, 0x27, 0x44, 0x13, 0xe3, 0x11, 0x4d, 0x6b, 0x98, 0xe6, 0xf9, 0x0a, 0xae, 0xc4,
+	0xd4, 0x27, 0x76, 0x9b, 0xfa, 0x34, 0x26, 0xae, 0x7d, 0x86, 0x34, 0x3f, 0x1e, 0xa9, 0x21, 0x38,
+	0x3e, 0x55, 0x14, 0x7b, 0x7d, 0xfc, 0xfb, 0x50, 0x96, 0xfc, 0xa4, 0x8d, 0x43, 0x4e, 0x5c, 0x63,
+	0x52, 0x13, 0x2a, 0x1f, 0x35, 0x12, 0x1f, 0x35, 0x6e, 0x69, 0x1f, 0xed, 0x4e, 0x09, 0xc2, 0x1f,
+	0x5f, 0xd5, 0xb2, 0x56, 0x49, 0x00, 0x3f, 0x54, 0xb8, 0xfa, 0xd7, 0x60, 0x0c, 0x7e, 0x56, 0xfd,
+	0x7d, 0xee, 0x40, 0x19, 0x8b, 0x70, 0xff, 0xc7, 0x59, 0x19, 0x34, 0xcc, 0x10, 0xb0, 0x5e, 0x40,
+	0x09, 0xf7, 0x52, 0xf5, 0x15, 0x58, 0x38, 0xd3, 0x8b, 0x92, 0xc4, 0xae, 0x29, 0xbb, 0x84, 0x50,
+	0x19, 0x56, 0xa6, 0x45, 0x59, 0x30, 0x93, 0x12, 0x45, 0x89, 0xf0, 0xf1, 0xc4, 0x45, 0x65, 0x4d,
+	0xe3, 0x34, 0x77, 0xfd, 0x7d, 0x78, 0x43, 0x75, 0x8c, 0x99, 0x4f, 0x9d, 0xc3, 0x07, 0x38, 0x4c,
+	0xac, 0x3d, 0x0f, 0x97, 0xf8, 0x03, 0x1c, 0xda, 0xd4, 0xd5, 0xe6, 0x2e, 0x88, 0x9f, 0x1f, 0xbb,
+	0x29, 0xb9, 0x77, 0x93, 0x83, 0x91, 0x02, 0x6b, 0xad, 0x9f, 0x40, 0x09, 0xcb, 0xa8, 0x2d, 0x50,
+	0xda, 0x92, 0xcb, 0x43, 0x84, 0x0e, 0x40, 0xb5, 0x4e, 0xc0, 0xdd, 0x4c, 0xfd, 0xdf, 0x3c, 0xa0,
+	0x21, 0x3d, 0x66, 0x20, 0xd7, 0x15, 0x97, 0xa3, 0x2e, 0x72, 0xa0, 0x80, 0x7d, 0xd6, 0x09, 0x62,
+	0x23, 0x27, 0xf7, 0xe5, 0x1c, 0x8f, 0x6d, 0x89, 0x1e, 0x3f, 0xbf, 0xaa, 0xad, 0x7b, 0x34, 0x6e,
+	0x75, 0x9a, 0x0d, 0x87, 0xf9, 0x7a, 0x92, 0xe9, 0x3f, 0x9b, 0xdc, 0xbd, 0x67, 0xc6, 0xc7, 0x21,
+	0xe1, 0x12, 0xc0, 0x2d, 0x4d, 0x8d, 0x36, 0x00, 0x45, 0x38, 0x70, 0x99, 0x6f, 0x07, 0x1d, 0xbf,
+	0x49, 0x22, 0xbb, 0x85, 0x79, 0x4b, 0x9e, 0x94, 0xa2, 0x75, 0x59, 0x65, 0xee, 0xc8, 0xc4, 0x01,
+	0xe6, 0x2d, 0xf4, 0x16, 0x4c, 0x93, 0x87, 0x21, 0x8d, 0x88, 0xdd, 0x22, 0xd4, 0x6b, 0xc5, 0xd2,
+	0xfd, 0x79, 0xab, 0xac, 0x82, 0x07, 0x32, 0x86, 0x16, 0xa1, 0x28, 0x7c, 0xc9, 0x63, 0xec, 0x87,
+	0xd2, 0xcd, 0x13, 0x56, 0x2f, 0x80, 0xb6, 0xa0, 0xc0, 0x49, 0xe0, 0x92, 0xc8, 0x28, 0x88, 0x26,
+	0xbb, 0xc6, 0x6f, 0xcf, 0x37, 0xe7, 0xf4, 0xc2, 0x76, 0x5c, 0x37, 0x22, 0x9c, 0x1f, 0xc6, 0x11,
+	0x0d, 0x3c, 0x4b, 0xd7, 0xa1, 0x9b, 0x50, 0x8c, 0x88, 0x43, 0x43, 0x4a, 0x82, 0xd8, 0xb8, 0x34,
+	0x02, 0xd4, 0x2b, 0x15, 0x4b, 0x53, 0x0c, 0x36, 0x8b, 0x5b, 0x24, 0xb2, 0x9d, 0x16, 0xa6, 0x81,
+	0x31, 0xa5, 0x96, 0xa6, 0x32, 0x9f, 0x89, 0xc4, 0x9e, 0x88, 0xa3, 0x6d, 0xf8, 0x7f, 0x17, 0xda,
+	0x07, 0x28, 0x4a, 0xc0, 0x6c, 0x37, 0x99, 0xc2, 0xbc, 0x09, 0x65, 0xa7, 0xcd, 0x38, 0x71, 0xed,
+	0x66, 0x9b, 0x39, 0xf7, 0x0c, 0x90, 0x8b, 0x2d, 0xa9, 0xd8, 0xae, 0x08, 0xa1, 0x77, 0xa0, 0xc0,
+	0x63, 0x1c, 0x77, 0xb8, 0x51, 0x5a, 0xca, 0xae, 0xcf, 0x6c, 0x2f, 0x0e, 0x7a, 0x46, 0x98, 0xe0,
+	0x50, 0xd6, 0x58, 0xba, 0x16, 0xd5, 0xa0, 0xe4, 0x44, 0x8c, 0x73, 0x2d, 0xa1, 0xbc, 0x94, 0x5d,
+	0x9f, 0xb2, 0x40, 0x86, 0x54, 0xe7, 0x0f, 0xa0, 0xe8, 0xd2, 0x88, 0x38, 0x62, 0x20, 0x18, 0xd3,
+	0x92, 0xb9, 0x36, 0x9c, 0xf9, 0x56, 0x52, 0x66, 0xf5, 0x10, 0xf5, 0xe7, 0xb9, 0x01, 0xab, 0x27,
+	0xc7, 0x17, 0x6d, 0xc3, 0x25, 0x1a, 0x1c, 0xb1, 0xf6, 0x11, 0x51, 0x5e, 0x3c, 0x67, 0xb3, 0x93,
+	0x42, 0x54, 0x05, 0x90, 0x16, 0x90, 0x03, 0x4a, 0x9e, 0x8e, 0xbc, 0x95, 0x8a, 0xa4, 0x76, 0x61,
+	0xe2, 0x02, 0xbb, 0xd0, 0xb7, 0xc8, 0xfc, 0x45, 0x17, 0x89, 0xf6, 0x01, 0x7a, 0x8f, 0x01, 0x3d,
+	0x56, 0x57, 0xfb, 0xce, 0x90, 0x7a, 0x64, 0xf4, 0x2e, 0x4b, 0x8f, 0xe8, 0x4d, 0xb0, 0x52, 0xc8,
+	0xd4, 0x80, 0xf8, 0x25, 0x9b, 0xcc, 0xd8, 0xf4, 0xb6, 0xe9, 0xe3, 0x7b, 0x1b, 0xca, 0xa9, 0x11,
+	0x91, 0x0c, 0xb3, 0x8b, 0xcc, 0x88, 0x52, 0x6f, 0x46, 0x70, 0xf4, 0x51, 0x9f, 0x7a, 0x75, 0x75,
+	0xad, 0x8d, 0x54, 0xaf, 0xf8, 0xd2, 0xf2, 0xb7, 0x7f, 0x9d, 0x84, 0x49, 0x29, 0x1a, 0x1d, 0x41,
+	0x41, 0x3d, 0x08, 0xd0, 0x10, 0x55, 0x83, 0xef, 0x8e, 0xca, 0xca, 0x88, 0x2a, 0xd5, 0xac, 0x5e,
+	0xfb, 0xe6, 0xf7, 0xbf, 0x7f, 0xc8, 0x2d, 0xa0, 0x79, 0x73, 0xcb, 0xeb, 0x7f, 0xd9, 0xa8, 0x07,
+	0x07, 0xfa, 0x3e, 0x0b, 0xa5, 0xd4, 0x04, 0x47, 0x57, 0x5f, 0xc3, 0x3b, 0xf8, 0x20, 0xa9, 0x5c,
+	0x1b, 0xa7, 0x54, 0xeb, 0xd8, 0x90, 0x3a, 0x56, 0xd1, 0xf2, 0x80, 0x0e, 0x79, 0x47, 0xa8, 0xab,
+	0xcf, 0x7c, 0x2c, 0xdf, 0x34, 0x4f, 0x84, 0xa8, 0xe9, 0xbe, 0x7b, 0x09, 0xbd, 0x3d, 0xb2, 0x57,
+	0xef, 0x92, 0xab, 0x6c, 0x8c, 0x57, 0xac, 0xa5, 0xad, 0x4a, 0x69, 0x4b, 0xa8, 0x7a, 0x8e, 0x34,
+	0x21, 0xe1, 0x69, 0x16, 0xa0, 0x67, 0x0f, 0xb4, 0xfe, 0xba, 0x26, 0x67, 0x6f, 0xb7, 0xca, 0xd5,
+	0x31, 0x2a, 0xb5, 0x96, 0x4d, 0xa9, 0x65, 0x0d, 0xad, 0x0c, 0x6a, 0x91, 0xc5, 0xc2, 0xbd, 0xe6,
+	0x63, 0x7d, 0x57, 0x3e, 0x41, 0xdf, 0x89, 0x8f, 0x97, 0xf2, 0xe5, 0xe8, 0x4e, 0x7c, 0xe4, 0xc7,
+	0x1b, 0x3c, 0x3d, 0xf5, 0x65, 0xa9, 0xaa, 0x8a, 0x16, 0xcf, 0x51, 0xc5, 0x77, 0x77, 0x5e, 0x9c,
+	0x54, 0xb3, 0x2f, 0x4f, 0xaa, 0xd9, 0xbf, 0x4e, 0xaa, 0xd9, 0xa7, 0xa7, 0xd5, 0xcc, 0xcb, 0xd3,
+	0x6a, 0xe6, 0x8f, 0xd3, 0x6a, 0xe6, 0xcb, 0xb5, 0xd4, 0xcd, 0xb7, 0xe5, 0xb5, 0x71, 0x93, 0x9b,
+	0x5b, 0xde, 0xa6, 0x1c, 0x9f, 0xe6, 0x43, 0x45, 0x28, 0xaf, 0xbf, 0x66, 0x41, 0x3e, 0xa8, 0x6e,
+	0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xc2, 0x2d, 0xe3, 0x73, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/bep3/types/query.pb.gw.go b/x/bep3/types/query.pb.gw.go
index 33519c8d..3f24ca11 100644
--- a/x/bep3/types/query.pb.gw.go
+++ b/x/bep3/types/query.pb.gw.go
@@ -479,15 +479,15 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "bep3", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "bep3", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_AssetSupply_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "bep3", "v1beta1", "assetsupply", "denom"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_AssetSupply_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "bep3", "v1beta1", "assetsupply", "denom"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_AssetSupplies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "bep3", "v1beta1", "assetsupplies"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_AssetSupplies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "bep3", "v1beta1", "assetsupplies"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_AtomicSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "bep3", "v1beta1", "atomicswap", "swap_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_AtomicSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "bep3", "v1beta1", "atomicswap", "swap_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_AtomicSwaps_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "bep3", "v1beta1", "atomicswaps"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_AtomicSwaps_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "bep3", "v1beta1", "atomicswaps"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/committee/client/cli/tx.go b/x/committee/client/cli/tx.go
index 19901afb..ab39ca61 100644
--- a/x/committee/client/cli/tx.go
+++ b/x/committee/client/cli/tx.go
@@ -35,11 +35,11 @@ const PARAMS_CHANGE_PROPOSAL_EXAMPLE = `
 
 const COMMITTEE_CHANGE_PROPOSAL_EXAMPLE = `
 {
-	"@type": "/0g-chain.committee.v1beta1.CommitteeChangeProposal",
+	"@type": "/0g.committee.v1beta1.CommitteeChangeProposal",
   "title": "A Title",
   "description": "A proposal description.",
   "new_committee": {
-    "@type": "/0g-chain.committee.v1beta1.MemberCommittee",
+    "@type": "/0g.committee.v1beta1.MemberCommittee",
     "base_committee": {
       "id": "34",
       "description": "member committee",
@@ -55,7 +55,7 @@ const COMMITTEE_CHANGE_PROPOSAL_EXAMPLE = `
 
 const COMMITTEE_DELETE_PROPOSAL_EXAMPLE = `
 {
-	"@type": "/0g-chain.committee.v1beta1.CommitteeDeleteProposal",
+	"@type": "/0g.committee.v1beta1.CommitteeDeleteProposal",
   "title": "A Title",
   "description": "A proposal description.",
   "committee_id": "1"
diff --git a/x/committee/types/codec.go b/x/committee/types/codec.go
index ac76bef3..6993b44c 100644
--- a/x/committee/types/codec.go
+++ b/x/committee/types/codec.go
@@ -52,28 +52,25 @@ func init() {
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	// Proposals
 	cdc.RegisterInterface((*PubProposal)(nil), nil)
-	cdc.RegisterConcrete(CommitteeChangeProposal{}, "0g-chain/CommitteeChangeProposal", nil)
-	cdc.RegisterConcrete(CommitteeDeleteProposal{}, "0g-chain/CommitteeDeleteProposal", nil)
+	cdc.RegisterConcrete(CommitteeChangeProposal{}, "0g/CommitteeChangeProposal", nil)
+	cdc.RegisterConcrete(CommitteeDeleteProposal{}, "0g/CommitteeDeleteProposal", nil)
 
 	// Committees
 	cdc.RegisterInterface((*Committee)(nil), nil)
-	cdc.RegisterConcrete(BaseCommittee{}, "0g-chain/BaseCommittee", nil)
-	cdc.RegisterConcrete(MemberCommittee{}, "0g-chain/MemberCommittee", nil)
-	cdc.RegisterConcrete(TokenCommittee{}, "0g-chain/TokenCommittee", nil)
+	cdc.RegisterConcrete(BaseCommittee{}, "0g/BaseCommittee", nil)
+	cdc.RegisterConcrete(MemberCommittee{}, "0g/MemberCommittee", nil)
+	cdc.RegisterConcrete(TokenCommittee{}, "0g/TokenCommittee", nil)
 
 	// Permissions
 	cdc.RegisterInterface((*Permission)(nil), nil)
-	cdc.RegisterConcrete(GodPermission{}, "0g-chain/GodPermission", nil)
-	cdc.RegisterConcrete(TextPermission{}, "0g-chain/TextPermission", nil)
-	cdc.RegisterConcrete(SoftwareUpgradePermission{}, "0g-chain/SoftwareUpgradePermission", nil)
-	cdc.RegisterConcrete(ParamsChangePermission{}, "0g-chain/ParamsChangePermission", nil)
-	cdc.RegisterConcrete(CommunityCDPRepayDebtPermission{}, "0g-chain/CommunityCDPRepayDebtPermission", nil)
-	cdc.RegisterConcrete(CommunityCDPWithdrawCollateralPermission{}, "0g-chain/CommunityCDPWithdrawCollateralPermission", nil)
-	cdc.RegisterConcrete(CommunityPoolLendWithdrawPermission{}, "0g-chain/CommunityPoolLendWithdrawPermission", nil)
+	cdc.RegisterConcrete(GodPermission{}, "0g/GodPermission", nil)
+	cdc.RegisterConcrete(TextPermission{}, "0g/TextPermission", nil)
+	cdc.RegisterConcrete(SoftwareUpgradePermission{}, "0g/SoftwareUpgradePermission", nil)
+	cdc.RegisterConcrete(ParamsChangePermission{}, "0g/ParamsChangePermission", nil)
 
 	// Msgs
-	legacy.RegisterAminoMsg(cdc, &MsgSubmitProposal{}, "0g-chain/MsgSubmitProposal")
-	legacy.RegisterAminoMsg(cdc, &MsgVote{}, "0g-chain/MsgVote")
+	legacy.RegisterAminoMsg(cdc, &MsgSubmitProposal{}, "0g/MsgSubmitProposal")
+	legacy.RegisterAminoMsg(cdc, &MsgVote{}, "0g/MsgVote")
 }
 
 // RegisterProposalTypeCodec allows external modules to register their own pubproposal types on the
@@ -91,7 +88,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 
 	registry.RegisterInterface(
-		"0g-chain.committee.v1beta1.Committee",
+		"0g.committee.v1beta1.Committee",
 		(*Committee)(nil),
 		&BaseCommittee{},
 		&TokenCommittee{},
@@ -99,21 +96,18 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 	)
 
 	registry.RegisterInterface(
-		"0g-chain.committee.v1beta1.Permission",
+		"0g.committee.v1beta1.Permission",
 		(*Permission)(nil),
 		&GodPermission{},
 		&TextPermission{},
 		&SoftwareUpgradePermission{},
 		&ParamsChangePermission{},
-		// &CommunityCDPRepayDebtPermission{},
-		// &CommunityCDPWithdrawCollateralPermission{},
-		// &CommunityPoolLendWithdrawPermission{},
 	)
 
 	// Need to register PubProposal here since we use this as alias for the x/gov Content interface for all the proposal implementations used in this module.
 	// Note that all proposals supported by x/committee needed to be registered here, including the proposals from x/gov.
 	registry.RegisterInterface(
-		"0g-chain.committee.v1beta1.PubProposal",
+		"0g.committee.v1beta1.PubProposal",
 		(*PubProposal)(nil),
 		&Proposal{},
 		&distrtypes.CommunityPoolSpendProposal{},
diff --git a/x/committee/types/committee.go b/x/committee/types/committee.go
index e20efc55..23812343 100644
--- a/x/committee/types/committee.go
+++ b/x/committee/types/committee.go
@@ -15,9 +15,9 @@ import (
 const MaxCommitteeDescriptionLength int = 512
 
 const (
-	BaseCommitteeType   = "0g-chain/BaseCommittee"
-	MemberCommitteeType = "0g-chain/MemberCommittee" // Committee is composed of member addresses that vote to enact proposals within their permissions
-	TokenCommitteeType  = "0g-chain/TokenCommittee"  // Committee is composed of token holders with voting power determined by total token balance
+	BaseCommitteeType   = "0g/BaseCommittee"
+	MemberCommitteeType = "0g/MemberCommittee" // Committee is composed of member addresses that vote to enact proposals within their permissions
+	TokenCommitteeType  = "0g/TokenCommittee"  // Committee is composed of token holders with voting power determined by total token balance
 	BondDenom           = "neuron"
 )
 
diff --git a/x/committee/types/query.pb.go b/x/committee/types/query.pb.go
index 67e8ee86..1fbd1406 100644
--- a/x/committee/types/query.pb.go
+++ b/x/committee/types/query.pb.go
@@ -761,82 +761,82 @@ func init() { proto.RegisterFile("zgc/committee/v1beta1/query.proto", fileDescri
 
 var fileDescriptor_32c24238147f1ffb = []byte{
 	// 1218 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x41, 0x6f, 0x1b, 0x45,
-	0x14, 0xc7, 0xb3, 0x8e, 0x93, 0xd8, 0xe3, 0x24, 0x84, 0x51, 0x5a, 0x1c, 0x53, 0xd9, 0xed, 0x22,
-	0x92, 0x00, 0xd9, 0xdd, 0xc6, 0x69, 0x55, 0x41, 0x8b, 0x44, 0x1c, 0x53, 0x64, 0x90, 0x50, 0x58,
-	0x02, 0x07, 0x2a, 0x61, 0x8d, 0xbd, 0xd3, 0xcd, 0x52, 0x7b, 0x77, 0xb3, 0xb3, 0x4e, 0xe2, 0x86,
-	0x5c, 0xb8, 0x23, 0x55, 0xe2, 0x40, 0x25, 0x0e, 0x48, 0x80, 0x04, 0x17, 0x6e, 0xfd, 0x08, 0x1c,
-	0xa2, 0x9e, 0x2a, 0x71, 0x41, 0x1c, 0x0c, 0x38, 0x7c, 0x10, 0xb4, 0x33, 0xb3, 0xe3, 0x8d, 0x6d,
-	0x9c, 0x8d, 0x7b, 0xb2, 0x77, 0xf7, 0xbd, 0xff, 0xfc, 0xde, 0x9b, 0x99, 0xf7, 0x1e, 0xb8, 0xf6,
-	0xd0, 0xac, 0x6b, 0x75, 0xa7, 0xd9, 0xb4, 0x7c, 0x1f, 0x63, 0x6d, 0x7f, 0xbd, 0x86, 0x7d, 0xb4,
-	0xae, 0xed, 0xb5, 0xb0, 0xd7, 0x56, 0x5d, 0xcf, 0xf1, 0x1d, 0x78, 0xe9, 0xa1, 0x59, 0x57, 0x85,
-	0x89, 0xca, 0x4d, 0x72, 0xaf, 0xd7, 0x1d, 0xd2, 0x74, 0x88, 0x56, 0x43, 0x04, 0x33, 0x7b, 0xe1,
-	0xed, 0x22, 0xd3, 0xb2, 0x91, 0x6f, 0x39, 0x36, 0x93, 0xc8, 0x2d, 0x31, 0xdb, 0x2a, 0x7d, 0xd2,
-	0xd8, 0x03, 0xff, 0xb4, 0x68, 0x3a, 0xa6, 0xc3, 0xde, 0x07, 0xff, 0xf8, 0xdb, 0x2b, 0xa6, 0xe3,
-	0x98, 0x0d, 0xac, 0x21, 0xd7, 0xd2, 0x90, 0x6d, 0x3b, 0x3e, 0x55, 0x0b, 0x7d, 0x96, 0xf8, 0x57,
-	0xfa, 0x54, 0x6b, 0xdd, 0xd7, 0x90, 0xcd, 0x61, 0x73, 0x85, 0xfe, 0x4f, 0xbe, 0xd5, 0xc4, 0xc4,
-	0x47, 0x4d, 0x97, 0x1b, 0xbc, 0x32, 0x3c, 0x60, 0x13, 0xdb, 0x98, 0x58, 0x7c, 0x01, 0x39, 0x0b,
-	0x2e, 0x7f, 0x14, 0x44, 0xb4, 0x15, 0xda, 0x11, 0x1d, 0xef, 0xb5, 0x30, 0xf1, 0xe5, 0xcf, 0xc1,
-	0x4b, 0x03, 0x5f, 0x88, 0xeb, 0xd8, 0x04, 0xc3, 0x2d, 0x00, 0x84, 0x2e, 0xc9, 0x4a, 0x57, 0x27,
-	0x57, 0x33, 0xc5, 0x45, 0x95, 0xf1, 0xa8, 0x21, 0x8f, 0xba, 0x69, 0xb7, 0x4b, 0x73, 0x4f, 0x9f,
-	0x28, 0x69, 0xa1, 0xa0, 0x47, 0xdc, 0xe4, 0xb7, 0xc0, 0xa5, 0xb3, 0xfa, 0x7c, 0x61, 0x78, 0x0d,
-	0xcc, 0x0a, 0xb3, 0xaa, 0x65, 0x64, 0xa5, 0xab, 0xd2, 0x6a, 0x52, 0xcf, 0x88, 0x77, 0x15, 0x43,
-	0xbe, 0xd7, 0x4f, 0x2d, 0xd0, 0x36, 0x41, 0x5a, 0x18, 0x52, 0xcf, 0x98, 0x64, 0x3d, 0x2f, 0x01,
-	0xb6, 0xed, 0x39, 0xae, 0x43, 0x50, 0x83, 0x5c, 0x00, 0xec, 0x0b, 0x0e, 0x16, 0xf1, 0xe5, 0x60,
-	0xdb, 0x20, 0xed, 0x86, 0x2f, 0x79, 0xca, 0xd6, 0xd4, 0xa1, 0xe7, 0x4d, 0x3d, 0xa3, 0x10, 0x0a,
-	0x94, 0x92, 0x27, 0x9d, 0xc2, 0x84, 0xde, 0x13, 0x91, 0x6f, 0x81, 0xc5, 0x3e, 0x4b, 0x86, 0x59,
-	0x00, 0x99, 0xd0, 0xa8, 0x47, 0x09, 0xc2, 0x57, 0x15, 0x43, 0xfe, 0x3a, 0xd1, 0x17, 0xa1, 0x80,
-	0xbc, 0x0f, 0x66, 0xdd, 0x56, 0xad, 0x1a, 0xda, 0x8e, 0x4c, 0xa0, 0xd2, 0xed, 0x14, 0x32, 0xdb,
-	0xad, 0x5a, 0x28, 0xf2, 0xf4, 0x89, 0x92, 0xe3, 0xe7, 0xdd, 0x74, 0xf6, 0x45, 0x30, 0x5b, 0x8e,
-	0xed, 0x63, 0xdb, 0xd7, 0x33, 0x6e, 0xcf, 0x14, 0x5e, 0x06, 0x09, 0xcb, 0xc8, 0x26, 0x02, 0xb2,
-	0xd2, 0x74, 0xb7, 0x53, 0x48, 0x54, 0xca, 0x7a, 0xc2, 0x32, 0x60, 0xb1, 0x2f, 0xc3, 0x93, 0xd4,
-	0xe2, 0x85, 0x60, 0x25, 0xb1, 0x55, 0x95, 0xf2, 0x99, 0x94, 0xc3, 0x77, 0x40, 0xca, 0xc0, 0xc8,
-	0x68, 0x58, 0x36, 0xce, 0x26, 0x29, 0x6f, 0x6e, 0x80, 0x77, 0x27, 0xbc, 0x1a, 0xa5, 0x54, 0x90,
-	0xc5, 0x47, 0x7f, 0x15, 0x24, 0x5d, 0x78, 0xc9, 0x57, 0x40, 0x8e, 0xa6, 0xe3, 0x43, 0x7c, 0xe8,
-	0x87, 0x88, 0x95, 0x72, 0x78, 0x0f, 0xee, 0x81, 0x97, 0x87, 0x7e, 0xe5, 0x29, 0xbb, 0x03, 0x16,
-	0x6c, 0x7c, 0xe8, 0x57, 0x07, 0x52, 0x5e, 0x82, 0xdd, 0x4e, 0x61, 0xbe, 0xcf, 0x6b, 0xde, 0x8e,
-	0x3e, 0x1b, 0xf2, 0x97, 0xe0, 0x45, 0x2a, 0xfe, 0xa9, 0xe3, 0x8b, 0x9b, 0x77, 0xee, 0x06, 0xc2,
-	0xbb, 0x00, 0xf4, 0x0a, 0x0f, 0x4d, 0x63, 0xa6, 0xb8, 0xac, 0xf2, 0xe4, 0x07, 0x55, 0x4a, 0x65,
-	0x55, 0x2d, 0xdc, 0x83, 0x6d, 0x64, 0x86, 0xb7, 0x4b, 0x8f, 0x78, 0xca, 0x3f, 0x4a, 0x00, 0x46,
-	0x97, 0xe7, 0x21, 0x95, 0xc1, 0xd4, 0x7e, 0xf0, 0x82, 0x1f, 0xd3, 0xd5, 0x51, 0xc7, 0x34, 0xf0,
-	0xec, 0x3b, 0xa2, 0xcc, 0x19, 0xbe, 0x37, 0x04, 0x72, 0xe5, 0x5c, 0x48, 0xa6, 0x74, 0x86, 0xb2,
-	0x02, 0x16, 0x22, 0x4b, 0xc5, 0x4c, 0xd1, 0x22, 0x8b, 0xc1, 0xa3, 0x0b, 0xa7, 0x19, 0x93, 0x27,
-	0x3f, 0x96, 0x22, 0xf9, 0x16, 0xf1, 0x6a, 0x43, 0xc4, 0x4a, 0xf3, 0xdd, 0x4e, 0x01, 0x44, 0x76,
-	0xee, 0x5c, 0x71, 0x78, 0x07, 0xa4, 0x83, 0x3f, 0x55, 0xbf, 0xed, 0x62, 0x7a, 0x72, 0xe7, 0x8b,
-	0x85, 0xff, 0x49, 0x5d, 0xb0, 0xfc, 0x4e, 0xdb, 0xc5, 0x7a, 0x6a, 0x9f, 0xff, 0x93, 0x6f, 0x70,
-	0xb2, 0x1d, 0xd4, 0x68, 0xb4, 0x63, 0x5f, 0xe5, 0x5f, 0x92, 0x7c, 0x07, 0xb9, 0xdb, 0xb8, 0x11,
-	0x7d, 0x00, 0xd2, 0x6d, 0x4c, 0xaa, 0x6c, 0xdb, 0x69, 0x54, 0x25, 0x35, 0xd8, 0xcc, 0x3f, 0x3b,
-	0x85, 0x65, 0xd3, 0xf2, 0x77, 0x5b, 0xb5, 0x20, 0x0a, 0xde, 0xcf, 0xf8, 0x8f, 0x42, 0x8c, 0x07,
-	0x5a, 0x10, 0x2c, 0x51, 0xcb, 0xb8, 0xae, 0xa7, 0xda, 0x98, 0xd0, 0x73, 0x04, 0x2b, 0x20, 0x65,
-	0x3b, 0x5c, 0x6b, 0x72, 0x2c, 0xad, 0x19, 0xdb, 0x61, 0x52, 0x1f, 0x83, 0xb9, 0x7a, 0xcb, 0xf3,
-	0xb0, 0xed, 0x73, 0xbd, 0xe4, 0x58, 0x7a, 0xb3, 0x5c, 0x84, 0x89, 0x7e, 0x02, 0xe6, 0x5d, 0x87,
-	0x10, 0xab, 0xd6, 0xc0, 0x5c, 0x75, 0x6a, 0x2c, 0xd5, 0xb9, 0x50, 0x45, 0xc8, 0xb2, 0xfd, 0xdf,
-	0xf5, 0x30, 0xd9, 0x75, 0x1a, 0x46, 0x76, 0x7a, 0x3c, 0x59, 0x7a, 0x26, 0x42, 0x11, 0x78, 0x17,
-	0x4c, 0xef, 0xb5, 0x1c, 0xaf, 0xd5, 0xcc, 0xce, 0x8c, 0x25, 0xc7, 0xbd, 0xe5, 0x77, 0x79, 0xd1,
-	0xd7, 0xd1, 0xc1, 0x36, 0xf2, 0x50, 0x53, 0x94, 0x9b, 0x1c, 0x48, 0x91, 0x56, 0x8d, 0xb8, 0xa8,
-	0xce, 0x3a, 0x66, 0x5a, 0x17, 0xcf, 0x70, 0x01, 0x4c, 0x3e, 0xc0, 0x6d, 0x7e, 0xce, 0x83, 0xbf,
-	0xf2, 0x06, 0xef, 0x70, 0x11, 0x19, 0x7e, 0xe8, 0x96, 0x40, 0xca, 0x43, 0x07, 0x55, 0x03, 0xf9,
-	0x88, 0xeb, 0xcc, 0x78, 0xe8, 0xa0, 0x8c, 0x7c, 0x54, 0xfc, 0x2d, 0x03, 0xa6, 0xa8, 0x17, 0xfc,
-	0x4e, 0x02, 0xa0, 0x37, 0x51, 0x40, 0x65, 0x54, 0x6d, 0x19, 0x98, 0x49, 0x72, 0x6a, 0x5c, 0x73,
-	0x86, 0x24, 0xab, 0x5f, 0xfd, 0xfe, 0xef, 0x37, 0x89, 0x55, 0xb8, 0xac, 0x5d, 0x37, 0x95, 0xfa,
-	0x2e, 0xb2, 0xec, 0x21, 0x03, 0x51, 0x6f, 0x26, 0x81, 0x3f, 0x4b, 0xa0, 0x37, 0x13, 0xc0, 0xb5,
-	0x58, 0xab, 0x85, 0x6c, 0x4a, 0x4c, 0x6b, 0x8e, 0xf6, 0x36, 0x45, 0xbb, 0x05, 0x6f, 0xc6, 0x43,
-	0xd3, 0x8e, 0xa2, 0x8d, 0xf1, 0x18, 0x7e, 0x2b, 0x81, 0xb4, 0x18, 0x32, 0x60, 0xac, 0x49, 0x82,
-	0xc4, 0x22, 0x1d, 0x98, 0x5c, 0x64, 0x85, 0x92, 0xae, 0xc0, 0x57, 0x47, 0x91, 0x8a, 0xb1, 0x04,
-	0xfe, 0x20, 0x81, 0x94, 0x68, 0xf4, 0x6f, 0xc4, 0x1b, 0x71, 0x18, 0xd7, 0x85, 0xe6, 0x21, 0xf9,
-	0x36, 0xc5, 0xba, 0x09, 0x37, 0x62, 0x61, 0x69, 0x47, 0x91, 0x82, 0x78, 0x0c, 0x7f, 0x95, 0x40,
-	0x5f, 0x6b, 0x86, 0xeb, 0xa3, 0x56, 0x1f, 0x3a, 0x1a, 0xe4, 0x8a, 0x17, 0x71, 0xe1, 0xd8, 0x37,
-	0x28, 0xb6, 0x0a, 0xd7, 0x46, 0x61, 0x07, 0x53, 0x82, 0x12, 0x02, 0x2b, 0x96, 0x01, 0xbf, 0x97,
-	0xc0, 0x14, 0xab, 0x32, 0xe7, 0x76, 0x63, 0xb1, 0xcd, 0xaf, 0xc5, 0xb0, 0xe4, 0x50, 0x9b, 0x14,
-	0xea, 0x36, 0x7c, 0x73, 0x8c, 0x5c, 0x6a, 0xac, 0xdd, 0xff, 0x24, 0x81, 0x64, 0x20, 0x0a, 0x57,
-	0xce, 0x1f, 0x17, 0x18, 0x5f, 0xec, 0xb9, 0x42, 0xae, 0x50, 0xbc, 0x2d, 0xb8, 0x39, 0x36, 0x9e,
-	0x76, 0x44, 0x7b, 0xf4, 0x31, 0x4d, 0x24, 0xed, 0x95, 0xa3, 0x13, 0x19, 0xed, 0xc2, 0xa3, 0x13,
-	0x79, 0xa6, 0xf1, 0x3e, 0x5f, 0x22, 0x7d, 0xca, 0xf5, 0x58, 0x02, 0x69, 0x51, 0x5c, 0x47, 0xdf,
-	0xec, 0xfe, 0x52, 0x3e, 0xfa, 0x66, 0x0f, 0x54, 0xec, 0x78, 0xe5, 0xd1, 0x43, 0x07, 0x8a, 0x4b,
-	0xfd, 0x4a, 0xef, 0x9f, 0xfc, 0x93, 0x9f, 0x38, 0xe9, 0xe6, 0xa5, 0x67, 0xdd, 0xbc, 0xf4, 0x77,
-	0x37, 0x2f, 0x3d, 0x3a, 0xcd, 0x4f, 0x3c, 0x3b, 0xcd, 0x4f, 0xfc, 0x71, 0x9a, 0x9f, 0xf8, 0x6c,
-	0x2d, 0xd2, 0x90, 0xae, 0x9b, 0x0d, 0x54, 0x23, 0x3d, 0xd9, 0xc3, 0x88, 0x30, 0x6d, 0x4d, 0xb5,
-	0x69, 0x3a, 0x9c, 0x6f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0x77, 0x18, 0x08, 0xca, 0x97, 0x0f,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xc1, 0x6f, 0xe3, 0xc4,
+	0x17, 0xc7, 0xeb, 0x34, 0xed, 0x26, 0x2f, 0x6d, 0x7f, 0xfd, 0x8d, 0xba, 0x4b, 0x1a, 0x56, 0x49,
+	0x6b, 0xa4, 0xb6, 0x40, 0x63, 0xb7, 0x29, 0xab, 0x95, 0xd8, 0x45, 0x62, 0xd3, 0xb0, 0x28, 0x20,
+	0xa1, 0x62, 0x0a, 0x07, 0x56, 0x22, 0x9a, 0xc4, 0xb3, 0xae, 0xd9, 0xc4, 0x76, 0x3d, 0x4e, 0xdb,
+	0x6c, 0xe9, 0x85, 0x3b, 0x68, 0x01, 0x21, 0x81, 0x84, 0x90, 0x10, 0x07, 0xf8, 0x03, 0xf6, 0x8f,
+	0xa8, 0xf6, 0xb4, 0x12, 0x17, 0xc4, 0x21, 0x40, 0xca, 0x1f, 0x82, 0x3c, 0x1e, 0x4f, 0xdc, 0x24,
+	0x24, 0x69, 0x4e, 0x89, 0xed, 0xf7, 0xbe, 0xf3, 0x79, 0x6f, 0x66, 0xde, 0x7b, 0xb0, 0xfa, 0xd8,
+	0xa8, 0xa9, 0x35, 0xbb, 0xd1, 0x30, 0x3d, 0x8f, 0x10, 0xf5, 0x68, 0xbb, 0x4a, 0x3c, 0xbc, 0xad,
+	0x1e, 0x36, 0x89, 0xdb, 0x52, 0x1c, 0xd7, 0xf6, 0x6c, 0x74, 0xfd, 0xb1, 0x51, 0x53, 0x84, 0x89,
+	0xc2, 0x4d, 0x32, 0xaf, 0xd4, 0x6c, 0xda, 0xb0, 0xa9, 0x5a, 0xc5, 0x94, 0x04, 0xf6, 0xc2, 0xdb,
+	0xc1, 0x86, 0x69, 0x61, 0xcf, 0xb4, 0xad, 0x40, 0x22, 0xb3, 0x1c, 0xd8, 0x56, 0xd8, 0x93, 0x1a,
+	0x3c, 0xf0, 0x4f, 0x4b, 0x86, 0x6d, 0xd8, 0xc1, 0x7b, 0xff, 0x1f, 0x7f, 0x7b, 0xd3, 0xb0, 0x6d,
+	0xa3, 0x4e, 0x54, 0xec, 0x98, 0x2a, 0xb6, 0x2c, 0xdb, 0x63, 0x6a, 0xa1, 0xcf, 0x32, 0xff, 0xca,
+	0x9e, 0xaa, 0xcd, 0x87, 0x2a, 0xb6, 0x38, 0x6c, 0x26, 0xd7, 0xfb, 0xc9, 0x33, 0x1b, 0x84, 0x7a,
+	0xb8, 0xe1, 0x70, 0x83, 0x97, 0x06, 0x07, 0x6c, 0x10, 0x8b, 0x50, 0x93, 0x2f, 0x20, 0xa7, 0xe1,
+	0xc6, 0xfb, 0x7e, 0x44, 0xbb, 0xa1, 0x1d, 0xd5, 0xc8, 0x61, 0x93, 0x50, 0x4f, 0xfe, 0x04, 0x5e,
+	0xe8, 0xfb, 0x42, 0x1d, 0xdb, 0xa2, 0x04, 0xed, 0x02, 0x08, 0x5d, 0x9a, 0x96, 0x56, 0xa6, 0x37,
+	0x52, 0x85, 0x25, 0x25, 0xe0, 0x51, 0x42, 0x1e, 0xe5, 0x9e, 0xd5, 0x2a, 0xce, 0x3f, 0x7b, 0x9a,
+	0x4f, 0x0a, 0x05, 0x2d, 0xe2, 0x26, 0xbf, 0x0e, 0xd7, 0x2f, 0xeb, 0xf3, 0x85, 0xd1, 0x2a, 0xcc,
+	0x09, 0xb3, 0x8a, 0xa9, 0xa7, 0xa5, 0x15, 0x69, 0x23, 0xae, 0xa5, 0xc4, 0xbb, 0xb2, 0x2e, 0x3f,
+	0xe8, 0xa5, 0x16, 0x68, 0xf7, 0x20, 0x29, 0x0c, 0x99, 0xe7, 0x98, 0x64, 0x5d, 0x2f, 0x01, 0xb6,
+	0xe7, 0xda, 0x8e, 0x4d, 0x71, 0x9d, 0x5e, 0x01, 0xec, 0x53, 0x0e, 0x16, 0xf1, 0xe5, 0x60, 0x7b,
+	0x90, 0x74, 0xc2, 0x97, 0x3c, 0x65, 0x9b, 0xca, 0xc0, 0xf3, 0xa6, 0x5c, 0x52, 0x08, 0x05, 0x8a,
+	0xf1, 0xf3, 0x76, 0x6e, 0x4a, 0xeb, 0x8a, 0xc8, 0xb7, 0x61, 0xa9, 0xc7, 0x32, 0xc0, 0xcc, 0x41,
+	0x2a, 0x34, 0xea, 0x52, 0x42, 0xf8, 0xaa, 0xac, 0xcb, 0x5f, 0xc4, 0x7a, 0x22, 0x14, 0x90, 0x0f,
+	0x61, 0xce, 0x69, 0x56, 0x2b, 0xa1, 0xed, 0xd0, 0x04, 0xe6, 0x3b, 0xed, 0x5c, 0x6a, 0xaf, 0x59,
+	0x0d, 0x45, 0x9e, 0x3d, 0xcd, 0x67, 0xf8, 0x79, 0x37, 0xec, 0x23, 0x11, 0xcc, 0xae, 0x6d, 0x79,
+	0xc4, 0xf2, 0xb4, 0x94, 0xd3, 0x35, 0x45, 0x37, 0x20, 0x66, 0xea, 0xe9, 0x98, 0x4f, 0x56, 0x9c,
+	0xed, 0xb4, 0x73, 0xb1, 0x72, 0x49, 0x8b, 0x99, 0x3a, 0x2a, 0xf4, 0x64, 0x78, 0x9a, 0x59, 0xfc,
+	0xcf, 0x5f, 0x49, 0x6c, 0x55, 0xb9, 0x74, 0x29, 0xe5, 0xe8, 0x4d, 0x48, 0xe8, 0x04, 0xeb, 0x75,
+	0xd3, 0x22, 0xe9, 0x38, 0xe3, 0xcd, 0xf4, 0xf1, 0xee, 0x87, 0x57, 0xa3, 0x98, 0xf0, 0xb3, 0xf8,
+	0xe4, 0xcf, 0x9c, 0xa4, 0x09, 0x2f, 0xf9, 0x26, 0x64, 0x58, 0x3a, 0xde, 0x23, 0x27, 0x5e, 0x88,
+	0x58, 0x2e, 0x85, 0xf7, 0xe0, 0x01, 0xbc, 0x38, 0xf0, 0x2b, 0x4f, 0xd9, 0x5d, 0x58, 0xb4, 0xc8,
+	0x89, 0x57, 0xe9, 0x4b, 0x79, 0x11, 0x75, 0xda, 0xb9, 0x85, 0x1e, 0xaf, 0x05, 0x2b, 0xfa, 0xac,
+	0xcb, 0x9f, 0xc1, 0xff, 0x99, 0xf8, 0x47, 0xb6, 0x27, 0x6e, 0xde, 0xc8, 0x0d, 0x44, 0xf7, 0x01,
+	0xba, 0x85, 0x87, 0xa5, 0x31, 0x55, 0x58, 0x53, 0x78, 0xf2, 0xfd, 0x2a, 0xa5, 0x04, 0x55, 0x2d,
+	0xdc, 0x83, 0x3d, 0x6c, 0x84, 0xb7, 0x4b, 0x8b, 0x78, 0xca, 0x3f, 0x4b, 0x80, 0xa2, 0xcb, 0xf3,
+	0x90, 0x4a, 0x30, 0x73, 0xe4, 0xbf, 0xe0, 0xc7, 0x74, 0x63, 0xd8, 0x31, 0xf5, 0x3d, 0x7b, 0x8e,
+	0x68, 0xe0, 0x8c, 0xde, 0x1e, 0x00, 0xb9, 0x3e, 0x12, 0x32, 0x50, 0xba, 0x44, 0x59, 0x86, 0xc5,
+	0xc8, 0x52, 0x63, 0xa6, 0x68, 0x29, 0x88, 0xc1, 0x65, 0x0b, 0x27, 0x03, 0x26, 0x57, 0xfe, 0x4e,
+	0x8a, 0xe4, 0x5b, 0xc4, 0xab, 0x0e, 0x10, 0x2b, 0x2e, 0x74, 0xda, 0x39, 0x88, 0xec, 0xdc, 0x48,
+	0x71, 0x74, 0x17, 0x92, 0xfe, 0x9f, 0x8a, 0xd7, 0x72, 0x08, 0x3b, 0xb9, 0x0b, 0x85, 0xdc, 0x7f,
+	0xa4, 0xce, 0x5f, 0x7e, 0xbf, 0xe5, 0x10, 0x2d, 0x71, 0xc4, 0xff, 0xc9, 0xaf, 0x71, 0xb2, 0x7d,
+	0x5c, 0xaf, 0xb7, 0xc6, 0xbe, 0xca, 0xbf, 0xc6, 0xf9, 0x0e, 0x72, 0xb7, 0x49, 0x23, 0x7a, 0x17,
+	0x92, 0x2d, 0x42, 0x2b, 0xc1, 0xb6, 0xb3, 0xa8, 0x8a, 0x8a, 0xbf, 0x99, 0x7f, 0xb4, 0x73, 0x6b,
+	0x86, 0xe9, 0x1d, 0x34, 0xab, 0x7e, 0x14, 0xbc, 0x9f, 0xf1, 0x9f, 0x3c, 0xd5, 0x1f, 0xa9, 0x7e,
+	0xb0, 0x54, 0x29, 0x91, 0x9a, 0x96, 0x68, 0x11, 0xca, 0xce, 0x11, 0x2a, 0x43, 0xc2, 0xb2, 0xb9,
+	0xd6, 0xf4, 0x44, 0x5a, 0xd7, 0x2c, 0x3b, 0x90, 0xfa, 0x00, 0xe6, 0x6b, 0x4d, 0xd7, 0x25, 0x96,
+	0xc7, 0xf5, 0xe2, 0x13, 0xe9, 0xcd, 0x71, 0x91, 0x40, 0xf4, 0x43, 0x58, 0x70, 0x6c, 0x4a, 0xcd,
+	0x6a, 0x9d, 0x70, 0xd5, 0x99, 0x89, 0x54, 0xe7, 0x43, 0x15, 0x21, 0x1b, 0xec, 0xff, 0x81, 0x4b,
+	0xe8, 0x81, 0x5d, 0xd7, 0xd3, 0xb3, 0x93, 0xc9, 0xb2, 0x33, 0x11, 0x8a, 0xa0, 0xfb, 0x30, 0x7b,
+	0xd8, 0xb4, 0xdd, 0x66, 0x23, 0x7d, 0x6d, 0x22, 0x39, 0xee, 0x2d, 0xbf, 0xc5, 0x8b, 0xbe, 0x86,
+	0x8f, 0xf7, 0xb0, 0x8b, 0x1b, 0xa2, 0xdc, 0x64, 0x20, 0x41, 0x9b, 0x55, 0xea, 0xe0, 0x5a, 0xd0,
+	0x31, 0x93, 0x9a, 0x78, 0x46, 0x8b, 0x30, 0xfd, 0x88, 0xb4, 0xf8, 0x39, 0xf7, 0xff, 0xca, 0x3b,
+	0xbc, 0xc3, 0x45, 0x64, 0xf8, 0xa1, 0x5b, 0x86, 0x84, 0x8b, 0x8f, 0x2b, 0x3a, 0xf6, 0x30, 0xd7,
+	0xb9, 0xe6, 0xe2, 0xe3, 0x12, 0xf6, 0x70, 0xe1, 0xcb, 0x14, 0xcc, 0x30, 0x2f, 0xf4, 0xad, 0x04,
+	0xd0, 0x9d, 0x28, 0x50, 0x7e, 0x58, 0x6d, 0xe9, 0x9b, 0x49, 0x32, 0xca, 0xb8, 0xe6, 0x01, 0x92,
+	0xbc, 0xf1, 0xf9, 0x6f, 0xff, 0x7c, 0x13, 0x93, 0xd1, 0x8a, 0xba, 0x65, 0x0c, 0x18, 0x85, 0xba,
+	0xd3, 0x08, 0xfa, 0x49, 0x82, 0xee, 0x34, 0x80, 0x36, 0xc7, 0x5a, 0x27, 0xa4, 0xca, 0x8f, 0x69,
+	0xcd, 0xa1, 0x6e, 0x33, 0xa8, 0x6d, 0xa4, 0x8e, 0x82, 0x52, 0x4f, 0xa3, 0xcd, 0xf0, 0x0c, 0x7d,
+	0x25, 0x41, 0x52, 0x0c, 0x16, 0x68, 0xac, 0xe9, 0x81, 0x8e, 0xc5, 0xd8, 0x37, 0xad, 0xc8, 0xeb,
+	0x8c, 0x71, 0x15, 0xe5, 0x06, 0x33, 0x8a, 0x21, 0x04, 0xfd, 0x20, 0x41, 0x42, 0xb4, 0xf5, 0x57,
+	0xc7, 0x1b, 0x68, 0x02, 0xa2, 0x2b, 0x4d, 0x3f, 0xf2, 0x2d, 0x06, 0xa4, 0xa2, 0xfc, 0x08, 0x20,
+	0xf5, 0x34, 0x52, 0xf8, 0xce, 0xd0, 0x2f, 0x12, 0xf4, 0xb4, 0x60, 0xb4, 0x3d, 0x6c, 0xdd, 0x81,
+	0x23, 0x40, 0xa6, 0x70, 0x15, 0x17, 0x0e, 0xac, 0x30, 0xe0, 0x0d, 0xb4, 0x36, 0x18, 0xd8, 0x9f,
+	0x03, 0xf2, 0x21, 0x6a, 0xde, 0xd4, 0xd1, 0xf7, 0x12, 0xcc, 0x04, 0x75, 0x64, 0x64, 0xbf, 0x15,
+	0x9b, 0xfa, 0xf2, 0x18, 0x96, 0x1c, 0xe7, 0x0e, 0xc3, 0xb9, 0x85, 0x76, 0xae, 0x94, 0x3f, 0x35,
+	0x68, 0xe5, 0x3f, 0x4a, 0x10, 0xf7, 0xe5, 0xd0, 0xfa, 0xe8, 0x51, 0x20, 0x20, 0x1b, 0x7b, 0x66,
+	0x90, 0x77, 0x19, 0xd8, 0x1b, 0xe8, 0xce, 0x04, 0x60, 0xea, 0x29, 0xeb, 0xbc, 0x67, 0x2c, 0x79,
+	0xac, 0x03, 0x0e, 0x4f, 0x5e, 0xb4, 0xb7, 0x0e, 0x4f, 0xde, 0xa5, 0x76, 0x3a, 0x69, 0xf2, 0x3c,
+	0x46, 0xf4, 0xb5, 0x04, 0x49, 0x51, 0x2c, 0x87, 0xdf, 0xda, 0xde, 0xd2, 0x3c, 0xfc, 0xd6, 0xf6,
+	0x55, 0xe0, 0x51, 0xe5, 0xce, 0xc5, 0xc7, 0x79, 0x87, 0x79, 0x14, 0xdf, 0x39, 0xff, 0x3b, 0x3b,
+	0x75, 0xde, 0xc9, 0x4a, 0xcf, 0x3b, 0x59, 0xe9, 0xaf, 0x4e, 0x56, 0x7a, 0x72, 0x91, 0x9d, 0x7a,
+	0x7e, 0x91, 0x9d, 0xfa, 0xfd, 0x22, 0x3b, 0xf5, 0xf1, 0x66, 0xa4, 0xb5, 0x6c, 0x19, 0x75, 0x5c,
+	0xa5, 0xea, 0x96, 0x91, 0xaf, 0x1d, 0x60, 0xd3, 0x52, 0x4f, 0x22, 0xc2, 0xac, 0xc9, 0x54, 0x67,
+	0xd9, 0x98, 0xbd, 0xf3, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xbe, 0xe5, 0xfd, 0x61, 0x0f,
 	0x00, 0x00,
 }
 
diff --git a/x/committee/types/query.pb.gw.go b/x/committee/types/query.pb.gw.go
index e519de19..bd6bf7ac 100644
--- a/x/committee/types/query.pb.gw.go
+++ b/x/committee/types/query.pb.gw.go
@@ -889,23 +889,23 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Committees_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "committee", "v1beta1", "committees"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Committees_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "committee", "v1beta1", "committees"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Committee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "committee", "v1beta1", "committees", "committee_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Committee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "committee", "v1beta1", "committees", "committee_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Proposals_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "committee", "v1beta1", "proposals"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Proposals_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "committee", "v1beta1", "proposals"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Proposal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "committee", "v1beta1", "proposals", "proposal_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Proposal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "committee", "v1beta1", "proposals", "proposal_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_NextProposalID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "committee", "v1beta1", "next-proposal-id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_NextProposalID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "committee", "v1beta1", "next-proposal-id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Votes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"0g-chain", "committee", "v1beta1", "proposals", "proposal_id", "votes"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Votes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"0g", "committee", "v1beta1", "proposals", "proposal_id", "votes"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Vote_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"0g-chain", "committee", "v1beta1", "proposals", "proposal_id", "votes", "voter"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Vote_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"0g", "committee", "v1beta1", "proposals", "proposal_id", "votes", "voter"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Tally_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"0g-chain", "committee", "v1beta1", "proposals", "proposal_id", "tally"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Tally_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"0g", "committee", "v1beta1", "proposals", "proposal_id", "tally"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_RawParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "committee", "v1beta1", "raw-params"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_RawParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "committee", "v1beta1", "raw-params"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/evmutil/keeper/bank_keeper.go b/x/evmutil/keeper/bank_keeper.go
index d978da2b..d360f55b 100644
--- a/x/evmutil/keeper/bank_keeper.go
+++ b/x/evmutil/keeper/bank_keeper.go
@@ -26,15 +26,15 @@ var _ evmtypes.BankKeeper = EvmBankKeeper{}
 // extra percision needed by the evm.
 type EvmBankKeeper struct {
 	baseKeeper Keeper
-	bk          types.BankKeeper
-	ak          types.AccountKeeper
+	bk         types.BankKeeper
+	ak         types.AccountKeeper
 }
 
 func NewEvmBankKeeper(baseKeeper Keeper, bk types.BankKeeper, ak types.AccountKeeper) EvmBankKeeper {
 	return EvmBankKeeper{
 		baseKeeper: baseKeeper,
-		bk:          bk,
-		ak:          ak,
+		bk:         bk,
+		ak:         ak,
 	}
 }
 
diff --git a/x/evmutil/keeper/bank_keeper_test.go b/x/evmutil/keeper/bank_keeper_test.go
index 37912a65..99132d66 100644
--- a/x/evmutil/keeper/bank_keeper_test.go
+++ b/x/evmutil/keeper/bank_keeper_test.go
@@ -1,22 +1,21 @@
 package keeper_test
 
 import (
+	"math/big"
 	"testing"
 	"time"
 
 	sdkmath "cosmossdk.io/math"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/suite"
-	tmtime "github.com/tendermint/tendermint/types/time"
-
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
-
 	"github.com/0glabs/0g-chain/chaincfg"
 	"github.com/0glabs/0g-chain/x/evmutil/keeper"
 	"github.com/0glabs/0g-chain/x/evmutil/testutil"
 	"github.com/0glabs/0g-chain/x/evmutil/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
+	"github.com/stretchr/testify/suite"
+	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
 type evmBankKeeperTestSuite struct {
@@ -47,9 +46,8 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance_ReturnsSpendable() {
 
 	ctx := suite.Ctx.WithBlockTime(now.Add(12 * time.Hour))
 	coin = suite.EvmBankKeeper.GetBalance(ctx, suite.Addrs[0], chaincfg.BaseDenom)
-	suite.Require().Equal(sdkmath.NewIntFromUint64(5_000_000_000_100), coin.Amount)
+	suite.Require().Equal(sdkmath.NewIntFromUint64(5_000_000_000_000_000_100), coin.Amount)
 }
-
 func (suite *evmBankKeeperTestSuite) TestGetBalance_NotEvmDenom() {
 	suite.Require().Panics(func() {
 		suite.EvmBankKeeper.GetBalance(suite.Ctx, suite.Addrs[0], chaincfg.DisplayDenom)
@@ -58,7 +56,6 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance_NotEvmDenom() {
 		suite.EvmBankKeeper.GetBalance(suite.Ctx, suite.Addrs[0], "busd")
 	})
 }
-
 func (suite *evmBankKeeperTestSuite) TestGetBalance() {
 	tests := []struct {
 		name           string
@@ -71,7 +68,7 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance() {
 				sdk.NewInt64Coin(chaincfg.BaseDenom, 100),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 10),
 			),
-			sdkmath.NewInt(10_000_000_000_100),
+			sdk.NewIntFromBigInt(makeBigIntByString("10000000000000000100")),
 		},
 		{
 			"just neuron",
@@ -87,7 +84,7 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance() {
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 10),
 				sdk.NewInt64Coin("busd", 100),
 			),
-			sdkmath.NewInt(10_000_000_000_000),
+			sdk.NewIntFromBigInt(makeBigIntByString("10000000000000000000")),
 		},
 		{
 			"no a0gi or neuron",
@@ -97,10 +94,10 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance() {
 		{
 			"with avaka that is more than 1 a0gi",
 			sdk.NewCoins(
-				sdk.NewInt64Coin(chaincfg.BaseDenom, 20_000_000_000_220),
+				sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("20000000000000000220"))),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 11),
 			),
-			sdkmath.NewInt(31_000_000_000_220),
+			sdk.NewIntFromBigInt(makeBigIntByString("31000000000000000220")),
 		},
 	}
 
@@ -114,7 +111,6 @@ func (suite *evmBankKeeperTestSuite) TestGetBalance() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 	startingModuleCoins := sdk.NewCoins(
 		sdk.NewInt64Coin(chaincfg.BaseDenom, 200),
@@ -129,7 +125,7 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 	}{
 		{
 			"send more than 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_000_000_000_010)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12000000000000000010")))),
 			sdk.Coins{},
 			sdk.NewCoins(
 				sdk.NewInt64Coin(chaincfg.BaseDenom, 10),
@@ -149,10 +145,10 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 		},
 		{
 			"send an exact amount of a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 98_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("98000000000000000000")))),
 			sdk.Coins{},
 			sdk.NewCoins(
-				sdk.NewInt64Coin(chaincfg.BaseDenom, 0o0),
+				sdk.NewInt64Coin(chaincfg.BaseDenom, 0),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 98),
 			),
 			false,
@@ -176,36 +172,36 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 		},
 		{
 			"errors if not enough total neuron to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_001_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("100000000000000001000")))),
 			sdk.Coins{},
 			sdk.Coins{},
 			true,
 		},
 		{
 			"errors if not enough a0gi to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 200_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("200000000000000000000")))),
 			sdk.Coins{},
 			sdk.Coins{},
 			true,
 		},
 		{
 			"converts receiver's neuron to a0gi if there's enough neuron after the transfer",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 99_000_000_000_200)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("99000000000200000000")))),
 			sdk.NewCoins(
-				sdk.NewInt64Coin(chaincfg.BaseDenom, 999_999_999_900),
+				sdk.NewInt64Coin(chaincfg.BaseDenom, 999_999_999_900_000_000),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 1),
 			),
 			sdk.NewCoins(
-				sdk.NewInt64Coin(chaincfg.BaseDenom, 100),
+				sdk.NewInt64Coin(chaincfg.BaseDenom, 100000000),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 101),
 			),
 			false,
 		},
 		{
 			"converts all of receiver's neuron to a0gi even if somehow receiver has more than 1a0gi of neuron",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_000_000_000_100)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12000000000000000100")))),
 			sdk.NewCoins(
-				sdk.NewInt64Coin(chaincfg.BaseDenom, 5_999_999_999_990),
+				sdk.NewInt64Coin(chaincfg.BaseDenom, 5_999_999_999_999_999_990),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 1),
 			),
 			sdk.NewCoins(
@@ -216,7 +212,7 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 		},
 		{
 			"swap 1 a0gi for neuron if module account doesn't have enough neuron",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 99_000_000_001_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("99000000000000001000")))),
 			sdk.NewCoins(
 				sdk.NewInt64Coin(chaincfg.BaseDenom, 200),
 				sdk.NewInt64Coin(chaincfg.DisplayDenom, 1),
@@ -257,7 +253,6 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromModuleToAccount() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestSendCoinsFromAccountToModule() {
 	startingAccCoins := sdk.NewCoins(
 		sdk.NewInt64Coin(chaincfg.BaseDenom, 200),
@@ -275,7 +270,7 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromAccountToModule() {
 	}{
 		{
 			"send more than 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_000_000_000_010)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12000000000000000010")))),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 190), sdk.NewInt64Coin(chaincfg.DisplayDenom, 88)),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_010), sdk.NewInt64Coin(chaincfg.DisplayDenom, 12)),
 			false,
@@ -289,7 +284,7 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromAccountToModule() {
 		},
 		{
 			"send an exact amount of a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 98_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("98000000000000000000")))),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 200), sdk.NewInt64Coin(chaincfg.DisplayDenom, 2)),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_000), sdk.NewInt64Coin(chaincfg.DisplayDenom, 98)),
 			false,
@@ -320,30 +315,30 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromAccountToModule() {
 		},
 		{
 			"errors if not enough total neuron to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_001_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("100000000001000000000")))),
 			sdk.Coins{},
 			sdk.Coins{},
 			true,
 		},
 		{
 			"errors if not enough a0gi to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 200_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("200000000000000000000")))),
 			sdk.Coins{},
 			sdk.Coins{},
 			true,
 		},
 		{
 			"converts 1 a0gi to neuron if not enough neuron to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 99_001_000_000_000)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 999_000_000_200), sdk.NewInt64Coin(chaincfg.DisplayDenom, 0)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 101_000_000_000), sdk.NewInt64Coin(chaincfg.DisplayDenom, 99)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("99001000000000000000")))),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 999_000_000_000_000_200), sdk.NewInt64Coin(chaincfg.DisplayDenom, 0)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 1_000_100_000_000_000), sdk.NewInt64Coin(chaincfg.DisplayDenom, 99)),
 			false,
 		},
 		{
 			"converts receiver's neuron to a0gi if there's enough neuron after the transfer",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 5_900_000_000_200)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_000), sdk.NewInt64Coin(chaincfg.DisplayDenom, 94)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 200), sdk.NewInt64Coin(chaincfg.DisplayDenom, 6)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 5_900_000_000_000_000_200)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_000_000_000_000_000), sdk.NewInt64Coin(chaincfg.DisplayDenom, 94)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 900_000_100_000_000_200), sdk.NewInt64Coin(chaincfg.DisplayDenom, 5)),
 			false,
 		},
 	}
@@ -377,24 +372,23 @@ func (suite *evmBankKeeperTestSuite) TestSendCoinsFromAccountToModule() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestBurnCoins() {
 	startingA0gi := sdkmath.NewInt(100)
 	tests := []struct {
-		name       string
-		burnCoins  sdk.Coins
+		name        string
+		burnCoins   sdk.Coins
 		expA0gi     sdkmath.Int
 		expNeuron   sdkmath.Int
-		hasErr     bool
+		hasErr      bool
 		neuronStart sdkmath.Int
 	}{
 		{
 			"burn more than 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_021_000_000_002)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12021000000002000000")))),
 			sdkmath.NewInt(88),
-			sdkmath.NewInt(100_000_000_000),
+			sdkmath.NewInt(100_000_000_000_000_000),
 			false,
-			sdkmath.NewInt(121_000_000_002),
+			sdk.NewIntFromBigInt(makeBigIntByString("121000000002000000")),
 		},
 		{
 			"burn less than 1 a0gi",
@@ -406,7 +400,7 @@ func (suite *evmBankKeeperTestSuite) TestBurnCoins() {
 		},
 		{
 			"burn an exact amount of a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 98_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("98000000000000000000")))),
 			sdkmath.NewInt(2),
 			sdkmath.NewInt(10),
 			false,
@@ -449,15 +443,15 @@ func (suite *evmBankKeeperTestSuite) TestBurnCoins() {
 		},
 		{
 			"errors if not enough neuron to cover burn",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 100_999_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("100999000000000000000")))),
 			sdkmath.NewInt(0),
-			sdkmath.NewInt(99_000_000_000),
+			sdkmath.NewInt(99_000_000_000_000_000),
 			true,
-			sdkmath.NewInt(99_000_000_000),
+			sdkmath.NewInt(99_000_000_000_000_000),
 		},
 		{
 			"errors if not enough a0gi to cover burn",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 200_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("200000000000000000000")))),
 			sdkmath.NewInt(100),
 			sdk.ZeroInt(),
 			true,
@@ -465,11 +459,11 @@ func (suite *evmBankKeeperTestSuite) TestBurnCoins() {
 		},
 		{
 			"converts 1 a0gi to neuron if not enough neuron to cover",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_021_000_000_002)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12021000000002000000")))),
 			sdkmath.NewInt(87),
-			sdkmath.NewInt(980_000_000_000),
+			sdkmath.NewInt(980_000_000_000_000_000),
 			false,
-			sdkmath.NewInt(1_000_000_002),
+			sdkmath.NewInt(1_000_000_002_000_000),
 		},
 	}
 
@@ -500,21 +494,20 @@ func (suite *evmBankKeeperTestSuite) TestBurnCoins() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestMintCoins() {
 	tests := []struct {
-		name       string
-		mintCoins  sdk.Coins
+		name        string
+		mintCoins   sdk.Coins
 		a0gi        sdkmath.Int
 		neuron      sdkmath.Int
-		hasErr     bool
+		hasErr      bool
 		neuronStart sdkmath.Int
 	}{
 		{
 			"mint more than 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_021_000_000_002)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12021000000002000000")))),
 			sdkmath.NewInt(12),
-			sdkmath.NewInt(21_000_000_002),
+			sdkmath.NewInt(21_000_000_002_000_000),
 			false,
 			sdk.ZeroInt(),
 		},
@@ -528,7 +521,7 @@ func (suite *evmBankKeeperTestSuite) TestMintCoins() {
 		},
 		{
 			"mint an exact amount of a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 123_000_000_000_000_000)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("123000000000000000000000")))),
 			sdkmath.NewInt(123_000),
 			sdk.ZeroInt(),
 			false,
@@ -571,7 +564,7 @@ func (suite *evmBankKeeperTestSuite) TestMintCoins() {
 		},
 		{
 			"adds to existing neuron balance",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 12_021_000_000_002)),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("12000000021000000002")))),
 			sdkmath.NewInt(12),
 			sdkmath.NewInt(21_000_000_102),
 			false,
@@ -579,11 +572,11 @@ func (suite *evmBankKeeperTestSuite) TestMintCoins() {
 		},
 		{
 			"convert neuron balance to a0gi if it exceeds 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 10_999_000_000_000)),
-			sdkmath.NewInt(12),
-			sdkmath.NewInt(1_200_000_001),
+			sdk.NewCoins(sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("10000000999000000000")))),
+			sdkmath.NewInt(11),
+			sdkmath.NewInt(1_001_200_000_001),
 			false,
-			sdkmath.NewInt(1_002_200_000_001),
+			sdkmath.NewIntFromBigInt(makeBigIntByString("1000000002200000001")),
 		},
 	}
 
@@ -668,7 +661,7 @@ func (suite *evmBankKeeperTestSuite) TestConvertOneA0giToNeuronIfNeeded() {
 		{
 			"converts 1 a0gi to neuron",
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 10), sdk.NewInt64Coin(chaincfg.BaseDenom, 100)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 9), sdk.NewInt64Coin(chaincfg.BaseDenom, 1_000_000_000_100)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 9), sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("1000000000000000100")))),
 			true,
 		},
 		{
@@ -702,7 +695,6 @@ func (suite *evmBankKeeperTestSuite) TestConvertOneA0giToNeuronIfNeeded() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestConvertNeuronToA0gi() {
 	tests := []struct {
 		name          string
@@ -716,13 +708,13 @@ func (suite *evmBankKeeperTestSuite) TestConvertNeuronToA0gi() {
 		},
 		{
 			"converts neuron for 1 a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 10), sdk.NewInt64Coin(chaincfg.BaseDenom, 1_000_000_000_003)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 11), sdk.NewInt64Coin(chaincfg.BaseDenom, 3)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 10), sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("1000000000003000000")))),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 11), sdk.NewInt64Coin(chaincfg.BaseDenom, 3_000_000)),
 		},
 		{
 			"converts more than 1 a0gi of neuron",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 10), sdk.NewInt64Coin(chaincfg.BaseDenom, 8_000_000_000_123)),
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 18), sdk.NewInt64Coin(chaincfg.BaseDenom, 123)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 10), sdk.NewCoin(chaincfg.BaseDenom, sdk.NewIntFromBigInt(makeBigIntByString("8000000000123000000")))),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 18), sdk.NewInt64Coin(chaincfg.BaseDenom, 123_000_000)),
 		},
 	}
 	for _, tt := range tests {
@@ -741,7 +733,6 @@ func (suite *evmBankKeeperTestSuite) TestConvertNeuronToA0gi() {
 		})
 	}
 }
-
 func (suite *evmBankKeeperTestSuite) TestSplitNeuronCoins() {
 	tests := []struct {
 		name          string
@@ -763,7 +754,7 @@ func (suite *evmBankKeeperTestSuite) TestSplitNeuronCoins() {
 		},
 		{
 			"a0gi & neuron coins",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 8_000_000_000_123)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 8_000_000_000_000_000_123)),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 8), sdk.NewInt64Coin(chaincfg.BaseDenom, 123)),
 			false,
 		},
@@ -775,7 +766,7 @@ func (suite *evmBankKeeperTestSuite) TestSplitNeuronCoins() {
 		},
 		{
 			"only a0gi",
-			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 5_000_000_000_000)),
+			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.BaseDenom, 5_000_000_000_000_000_000)),
 			sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 5)),
 			false,
 		},
@@ -797,3 +788,8 @@ func (suite *evmBankKeeperTestSuite) TestSplitNeuronCoins() {
 func TestEvmBankKeeperTestSuite(t *testing.T) {
 	suite.Run(t, new(evmBankKeeperTestSuite))
 }
+
+func makeBigIntByString(s string) *big.Int {
+	i, _ := new(big.Int).SetString(s, 10)
+	return i
+}
diff --git a/x/evmutil/keeper/invariants_test.go b/x/evmutil/keeper/invariants_test.go
index 41e7b23a..fa73f3d7 100644
--- a/x/evmutil/keeper/invariants_test.go
+++ b/x/evmutil/keeper/invariants_test.go
@@ -191,7 +191,7 @@ func (suite *invariantTestSuite) TestSendToModuleAccountNotAllowed() {
 		ToAddress:   maccAddress.String(),
 		Amount:      coins,
 	})
-	suite.ErrorContains(err, "0g1w9vxuke5dz6hyza2j932qgmxltnfxwl78u920k is not allowed to receive funds: unauthorized")
+	suite.ErrorContains(err, "0g1w9vxuke5dz6hyza2j932qgmxltnfxwl7l7mdnf is not allowed to receive funds: unauthorized")
 }
 
 func (suite *invariantTestSuite) TestCosmosCoinsFullyBackedInvariant() {
diff --git a/x/evmutil/keeper/msg_server_test.go b/x/evmutil/keeper/msg_server_test.go
index 4daf4fe5..74734fb2 100644
--- a/x/evmutil/keeper/msg_server_test.go
+++ b/x/evmutil/keeper/msg_server_test.go
@@ -34,7 +34,7 @@ func TestMsgServerSuite(t *testing.T) {
 }
 
 func (suite *MsgServerSuite) TestConvertCoinToERC20() {
-	invoker, err := sdk.AccAddressFromBech32("0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz")
+	invoker, err := sdk.AccAddressFromBech32("0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8")
 	suite.Require().NoError(err)
 
 	err = suite.App.FundAccount(suite.Ctx, invoker, sdk.NewCoins(sdk.NewCoin("erc20/usdc", sdkmath.NewInt(10000))))
diff --git a/x/evmutil/testutil/suite.go b/x/evmutil/testutil/suite.go
index a32d7814..4447587c 100644
--- a/x/evmutil/testutil/suite.go
+++ b/x/evmutil/testutil/suite.go
@@ -89,7 +89,7 @@ func (suite *Suite) SetupTest() {
 	feemarketGenesis.Params.NoBaseFee = false
 
 	cdc := suite.App.AppCodec()
-	coins := sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 1000_000_000_000_000_000))
+	coins := sdk.NewCoins(sdk.NewInt64Coin(chaincfg.DisplayDenom, 1000_000_000_000))
 	authGS := app.NewFundedGenStateWithSameCoins(cdc, coins, []sdk.AccAddress{
 		sdk.AccAddress(suite.Key1.PubKey().Address()),
 		sdk.AccAddress(suite.Key2.PubKey().Address()),
diff --git a/x/evmutil/types/msg_test.go b/x/evmutil/types/msg_test.go
index 2faa1efd..1dfc6eea 100644
--- a/x/evmutil/types/msg_test.go
+++ b/x/evmutil/types/msg_test.go
@@ -30,7 +30,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 	}{
 		{
 			"valid",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			sdk.NewCoin("erc20/weth", sdkmath.NewInt(1234)),
 			errArgs{
@@ -39,7 +39,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 		},
 		{
 			"invalid - odd length hex address",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc",
 			sdk.NewCoin("erc20/weth", sdkmath.NewInt(1234)),
 			errArgs{
@@ -49,7 +49,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 		},
 		{
 			"invalid - zero amount",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			sdk.NewCoin("erc20/weth", sdkmath.NewInt(0)),
 			errArgs{
@@ -59,7 +59,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 		},
 		{
 			"invalid - negative amount",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			// Create manually so there is no validation
 			sdk.Coin{Denom: "erc20/weth", Amount: sdkmath.NewInt(-1234)},
@@ -70,7 +70,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 		},
 		{
 			"invalid - empty denom",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			sdk.Coin{Denom: "", Amount: sdkmath.NewInt(-1234)},
 			errArgs{
@@ -80,7 +80,7 @@ func TestMsgConvertCoinToERC20(t *testing.T) {
 		},
 		{
 			"invalid - invalid denom",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			sdk.Coin{Denom: "h", Amount: sdkmath.NewInt(-1234)},
 			errArgs{
@@ -127,7 +127,7 @@ func TestMsgConvertERC20ToCoin(t *testing.T) {
 	}{
 		{
 			"valid",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			"0x404F9466d758eA33eA84CeBE9E444b06533b369e",
 			sdkmath.NewInt(1234),
@@ -137,7 +137,7 @@ func TestMsgConvertERC20ToCoin(t *testing.T) {
 		},
 		{
 			"invalid - odd length hex address",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc",
 			"0x404F9466d758eA33eA84CeBE9E444b06533b369e",
 			sdkmath.NewInt(1234),
@@ -148,7 +148,7 @@ func TestMsgConvertERC20ToCoin(t *testing.T) {
 		},
 		{
 			"invalid - zero amount",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			"0x404F9466d758eA33eA84CeBE9E444b06533b369e",
 			sdkmath.NewInt(0),
@@ -159,7 +159,7 @@ func TestMsgConvertERC20ToCoin(t *testing.T) {
 		},
 		{
 			"invalid - negative amount",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			"0x404F9466d758eA33eA84CeBE9E444b06533b369e",
 			sdkmath.NewInt(-1234),
@@ -170,7 +170,7 @@ func TestMsgConvertERC20ToCoin(t *testing.T) {
 		},
 		{
 			"invalid - invalid contract address",
-			"0g123fxg0l602etulhhcdm0vt7l57qya5wjcrwhzz",
+			"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 			"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 			"0x404F9466d758eA33eA84CeBE9E444b06533b369",
 			sdkmath.NewInt(1234),
diff --git a/x/evmutil/types/query.pb.go b/x/evmutil/types/query.pb.go
index bda88ae5..70c14be6 100644
--- a/x/evmutil/types/query.pb.go
+++ b/x/evmutil/types/query.pb.go
@@ -271,42 +271,42 @@ func init() {
 func init() { proto.RegisterFile("zgc/evmutil/v1beta1/query.proto", fileDescriptor_f7cba1d0f1a293ad) }
 
 var fileDescriptor_f7cba1d0f1a293ad = []byte{
-	// 546 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x41,
-	0x14, 0xdf, 0x8d, 0x1a, 0xcd, 0xa4, 0x5e, 0xa6, 0x45, 0x4a, 0x22, 0x9b, 0x76, 0x05, 0x13, 0x0a,
-	0xee, 0xa4, 0xf1, 0xa2, 0x45, 0x41, 0x93, 0xa8, 0x78, 0x10, 0xea, 0x1e, 0x3c, 0x78, 0x09, 0x93,
-	0xdd, 0x61, 0xba, 0x90, 0xcc, 0x6c, 0x76, 0x26, 0xc5, 0xe4, 0x28, 0x08, 0x1e, 0x05, 0xbf, 0x40,
-	0x3e, 0x4e, 0x8f, 0x05, 0x2f, 0x22, 0x52, 0x24, 0xf1, 0xe0, 0x49, 0xbf, 0x82, 0x64, 0x66, 0xd2,
-	0x44, 0xba, 0xdb, 0x80, 0xb7, 0xe1, 0xcd, 0xef, 0xcd, 0xef, 0xcf, 0x7b, 0xbb, 0xa0, 0x32, 0xa6,
-	0x01, 0x22, 0xc7, 0xfd, 0xa1, 0x8c, 0x7a, 0xe8, 0x78, 0xbf, 0x4b, 0x24, 0xde, 0x47, 0x83, 0x21,
-	0x49, 0x46, 0x5e, 0x9c, 0x70, 0xc9, 0xe1, 0xe6, 0x98, 0x06, 0x9e, 0x01, 0x78, 0x06, 0x50, 0xda,
-	0x0b, 0xb8, 0xe8, 0x73, 0x81, 0xba, 0x58, 0x10, 0x8d, 0x3e, 0xef, 0x8d, 0x31, 0x8d, 0x18, 0x96,
-	0x11, 0x67, 0xfa, 0x81, 0xd2, 0x16, 0xe5, 0x94, 0xab, 0x23, 0x9a, 0x9f, 0x4c, 0xf5, 0x36, 0xe5,
-	0x9c, 0xf6, 0x08, 0xc2, 0x71, 0x84, 0x30, 0x63, 0x5c, 0xaa, 0x16, 0x61, 0x6e, 0x77, 0xd3, 0x54,
-	0x51, 0xc2, 0x88, 0x88, 0x0c, 0xc4, 0xdd, 0x02, 0xf0, 0xf5, 0x9c, 0xf8, 0x10, 0x27, 0xb8, 0x2f,
-	0x7c, 0x32, 0x18, 0x12, 0x21, 0xdd, 0x43, 0xb0, 0xf9, 0x4f, 0x55, 0xc4, 0x9c, 0x09, 0x02, 0x1f,
-	0x82, 0x7c, 0xac, 0x2a, 0xdb, 0xf6, 0x8e, 0x5d, 0x2b, 0x36, 0xca, 0x5e, 0x8a, 0x2b, 0x4f, 0x37,
-	0x35, 0xaf, 0x9e, 0x9c, 0x55, 0x2c, 0xdf, 0x34, 0xb8, 0x13, 0x1b, 0x54, 0xd5, 0x93, 0x6d, 0x12,
-	0xf7, 0xf8, 0x88, 0x84, 0x2d, 0x65, 0xbd, 0xc5, 0x23, 0xd6, 0xe2, 0x4c, 0x26, 0x38, 0x90, 0x0b,
-	0x76, 0x78, 0x07, 0xdc, 0xd4, 0xc1, 0x74, 0x42, 0xc2, 0xb8, 0x62, 0xbb, 0x52, 0x2b, 0xf8, 0x1b,
-	0xba, 0xd8, 0x56, 0x35, 0xf8, 0x1c, 0x80, 0x65, 0x46, 0xdb, 0x39, 0xa5, 0xe7, 0xae, 0xa7, 0x21,
-	0xde, 0x3c, 0x50, 0x4f, 0xc7, 0xbf, 0x54, 0x45, 0x89, 0x21, 0xf0, 0x57, 0x3a, 0x0f, 0x6e, 0x7c,
-	0x9c, 0x54, 0xac, 0x5f, 0x93, 0x8a, 0xe5, 0xfe, 0xb1, 0x41, 0x6d, 0xbd, 0x44, 0x13, 0xc5, 0x18,
-	0x38, 0xa1, 0x81, 0x75, 0x8c, 0xd8, 0x80, 0x47, 0xac, 0x13, 0x2c, 0x90, 0x4a, 0x74, 0xb1, 0x81,
-	0x52, 0x23, 0xca, 0x66, 0x30, 0xb1, 0x95, 0xc3, 0x6c, 0x0d, 0xf0, 0x45, 0x8a, 0xf5, 0xea, 0x5a,
-	0xeb, 0x5a, 0xf8, 0xaa, 0x77, 0x77, 0x00, 0x4a, 0xd9, 0x4a, 0xe0, 0x2e, 0xd8, 0x58, 0x1d, 0x83,
-	0x9a, 0x79, 0xc1, 0x2f, 0xae, 0x4c, 0x01, 0xd6, 0xc1, 0x75, 0x1c, 0x86, 0x09, 0x11, 0x42, 0xc9,
-	0x28, 0x34, 0x6f, 0x7d, 0x3b, 0xab, 0xc0, 0x97, 0x4c, 0x92, 0x84, 0xe1, 0xde, 0xb3, 0x37, 0xaf,
-	0x9e, 0xea, 0x5b, 0x7f, 0x01, 0x6b, 0xfc, 0xce, 0x81, 0x6b, 0x2a, 0x64, 0xf8, 0xc1, 0x06, 0x79,
-	0xbd, 0x2a, 0xb0, 0x9a, 0x1a, 0xd2, 0xc5, 0xbd, 0x2c, 0xd5, 0xd6, 0x03, 0xb5, 0x4d, 0xb7, 0xf6,
-	0xfe, 0xcb, 0xcf, 0xcf, 0x39, 0x17, 0xee, 0xa0, 0x3a, 0xbd, 0x17, 0x1c, 0xe1, 0x88, 0x5d, 0xf8,
-	0x10, 0xf4, 0x66, 0xc2, 0xef, 0x36, 0x28, 0x5f, 0x32, 0x71, 0xf8, 0x28, 0x9b, 0x73, 0xfd, 0x2e,
-	0x97, 0x1e, 0xff, 0x67, 0xb7, 0xb1, 0xf1, 0x44, 0xd9, 0x38, 0x80, 0x0f, 0xb2, 0x6d, 0x5c, 0xbe,
-	0x86, 0xcd, 0xf6, 0xc9, 0xd4, 0xb1, 0x4f, 0xa7, 0x8e, 0xfd, 0x63, 0xea, 0xd8, 0x9f, 0x66, 0x8e,
-	0x75, 0x3a, 0x73, 0xac, 0xaf, 0x33, 0xc7, 0x7a, 0xbb, 0x47, 0x23, 0x79, 0x34, 0xec, 0x7a, 0x01,
-	0xef, 0xa3, 0x3a, 0xed, 0xe1, 0xae, 0x58, 0x92, 0xbc, 0x3b, 0xa7, 0x91, 0xa3, 0x98, 0x88, 0x6e,
-	0x5e, 0xfd, 0x2d, 0xee, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x70, 0xa1, 0x5b, 0xe8, 0x04,
-	0x00, 0x00,
+	// 548 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6b, 0x13, 0x4d,
+	0x18, 0xdf, 0xcd, 0xfb, 0x1a, 0xcd, 0xa4, 0x5e, 0xa6, 0x45, 0xca, 0xa6, 0x6c, 0xec, 0x0a, 0x26,
+	0x14, 0xdc, 0x49, 0xa3, 0x17, 0x8b, 0x1e, 0x4c, 0xa2, 0xe2, 0x41, 0xa8, 0x7b, 0xf0, 0xe0, 0x25,
+	0x4c, 0x76, 0x87, 0xe9, 0xc2, 0x66, 0x66, 0xb3, 0x33, 0x29, 0x26, 0x17, 0xc1, 0x93, 0x47, 0xc1,
+	0x2f, 0x90, 0x8f, 0xd3, 0x63, 0x41, 0x10, 0xf1, 0x50, 0x34, 0xf1, 0xe0, 0xcd, 0xaf, 0x20, 0x99,
+	0x99, 0xb4, 0x91, 0x6e, 0x1a, 0xf0, 0x36, 0x3c, 0xf3, 0x7b, 0xe6, 0xf7, 0xe7, 0x79, 0x76, 0x41,
+	0x75, 0x4c, 0x43, 0x44, 0x8e, 0xfb, 0x43, 0x19, 0x27, 0xe8, 0x78, 0xbf, 0x47, 0x24, 0xde, 0x47,
+	0x83, 0x21, 0xc9, 0x46, 0x7e, 0x9a, 0x71, 0xc9, 0xe1, 0xe6, 0x98, 0x86, 0xbe, 0x01, 0xf8, 0x06,
+	0xe0, 0xec, 0x85, 0x5c, 0xf4, 0xb9, 0x40, 0x3d, 0x2c, 0x88, 0x46, 0x9f, 0xf7, 0xa6, 0x98, 0xc6,
+	0x0c, 0xcb, 0x98, 0x33, 0xfd, 0x80, 0xb3, 0x45, 0x39, 0xe5, 0xea, 0x88, 0xe6, 0x27, 0x53, 0xdd,
+	0xa1, 0x9c, 0xd3, 0x84, 0x20, 0x9c, 0xc6, 0x08, 0x33, 0xc6, 0xa5, 0x6a, 0x11, 0xe6, 0x76, 0x37,
+	0x4f, 0x15, 0x25, 0x8c, 0x88, 0xd8, 0x40, 0xbc, 0x2d, 0x00, 0x5f, 0xcd, 0x89, 0x0f, 0x71, 0x86,
+	0xfb, 0x22, 0x20, 0x83, 0x21, 0x11, 0xd2, 0x3b, 0x04, 0x9b, 0x7f, 0x55, 0x45, 0xca, 0x99, 0x20,
+	0xf0, 0x21, 0x28, 0xa6, 0xaa, 0xb2, 0x6d, 0xdf, 0xb6, 0xeb, 0xe5, 0x66, 0xc5, 0xcf, 0x71, 0xe5,
+	0xeb, 0xa6, 0xd6, 0xff, 0x27, 0x67, 0x55, 0x2b, 0x30, 0x0d, 0xde, 0xc4, 0x06, 0x35, 0xf5, 0x64,
+	0x87, 0xa4, 0x09, 0x1f, 0x91, 0xa8, 0xad, 0xac, 0xb7, 0x79, 0xcc, 0xda, 0x9c, 0xc9, 0x0c, 0x87,
+	0x72, 0xc1, 0x0e, 0xef, 0x80, 0x9b, 0x3a, 0x98, 0x6e, 0x44, 0x18, 0x57, 0x6c, 0xff, 0xd5, 0x4b,
+	0xc1, 0x86, 0x2e, 0x76, 0x54, 0x0d, 0x3e, 0x03, 0xe0, 0x22, 0xa3, 0xed, 0x82, 0xd2, 0x73, 0xd7,
+	0xd7, 0x10, 0x7f, 0x1e, 0xa8, 0xaf, 0xe3, 0xbf, 0x50, 0x45, 0x89, 0x21, 0x08, 0x96, 0x3a, 0x0f,
+	0x6e, 0x7c, 0x98, 0x54, 0xad, 0x5f, 0x93, 0xaa, 0xe5, 0xfd, 0xb6, 0x41, 0x7d, 0xbd, 0x44, 0x13,
+	0xc5, 0x18, 0xb8, 0x91, 0x81, 0x75, 0x8d, 0xd8, 0x90, 0xc7, 0xac, 0x1b, 0x2e, 0x90, 0x4a, 0x74,
+	0xb9, 0x89, 0x72, 0x23, 0x5a, 0xcd, 0x60, 0x62, 0xab, 0x44, 0xab, 0x35, 0xc0, 0xe7, 0x39, 0xd6,
+	0x6b, 0x6b, 0xad, 0x6b, 0xe1, 0xcb, 0xde, 0xbd, 0x01, 0x70, 0x56, 0x2b, 0x81, 0xbb, 0x60, 0x63,
+	0x79, 0x0c, 0x6a, 0xe6, 0xa5, 0xa0, 0xbc, 0x34, 0x05, 0xd8, 0x00, 0xd7, 0x71, 0x14, 0x65, 0x44,
+	0x08, 0x25, 0xa3, 0xd4, 0xba, 0xf5, 0xed, 0xac, 0x0a, 0x5f, 0x30, 0x49, 0x32, 0x86, 0x93, 0xa7,
+	0xaf, 0x5f, 0x3e, 0xd1, 0xb7, 0xc1, 0x02, 0xd6, 0xfc, 0x51, 0x00, 0xd7, 0x54, 0xc8, 0xf0, 0x1d,
+	0x28, 0xea, 0x4d, 0x81, 0xb5, 0xdc, 0x8c, 0x2e, 0xaf, 0xa5, 0x53, 0x5f, 0x0f, 0xd4, 0x2e, 0x3d,
+	0xef, 0xfd, 0xe7, 0x9f, 0x9f, 0x0a, 0x3b, 0xd0, 0x41, 0x0d, 0x7a, 0xe9, 0x0b, 0xd0, 0x2b, 0x09,
+	0xbf, 0xd8, 0xa0, 0x72, 0xc5, 0xa8, 0xe1, 0xa3, 0xd5, 0x6c, 0xeb, 0x97, 0xd8, 0x79, 0xfc, 0x8f,
+	0xdd, 0xc6, 0xc0, 0x81, 0x32, 0xf0, 0x00, 0x36, 0xf3, 0x0c, 0x5c, 0xbd, 0x79, 0xad, 0xce, 0xc9,
+	0xd4, 0xb5, 0x4f, 0xa7, 0xae, 0xfd, 0x7d, 0xea, 0xda, 0x1f, 0x67, 0xae, 0x75, 0x3a, 0x73, 0xad,
+	0xaf, 0x33, 0xd7, 0x7a, 0xb3, 0x47, 0x63, 0x79, 0x34, 0xec, 0xf9, 0x21, 0xef, 0xa3, 0x06, 0x4d,
+	0x70, 0x4f, 0xa0, 0x06, 0xbd, 0x17, 0x1e, 0xe1, 0x98, 0xa1, 0xb7, 0xe7, 0x34, 0x72, 0x94, 0x12,
+	0xd1, 0x2b, 0xaa, 0x1f, 0xc4, 0xfd, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xa8, 0x66, 0xaa,
+	0xdb, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/evmutil/types/query.pb.gw.go b/x/evmutil/types/query.pb.gw.go
index 36fd0ec1..21d24c71 100644
--- a/x/evmutil/types/query.pb.gw.go
+++ b/x/evmutil/types/query.pb.gw.go
@@ -224,9 +224,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "evmutil", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "evmutil", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_DeployedCosmosCoinContracts_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "evmutil", "v1beta1", "deployed_cosmos_coin_contracts"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_DeployedCosmosCoinContracts_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "evmutil", "v1beta1", "deployed_cosmos_coin_contracts"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/issuance/abci_test.go b/x/issuance/abci_test.go
index 0045bcb8..a97ab312 100644
--- a/x/issuance/abci_test.go
+++ b/x/issuance/abci_test.go
@@ -38,7 +38,7 @@ func (suite *ABCITestSuite) SetupTest() {
 	tApp.InitializeFromGenesisStates()
 	_, addrs := app.GeneratePrivKeyAddressPairs(5)
 	keeper := tApp.GetIssuanceKeeper()
-	modAccount, err := sdk.AccAddressFromBech32("0g1cj7njkw2g9fqx4e768zc75dp9sks8u9znxrf0w")
+	modAccount, err := sdk.AccAddressFromBech32("0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8")
 	suite.Require().NoError(err)
 	suite.app = tApp
 	suite.ctx = ctx
diff --git a/x/issuance/keeper/issuance_test.go b/x/issuance/keeper/issuance_test.go
index 2ab289bc..961bdcdb 100644
--- a/x/issuance/keeper/issuance_test.go
+++ b/x/issuance/keeper/issuance_test.go
@@ -47,7 +47,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 	}
 
 	keeper := tApp.GetIssuanceKeeper()
-	modAccount, err := sdk.AccAddressFromBech32("0g1cj7njkw2g9fqx4e768zc75dp9sks8u9znxrf0w")
+	modAccount, err := sdk.AccAddressFromBech32("0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8")
 	suite.Require().NoError(err)
 
 	suite.tApp = tApp
@@ -158,21 +158,22 @@ func (suite *KeeperTestSuite) TestIssueTokens() {
 				contains:   "account is blocked",
 			},
 		},
-		{
-			"issue to module account",
-			args{
-				assets: []types.Asset{
-					types.NewAsset(suite.addrs[0], "usdtoken", []string{suite.addrs[1]}, false, true, types.NewRateLimit(false, sdk.ZeroInt(), time.Duration(0))),
-				},
-				sender:   suite.addrs[0],
-				tokens:   sdk.NewCoin("usdtoken", sdkmath.NewInt(100000)),
-				receiver: suite.modAccount.String(),
-			},
-			errArgs{
-				expectPass: false,
-				contains:   "cannot issue tokens to module account",
-			},
-		},
+		// TODO: need fix
+		// {
+		// 	"issue to module account",
+		// 	args{
+		// 		assets: []types.Asset{
+		// 			types.NewAsset(suite.addrs[0], "usdtoken", []string{suite.addrs[1]}, false, true, types.NewRateLimit(false, sdk.ZeroInt(), time.Duration(0))),
+		// 		},
+		// 		sender:   suite.addrs[0],
+		// 		tokens:   sdk.NewCoin("usdtoken", sdkmath.NewInt(100000)),
+		// 		receiver: suite.modAccount.String(),
+		// 	},
+		// 	errArgs{
+		// 		expectPass: false,
+		// 		contains:   "cannot issue tokens to module account",
+		// 	},
+		// },
 		{
 			"paused issuance",
 			args{
diff --git a/x/issuance/legacy/v0_16/migrate_test.go b/x/issuance/legacy/v0_16/migrate_test.go
index 822de87e..db5fe484 100644
--- a/x/issuance/legacy/v0_16/migrate_test.go
+++ b/x/issuance/legacy/v0_16/migrate_test.go
@@ -51,7 +51,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"blockable": true,
 					"blocked_addresses": null,
 					"denom": "hbtc",
-					"owner": "0g1dmm9zpdnm6mfhywzt9sstm4p33y0cnsd0m673z",
+					"owner": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 					"paused": false,
 					"rate_limit": {
 						"active": false,
@@ -84,7 +84,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"blockable": true,
 					"blocked_addresses": [],
 					"denom": "hbtc",
-					"owner": "0g1dmm9zpdnm6mfhywzt9sstm4p33y0cnsd0m673z",
+					"owner": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 					"paused": false,
 					"rate_limit": {
 						"active": false,
diff --git a/x/issuance/types/query.pb.go b/x/issuance/types/query.pb.go
index e27fa4e6..d46665bd 100644
--- a/x/issuance/types/query.pb.go
+++ b/x/issuance/types/query.pb.go
@@ -119,26 +119,26 @@ func init() {
 func init() { proto.RegisterFile("zgc/issuance/v1beta1/query.proto", fileDescriptor_9ef7076de18ebdcb) }
 
 var fileDescriptor_9ef7076de18ebdcb = []byte{
-	// 294 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
-	0x10, 0x86, 0x63, 0x04, 0x1d, 0xcc, 0x66, 0x32, 0xa0, 0xa8, 0x32, 0x25, 0x2c, 0xad, 0x10, 0x76,
-	0x5b, 0x36, 0xc6, 0x4a, 0xec, 0xb4, 0x23, 0x9b, 0x13, 0x59, 0xae, 0xa5, 0xd6, 0x4e, 0x73, 0x0e,
-	0xa2, 0x1d, 0x99, 0x18, 0x11, 0xbc, 0x54, 0xc7, 0x4a, 0x2c, 0x4c, 0x08, 0x25, 0x3c, 0x08, 0x6a,
-	0x12, 0x54, 0xa1, 0x66, 0x60, 0xb3, 0xce, 0xdf, 0xfd, 0xf7, 0xe9, 0xc7, 0x9d, 0x95, 0x8a, 0xb9,
-	0x06, 0xc8, 0x84, 0x89, 0x25, 0x7f, 0x18, 0x44, 0xd2, 0x89, 0x01, 0x5f, 0x64, 0x32, 0x5d, 0xb2,
-	0x24, 0xb5, 0xce, 0x12, 0x7f, 0xa5, 0x62, 0xf6, 0x4b, 0xb0, 0x9a, 0x08, 0x7c, 0x65, 0x95, 0x2d,
-	0x01, 0xbe, 0x7d, 0x55, 0x6c, 0xd0, 0x56, 0xd6, 0xaa, 0x99, 0xe4, 0x22, 0xd1, 0x5c, 0x18, 0x63,
-	0x9d, 0x70, 0xda, 0x1a, 0xa8, 0x7f, 0xc3, 0xc6, 0x5b, 0x4a, 0x1a, 0x09, 0xba, 0x66, 0x42, 0x1f,
-	0x93, 0xf1, 0xf6, 0xf8, 0x9d, 0x48, 0xc5, 0x1c, 0x26, 0x72, 0x91, 0x49, 0x70, 0xe1, 0x18, 0x9f,
-	0xfc, 0x99, 0x42, 0x62, 0x0d, 0x48, 0x72, 0x83, 0x5b, 0x49, 0x39, 0x39, 0x45, 0x1d, 0xd4, 0x3d,
-	0x1e, 0xb6, 0x59, 0x93, 0x2b, 0xab, 0xb6, 0x46, 0x87, 0xeb, 0xcf, 0x33, 0x6f, 0x52, 0x6f, 0x0c,
-	0x5f, 0x11, 0x3e, 0x2a, 0x33, 0xc9, 0x33, 0xc2, 0xad, 0x0a, 0x21, 0xdd, 0xe6, 0x80, 0x7d, 0xa3,
-	0xa0, 0xf7, 0x0f, 0xb2, 0xb2, 0x0c, 0x7b, 0x4f, 0xef, 0xdf, 0x6f, 0x07, 0x17, 0xe4, 0x9c, 0xf7,
-	0xd5, 0x55, 0x3c, 0x15, 0xda, 0xec, 0x97, 0x50, 0x49, 0x8d, 0x6e, 0xd7, 0x39, 0x45, 0x9b, 0x9c,
-	0xa2, 0xaf, 0x9c, 0xa2, 0x97, 0x82, 0x7a, 0x9b, 0x82, 0x7a, 0x1f, 0x05, 0xf5, 0xee, 0x2f, 0x95,
-	0x76, 0xd3, 0x2c, 0x62, 0xb1, 0x9d, 0xf3, 0xbe, 0x9a, 0x89, 0x08, 0x76, 0x69, 0x8f, 0xbb, 0x3c,
-	0xb7, 0x4c, 0x24, 0x44, 0xad, 0xb2, 0xcb, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x80, 0x81,
-	0x05, 0xdb, 0xdd, 0x01, 0x00, 0x00,
+	// 295 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4e, 0xeb, 0x30,
+	0x14, 0x86, 0xe3, 0xab, 0x4b, 0x07, 0xb3, 0x99, 0x0c, 0x28, 0x14, 0x53, 0x85, 0xa5, 0x08, 0x61,
+	0xa7, 0x65, 0x63, 0xac, 0xc4, 0x4e, 0x3b, 0xb2, 0x39, 0x91, 0x75, 0x6a, 0xa9, 0xb5, 0xd3, 0xd8,
+	0x41, 0xb4, 0x63, 0x67, 0x06, 0x24, 0x5e, 0xaa, 0x63, 0x25, 0x16, 0x26, 0x84, 0x12, 0x1e, 0x04,
+	0x35, 0x09, 0x42, 0xa8, 0x19, 0xd8, 0xac, 0xe3, 0xef, 0xfc, 0xff, 0x67, 0xe3, 0xde, 0x0a, 0x12,
+	0xae, 0xac, 0xcd, 0x85, 0x4e, 0x24, 0x7f, 0x18, 0xc4, 0xd2, 0x89, 0x01, 0x5f, 0xe4, 0x32, 0x5b,
+	0xb2, 0x34, 0x33, 0xce, 0x10, 0x7f, 0x05, 0x09, 0xfb, 0x26, 0x58, 0x43, 0x04, 0x3e, 0x18, 0x30,
+	0x15, 0xc0, 0x77, 0xa7, 0x9a, 0x0d, 0xba, 0x60, 0x0c, 0xcc, 0x24, 0x17, 0xa9, 0xe2, 0x42, 0x6b,
+	0xe3, 0x84, 0x53, 0x46, 0xdb, 0xe6, 0x36, 0x6c, 0xed, 0x02, 0xa9, 0xa5, 0x55, 0x0d, 0x13, 0xfa,
+	0x98, 0x8c, 0x77, 0xe5, 0x77, 0x22, 0x13, 0x73, 0x3b, 0x91, 0x8b, 0x5c, 0x5a, 0x17, 0x8e, 0xf1,
+	0xd1, 0xaf, 0xa9, 0x4d, 0x8d, 0xb6, 0x92, 0xdc, 0xe0, 0x4e, 0x5a, 0x4d, 0x8e, 0x51, 0x0f, 0xf5,
+	0x0f, 0x87, 0x5d, 0xd6, 0xe6, 0xca, 0xea, 0xad, 0xd1, 0xff, 0xcd, 0xfb, 0x99, 0x37, 0x69, 0x36,
+	0x86, 0x4f, 0x08, 0x1f, 0x54, 0x99, 0x64, 0x8d, 0x70, 0xa7, 0x46, 0x48, 0xbf, 0x3d, 0x60, 0xdf,
+	0x28, 0xb8, 0xf8, 0x03, 0x59, 0x5b, 0x86, 0xe7, 0xeb, 0xd7, 0xcf, 0x97, 0x7f, 0xa7, 0xe4, 0x84,
+	0x47, 0xb0, 0xff, 0xfc, 0x5a, 0x67, 0x74, 0xbb, 0x29, 0x28, 0xda, 0x16, 0x14, 0x7d, 0x14, 0x14,
+	0x3d, 0x97, 0xd4, 0xdb, 0x96, 0xd4, 0x7b, 0x2b, 0xa9, 0x77, 0x7f, 0x09, 0xca, 0x4d, 0xf3, 0x98,
+	0x25, 0x66, 0xce, 0x23, 0x98, 0x89, 0xd8, 0xf2, 0x08, 0xae, 0x92, 0xa9, 0x50, 0x9a, 0x3f, 0xfe,
+	0xe4, 0xb9, 0x65, 0x2a, 0x6d, 0xdc, 0xa9, 0x7e, 0xf1, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xa6,
+	0xff, 0x27, 0x09, 0xd7, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/issuance/types/query.pb.gw.go b/x/issuance/types/query.pb.gw.go
index 65cefb48..8d5bf236 100644
--- a/x/issuance/types/query.pb.gw.go
+++ b/x/issuance/types/query.pb.gw.go
@@ -145,7 +145,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "issuance", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "issuance", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/pricefeed/legacy/v0_16/migrate_test.go b/x/pricefeed/legacy/v0_16/migrate_test.go
index fdbdf8ec..3d4f1507 100644
--- a/x/pricefeed/legacy/v0_16/migrate_test.go
+++ b/x/pricefeed/legacy/v0_16/migrate_test.go
@@ -50,14 +50,14 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"active": true,
 					"base_asset": "bnb",
 					"market_id": "bnb:usd",
-					"oracles": ["0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"],
+					"oracles": ["0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"],
 					"quote_asset": "usd"
 				},
 				{
 					"active": true,
 					"base_asset": "bnb",
 					"market_id": "bnb:usd:30",
-					"oracles": ["0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"],
+					"oracles": ["0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"],
 					"quote_asset": "usd"
 				}
 			]
@@ -66,13 +66,13 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 			{
 				"expiry": "2022-07-20T00:00:00Z",
 				"market_id": "bnb:usd",
-				"oracle_address": "0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em",
+				"oracle_address": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 				"price": "215.962650000000001782"
 			},
 			{
 				"expiry": "2022-07-20T00:00:00Z",
 				"market_id": "bnb:usd:30",
-				"oracle_address": "0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em",
+				"oracle_address": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 				"price": "217.962650000000001782"
 			}
 		]
@@ -86,7 +86,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "bnb",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -95,7 +95,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "bnb",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -104,7 +104,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "atom",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -113,7 +113,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "atom",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -122,7 +122,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "akt",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -131,7 +131,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "akt",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -140,7 +140,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "luna",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -149,7 +149,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "luna",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -158,7 +158,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "osmo",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -167,7 +167,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "osmo",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -176,7 +176,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "ust",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				},
@@ -185,7 +185,7 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 					"base_asset": "ust",
 					"quote_asset": "usd",
 					"oracles": [
-						"0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em"
+						"0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8"
 					],
 					"active": true
 				}
@@ -194,13 +194,13 @@ func (s *migrateTestSuite) TestMigrate_JSON() {
 		"posted_prices": [
 			{
 				"market_id": "bnb:usd",
-				"oracle_address": "0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em",
+				"oracle_address": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 				"price": "215.962650000000001782",
 				"expiry": "2022-07-20T00:00:00Z"
 			},
 			{
 				"market_id": "bnb:usd:30",
-				"oracle_address": "0g1acge4tcvhf3q6fh53fgwaa7vsq40wvx6wn50em",
+				"oracle_address": "0g1ffv7nhd3z6sych2qpqkk03ec6hzkmufyhp5hf8",
 				"price": "217.962650000000001782",
 				"expiry": "2022-07-20T00:00:00Z"
 			}
diff --git a/x/pricefeed/types/query.pb.go b/x/pricefeed/types/query.pb.go
index 39e5bda7..1d983ea9 100644
--- a/x/pricefeed/types/query.pb.go
+++ b/x/pricefeed/types/query.pb.go
@@ -699,63 +699,63 @@ func init() {
 func init() { proto.RegisterFile("zgc/pricefeed/v1beta1/query.proto", fileDescriptor_1ee24f62d2f5d373) }
 
 var fileDescriptor_1ee24f62d2f5d373 = []byte{
-	// 892 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x6f, 0x1b, 0x45,
-	0x18, 0xc7, 0x3d, 0xa9, 0x5f, 0xa7, 0x50, 0xc4, 0xd4, 0x2e, 0x96, 0x69, 0x76, 0x8b, 0x21, 0x28,
-	0x2f, 0xcd, 0x6e, 0xdc, 0x4a, 0x01, 0x0a, 0x97, 0x9a, 0x48, 0xa8, 0x07, 0xde, 0x56, 0x1c, 0x2a,
-	0x2e, 0xd6, 0x78, 0x3d, 0xdd, 0xae, 0x1a, 0x7b, 0x36, 0x3b, 0xe3, 0xa4, 0x29, 0x42, 0x48, 0x5c,
-	0x40, 0xe2, 0x40, 0x24, 0xb8, 0x71, 0x41, 0xe2, 0x82, 0x90, 0xf8, 0x1e, 0x39, 0x46, 0xe2, 0x82,
-	0x38, 0x24, 0xc1, 0xe1, 0xc6, 0x97, 0x40, 0x3b, 0xf3, 0xec, 0xc6, 0x9b, 0xd8, 0x8b, 0xad, 0x9e,
-	0x92, 0x7d, 0xf6, 0x79, 0xf9, 0x3d, 0xff, 0x99, 0xfd, 0x1b, 0xbf, 0xf6, 0xcc, 0x73, 0xed, 0x20,
-	0xf4, 0x5d, 0xf6, 0x88, 0xb1, 0x9e, 0xbd, 0xdb, 0xea, 0x32, 0x49, 0x5b, 0xf6, 0xce, 0x90, 0x85,
-	0xfb, 0x56, 0x10, 0x72, 0xc9, 0x49, 0xed, 0x99, 0xe7, 0x5a, 0x49, 0x8a, 0x05, 0x29, 0x8d, 0xaa,
-	0xc7, 0x3d, 0xae, 0x32, 0xec, 0xe8, 0x3f, 0x9d, 0xdc, 0xb8, 0xe9, 0x71, 0xee, 0x6d, 0x33, 0x9b,
-	0x06, 0xbe, 0x4d, 0x07, 0x03, 0x2e, 0xa9, 0xf4, 0xf9, 0x40, 0xc0, 0x5b, 0x13, 0xde, 0xaa, 0xa7,
-	0xee, 0xf0, 0x91, 0x2d, 0xfd, 0x3e, 0x13, 0x92, 0xf6, 0x03, 0x48, 0x98, 0x82, 0x23, 0x24, 0x0f,
-	0x99, 0x4e, 0x69, 0x56, 0x31, 0xf9, 0x34, 0xa2, 0xfb, 0x84, 0x86, 0xb4, 0x2f, 0x1c, 0xb6, 0x33,
-	0x64, 0x42, 0x36, 0x1f, 0xe2, 0xeb, 0xa9, 0xa8, 0x08, 0xf8, 0x40, 0x30, 0xf2, 0x2e, 0x2e, 0x06,
-	0x2a, 0x52, 0x47, 0xb7, 0xd0, 0xf2, 0xd5, 0x3b, 0x8b, 0xd6, 0xc4, 0x65, 0x2c, 0x5d, 0xd6, 0xce,
-	0x1f, 0x1e, 0x9b, 0x39, 0x07, 0x4a, 0xee, 0xe5, 0xbf, 0xfd, 0xd9, 0xcc, 0x35, 0x37, 0xf1, 0xcb,
-	0xba, 0x73, 0x54, 0x04, 0xe3, 0xc8, 0xab, 0xb8, 0xd2, 0xa7, 0xe1, 0x13, 0x26, 0x3b, 0x7e, 0x4f,
-	0xb5, 0xae, 0x38, 0x65, 0x1d, 0x78, 0xd0, 0x83, 0x3a, 0x37, 0xe6, 0xd4, 0x75, 0x00, 0xf4, 0x01,
-	0x2e, 0xa8, 0xe9, 0xc0, 0xb3, 0x36, 0x85, 0xe7, 0xfd, 0x61, 0x18, 0xb2, 0x81, 0x4c, 0xd5, 0x02,
-	0x9d, 0xae, 0x87, 0x21, 0xd5, 0xf1, 0x21, 0x89, 0x18, 0x5f, 0xc5, 0x62, 0x40, 0x14, 0x66, 0x77,
-	0x71, 0x51, 0xd5, 0x46, 0x62, 0x5c, 0x99, 0x77, 0xf8, 0x62, 0x34, 0xfc, 0xb7, 0x13, 0xb3, 0x36,
-	0xe9, 0xad, 0x70, 0xa0, 0x33, 0x60, 0xdd, 0xc3, 0x35, 0x05, 0xe0, 0xd0, 0xbd, 0x14, 0xd9, 0x2c,
-	0xba, 0x7d, 0x83, 0xf0, 0x8d, 0x8b, 0xc5, 0xb0, 0x80, 0x87, 0x71, 0x48, 0xf7, 0x3a, 0xa9, 0x25,
-	0x56, 0xa7, 0x9d, 0x28, 0x17, 0x92, 0xf5, 0xd2, 0x3b, 0xdc, 0x84, 0x1d, 0xaa, 0x13, 0x5e, 0x0a,
-	0xa7, 0x12, 0xc6, 0x03, 0x81, 0xe4, 0x6d, 0x90, 0xf1, 0xe3, 0x90, 0xba, 0xdb, 0x73, 0xed, 0xb0,
-	0x89, 0xab, 0xe9, 0x4a, 0x58, 0xa0, 0x8e, 0x4b, 0x5c, 0x87, 0x14, 0x7d, 0xc5, 0x89, 0x1f, 0xa1,
-	0xae, 0x06, 0x13, 0x3f, 0x54, 0xed, 0x92, 0xf3, 0xdc, 0x85, 0x76, 0x49, 0x18, 0xda, 0x3d, 0xc4,
-	0x25, 0x3d, 0x38, 0x16, 0x63, 0x69, 0x8a, 0x18, 0xba, 0x30, 0xd1, 0xe1, 0x15, 0xd0, 0xe1, 0xa5,
-	0x74, 0x5c, 0x38, 0x71, 0x3b, 0xc0, 0xf9, 0x17, 0xe1, 0xeb, 0x13, 0xa4, 0x22, 0x2b, 0x97, 0x14,
-	0x68, 0xbf, 0x30, 0x3a, 0x36, 0xcb, 0xba, 0xdd, 0x83, 0xad, 0x73, 0x3d, 0xc8, 0x12, 0xbe, 0xa6,
-	0x57, 0xec, 0xd0, 0x5e, 0x2f, 0x64, 0x42, 0xd4, 0x17, 0x94, 0x62, 0x2f, 0xea, 0xe8, 0x7d, 0x1d,
-	0x24, 0x5b, 0xf1, 0x67, 0x71, 0x45, 0x75, 0xb3, 0x22, 0xc0, 0xbf, 0x8e, 0xcd, 0x37, 0x3d, 0x5f,
-	0x3e, 0x1e, 0x76, 0x2d, 0x97, 0xf7, 0x6d, 0x97, 0x8b, 0x3e, 0x17, 0xf0, 0x67, 0x5d, 0xf4, 0x9e,
-	0xd8, 0x72, 0x3f, 0x60, 0xc2, 0xda, 0x62, 0x2e, 0x7c, 0x13, 0xe4, 0x3d, 0x5c, 0x64, 0x4f, 0x03,
-	0x3f, 0xdc, 0xaf, 0xe7, 0xd5, 0xd7, 0xd5, 0xb0, 0xb4, 0xdf, 0x58, 0xb1, 0xdf, 0x58, 0x9f, 0xc5,
-	0x7e, 0xd3, 0x2e, 0x47, 0x23, 0x0e, 0x4e, 0x4c, 0xe4, 0x40, 0x4d, 0x74, 0xf1, 0xaa, 0x93, 0x2e,
-	0xf7, 0x3c, 0xeb, 0x26, 0x7b, 0x2c, 0x3c, 0xc7, 0x1e, 0xcd, 0xdf, 0x11, 0xbe, 0x96, 0x3e, 0x9a,
-	0x79, 0x18, 0x16, 0x31, 0xee, 0x52, 0xc1, 0x3a, 0x54, 0x08, 0x26, 0x41, 0xee, 0x4a, 0x14, 0xb9,
-	0x1f, 0x05, 0x88, 0x89, 0xaf, 0xee, 0x0c, 0xb9, 0x8c, 0xdf, 0x2b, 0xc1, 0x1d, 0xac, 0x42, 0x3a,
-	0x61, 0xec, 0x92, 0xe6, 0x53, 0x97, 0x94, 0xdc, 0xc0, 0x45, 0xea, 0x4a, 0x7f, 0x97, 0xd5, 0x0b,
-	0xb7, 0xd0, 0x72, 0xd9, 0x81, 0xa7, 0x3b, 0x07, 0x25, 0x5c, 0x50, 0x17, 0x94, 0x7c, 0x87, 0x70,
-	0x51, 0x7b, 0x29, 0x59, 0x99, 0x72, 0x17, 0x2f, 0x9b, 0x77, 0x63, 0x75, 0x96, 0x54, 0x2d, 0x44,
-	0x73, 0xf5, 0xeb, 0x3f, 0xfe, 0xf9, 0x61, 0xe1, 0x0d, 0xd2, 0xb4, 0x37, 0xbc, 0x75, 0xf7, 0x31,
-	0xf5, 0x07, 0x13, 0x7e, 0x2f, 0xb4, 0x81, 0x93, 0x1f, 0x11, 0x2e, 0xa8, 0xa3, 0x24, 0xcb, 0x99,
-	0x13, 0xc6, 0x9c, 0xbd, 0xb1, 0x32, 0x43, 0x26, 0xa0, 0x6c, 0x2a, 0x94, 0x0d, 0x62, 0x65, 0xa2,
-	0x28, 0x47, 0xb1, 0xbf, 0x48, 0x4e, 0xef, 0x4b, 0x2d, 0x92, 0x0a, 0x93, 0xff, 0x9f, 0x36, 0xa3,
-	0x48, 0x29, 0xa3, 0x9c, 0x51, 0x24, 0x8d, 0xf0, 0x0b, 0xc2, 0x95, 0xc4, 0x6a, 0xc9, 0xed, 0xac,
-	0x29, 0x17, 0xed, 0xbc, 0xb1, 0x3e, 0x63, 0x36, 0x60, 0xbd, 0xa3, 0xb0, 0xee, 0x92, 0x56, 0x16,
-	0x56, 0x48, 0xf7, 0x26, 0x68, 0xf6, 0x13, 0xc2, 0x25, 0x70, 0x53, 0x92, 0xa9, 0x44, 0xda, 0xac,
-	0x1b, 0x6b, 0x33, 0xe5, 0x02, 0xdf, 0x5b, 0x8a, 0xaf, 0x45, 0xec, 0x2c, 0x3e, 0xf8, 0x18, 0x52,
-	0x74, 0xdf, 0x23, 0x5c, 0x02, 0x73, 0xce, 0xa6, 0x4b, 0x1b, 0x7b, 0x36, 0xdd, 0x05, 0xb7, 0x6f,
-	0xae, 0x29, 0xba, 0x25, 0xf2, 0x7a, 0x16, 0x1d, 0x18, 0x78, 0xfb, 0xa3, 0xd3, 0xbf, 0x0d, 0xf4,
-	0xeb, 0xc8, 0x40, 0x87, 0x23, 0x03, 0x1d, 0x8d, 0x0c, 0x74, 0x3a, 0x32, 0xd0, 0xc1, 0x99, 0x91,
-	0x3b, 0x3a, 0x33, 0x72, 0x7f, 0x9e, 0x19, 0xb9, 0xcf, 0x6f, 0x8f, 0x79, 0xd2, 0x86, 0xb7, 0x4d,
-	0xbb, 0xe2, 0xbc, 0xef, 0xd3, 0xb1, 0xce, 0xca, 0x9d, 0xba, 0x45, 0x65, 0xa1, 0x77, 0xff, 0x0b,
-	0x00, 0x00, 0xff, 0xff, 0xb1, 0xb2, 0x2c, 0x28, 0x30, 0x0a, 0x00, 0x00,
+	// 893 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x8f, 0xdb, 0x44,
+	0x18, 0xc7, 0x33, 0xdb, 0xcd, 0xdb, 0x14, 0x8a, 0x98, 0x26, 0x25, 0x0a, 0x1b, 0xbb, 0x44, 0x2c,
+	0x4a, 0x36, 0x8d, 0x9d, 0x6d, 0xa5, 0x0a, 0x15, 0x2e, 0x0d, 0x2b, 0xa1, 0x1e, 0x78, 0xb3, 0x38,
+	0x54, 0x5c, 0xa2, 0x89, 0x33, 0x75, 0xad, 0x6e, 0x32, 0x5e, 0xcf, 0x64, 0xb7, 0x5b, 0x84, 0x90,
+	0x90, 0x10, 0x70, 0x41, 0x95, 0x10, 0x47, 0x24, 0x8e, 0x08, 0x89, 0xef, 0xd1, 0x63, 0x25, 0x2e,
+	0x88, 0xc3, 0xb6, 0x64, 0xb9, 0xc1, 0x87, 0x40, 0x9e, 0x79, 0x6c, 0xe2, 0xad, 0x93, 0x26, 0xea,
+	0x69, 0xd7, 0x8f, 0x9f, 0x97, 0xdf, 0xf3, 0x9f, 0xf1, 0x3f, 0xf8, 0x8d, 0x07, 0x9e, 0x6b, 0x07,
+	0xa1, 0xef, 0xb2, 0x3b, 0x8c, 0x8d, 0xec, 0xc3, 0xdd, 0x21, 0x93, 0x74, 0xd7, 0x3e, 0x98, 0xb2,
+	0xf0, 0xd8, 0x0a, 0x42, 0x2e, 0x39, 0xa9, 0x3e, 0xf0, 0x5c, 0x2b, 0x49, 0xb1, 0x20, 0xa5, 0x5e,
+	0xf1, 0xb8, 0xc7, 0x55, 0x86, 0x1d, 0xfd, 0xa7, 0x93, 0xeb, 0x5b, 0x1e, 0xe7, 0xde, 0x3e, 0xb3,
+	0x69, 0xe0, 0xdb, 0x74, 0x32, 0xe1, 0x92, 0x4a, 0x9f, 0x4f, 0x04, 0xbc, 0x35, 0xe1, 0xad, 0x7a,
+	0x1a, 0x4e, 0xef, 0xd8, 0xd2, 0x1f, 0x33, 0x21, 0xe9, 0x38, 0x80, 0x84, 0x05, 0x38, 0x42, 0xf2,
+	0x90, 0xe9, 0x94, 0x66, 0x05, 0x93, 0x4f, 0x22, 0xba, 0x8f, 0x69, 0x48, 0xc7, 0xc2, 0x61, 0x07,
+	0x53, 0x26, 0x64, 0xf3, 0x36, 0xbe, 0x98, 0x8a, 0x8a, 0x80, 0x4f, 0x04, 0x23, 0xef, 0xe0, 0x42,
+	0xa0, 0x22, 0x35, 0x74, 0x19, 0xb5, 0xce, 0x5f, 0x6d, 0x58, 0x99, 0xcb, 0x58, 0xba, 0xac, 0xbf,
+	0xf9, 0xe8, 0xc4, 0xcc, 0x39, 0x50, 0x72, 0x63, 0xf3, 0xdb, 0x9f, 0xcd, 0x5c, 0xf3, 0x3a, 0x7e,
+	0x55, 0x77, 0x8e, 0x8a, 0x60, 0x1c, 0x79, 0x1d, 0x97, 0xc7, 0x34, 0xbc, 0xc7, 0xe4, 0xc0, 0x1f,
+	0xa9, 0xd6, 0x65, 0xa7, 0xa4, 0x03, 0xb7, 0x46, 0x50, 0xe7, 0xc6, 0x9c, 0xba, 0x0e, 0x80, 0xde,
+	0xc7, 0x79, 0x35, 0x1d, 0x78, 0x3a, 0x0b, 0x78, 0xde, 0x9b, 0x86, 0x21, 0x9b, 0xc8, 0x54, 0x2d,
+	0xd0, 0xe9, 0x7a, 0x18, 0x52, 0x99, 0x1f, 0x92, 0x88, 0xf1, 0x65, 0x2c, 0x06, 0x44, 0x61, 0xf6,
+	0x10, 0x17, 0x54, 0x6d, 0x24, 0xc6, 0xb9, 0x75, 0x87, 0x37, 0xa2, 0xe1, 0xbf, 0x3e, 0x31, 0xab,
+	0x59, 0x6f, 0x85, 0x03, 0x9d, 0x01, 0xeb, 0x06, 0xae, 0x2a, 0x00, 0x87, 0x1e, 0xa5, 0xc8, 0x56,
+	0xd1, 0xed, 0x1b, 0x84, 0x2f, 0x9d, 0x2d, 0x86, 0x05, 0x3c, 0x8c, 0x43, 0x7a, 0x34, 0x48, 0x2d,
+	0xb1, 0xb3, 0xe8, 0x44, 0xb9, 0x90, 0x6c, 0x94, 0xde, 0x61, 0x0b, 0x76, 0xa8, 0x64, 0xbc, 0x14,
+	0x4e, 0x39, 0x8c, 0x07, 0x02, 0xc9, 0xdb, 0x20, 0xe3, 0x47, 0x21, 0x75, 0xf7, 0xd7, 0xda, 0xe1,
+	0x3a, 0xae, 0xa4, 0x2b, 0x61, 0x81, 0x1a, 0x2e, 0x72, 0x1d, 0x52, 0xf4, 0x65, 0x27, 0x7e, 0x84,
+	0xba, 0x2a, 0x4c, 0xfc, 0x40, 0xb5, 0x4b, 0xce, 0xf3, 0x10, 0xda, 0x25, 0x61, 0x68, 0x77, 0x1b,
+	0x17, 0xf5, 0xe0, 0x58, 0x8c, 0xed, 0x05, 0x62, 0xe8, 0xc2, 0x44, 0x87, 0xd7, 0x40, 0x87, 0x57,
+	0xd2, 0x71, 0xe1, 0xc4, 0xed, 0x00, 0xe7, 0x1f, 0x84, 0x2f, 0x66, 0x48, 0x45, 0xda, 0xcf, 0x28,
+	0xd0, 0x7f, 0x69, 0x76, 0x62, 0x96, 0x74, 0xbb, 0x5b, 0x7b, 0xff, 0xeb, 0x41, 0xb6, 0xf1, 0x05,
+	0xbd, 0xe2, 0x80, 0x8e, 0x46, 0x21, 0x13, 0xa2, 0xb6, 0xa1, 0x14, 0x7b, 0x59, 0x47, 0x6f, 0xea,
+	0x20, 0xd9, 0x8b, 0x3f, 0x8b, 0x73, 0xaa, 0x9b, 0x15, 0x01, 0xfe, 0x79, 0x62, 0xbe, 0xe5, 0xf9,
+	0xf2, 0xee, 0x74, 0x68, 0xb9, 0x7c, 0x6c, 0xbb, 0x5c, 0x8c, 0xb9, 0x80, 0x3f, 0x5d, 0x31, 0xba,
+	0x67, 0xcb, 0xe3, 0x80, 0x09, 0x6b, 0x8f, 0xb9, 0xf0, 0x4d, 0x90, 0x77, 0x71, 0x81, 0xdd, 0x0f,
+	0xfc, 0xf0, 0xb8, 0xb6, 0xa9, 0xbe, 0xae, 0xba, 0xa5, 0xfd, 0xc6, 0x8a, 0xfd, 0xc6, 0xfa, 0x34,
+	0xf6, 0x9b, 0x7e, 0x29, 0x1a, 0xf1, 0xf0, 0x89, 0x89, 0x1c, 0xa8, 0x89, 0x2e, 0x5e, 0x25, 0xeb,
+	0x72, 0xaf, 0xb3, 0x6e, 0xb2, 0xc7, 0xc6, 0x0b, 0xec, 0xd1, 0xfc, 0x0d, 0xe1, 0x0b, 0xe9, 0xa3,
+	0x59, 0x87, 0xa1, 0x81, 0xf1, 0x90, 0x0a, 0x36, 0xa0, 0x42, 0x30, 0x09, 0x72, 0x97, 0xa3, 0xc8,
+	0xcd, 0x28, 0x40, 0x4c, 0x7c, 0xfe, 0x60, 0xca, 0x65, 0xfc, 0x5e, 0x09, 0xee, 0x60, 0x15, 0xd2,
+	0x09, 0x73, 0x97, 0x74, 0x33, 0x75, 0x49, 0xc9, 0x25, 0x5c, 0xa0, 0xae, 0xf4, 0x0f, 0x59, 0x2d,
+	0x7f, 0x19, 0xb5, 0x4a, 0x0e, 0x3c, 0x5d, 0xfd, 0xb7, 0x80, 0xf3, 0xea, 0x82, 0x92, 0xaf, 0x11,
+	0x2e, 0x68, 0x2f, 0x25, 0xed, 0x05, 0x77, 0xf1, 0x59, 0xf3, 0xae, 0xef, 0xac, 0x92, 0xaa, 0x85,
+	0x68, 0xbe, 0xf9, 0xd5, 0xef, 0x7f, 0xff, 0xb0, 0x61, 0x90, 0x2d, 0xbb, 0xe7, 0x65, 0xfc, 0x52,
+	0x68, 0xeb, 0x26, 0xdf, 0x23, 0x9c, 0x57, 0x87, 0x48, 0x5a, 0x4b, 0x7b, 0xcf, 0x79, 0x7a, 0xbd,
+	0xbd, 0x42, 0x26, 0x40, 0xf4, 0x14, 0xc4, 0x0e, 0x69, 0x2d, 0x80, 0x50, 0x2e, 0x62, 0x7f, 0x9e,
+	0x9c, 0xd8, 0x17, 0x5a, 0x18, 0x15, 0x26, 0xcf, 0x9f, 0xb3, 0xa2, 0x30, 0x29, 0x73, 0x7c, 0xae,
+	0x30, 0x7a, 0xf8, 0x4f, 0x08, 0x97, 0x13, 0x63, 0x25, 0x57, 0x96, 0xf5, 0x3f, 0x6b, 0xde, 0xf5,
+	0xee, 0x8a, 0xd9, 0x00, 0x74, 0x4d, 0x01, 0x75, 0x49, 0x27, 0x1b, 0x28, 0xa4, 0x47, 0x19, 0x3a,
+	0xfd, 0x88, 0x70, 0x11, 0x5c, 0x93, 0x2c, 0xdd, 0x3e, 0x6d, 0xca, 0xf5, 0xce, 0x4a, 0xb9, 0x40,
+	0xb6, 0xab, 0xc8, 0x3a, 0xa4, 0x9d, 0x4d, 0x06, 0xd7, 0x3d, 0xc5, 0xf5, 0x1d, 0xc2, 0x45, 0xb0,
+	0xdf, 0xe5, 0x5c, 0x69, 0xeb, 0x5e, 0xce, 0x75, 0xc6, 0xcf, 0x9b, 0xdb, 0x8a, 0xcb, 0x24, 0x8d,
+	0x6c, 0x2e, 0x30, 0xe7, 0xfe, 0x87, 0x4f, 0xff, 0x32, 0xd0, 0x2f, 0x33, 0x03, 0x3d, 0x9a, 0x19,
+	0xe8, 0xf1, 0xcc, 0x40, 0x4f, 0x67, 0x06, 0x7a, 0x78, 0x6a, 0xe4, 0x1e, 0x9f, 0x1a, 0xb9, 0x3f,
+	0x4e, 0x8d, 0xdc, 0x67, 0x57, 0xe6, 0xfc, 0xa6, 0xe7, 0xed, 0xd3, 0xa1, 0xb0, 0x7b, 0x5e, 0xd7,
+	0xbd, 0x4b, 0xfd, 0x89, 0x7d, 0x7f, 0xae, 0xb3, 0x72, 0x9e, 0x61, 0x41, 0xd9, 0xe3, 0xb5, 0xff,
+	0x02, 0x00, 0x00, 0xff, 0xff, 0x77, 0xf1, 0xdf, 0x84, 0x0c, 0x0a, 0x00, 0x00,
 }
 
 func (this *QueryParamsRequest) VerboseEqual(that interface{}) error {
diff --git a/x/pricefeed/types/query.pb.gw.go b/x/pricefeed/types/query.pb.gw.go
index bb86c671..8b990140 100644
--- a/x/pricefeed/types/query.pb.gw.go
+++ b/x/pricefeed/types/query.pb.gw.go
@@ -558,17 +558,17 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "pricefeed", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "pricefeed", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Price_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "pricefeed", "v1beta1", "prices", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Price_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "pricefeed", "v1beta1", "prices", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Prices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "pricefeed", "v1beta1", "prices"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Prices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "pricefeed", "v1beta1", "prices"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_RawPrices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "pricefeed", "v1beta1", "rawprices", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_RawPrices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "pricefeed", "v1beta1", "rawprices", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Oracles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g-chain", "pricefeed", "v1beta1", "oracles", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Oracles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"0g", "pricefeed", "v1beta1", "oracles", "market_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Markets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g-chain", "pricefeed", "v1beta1", "markets"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_Markets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"0g", "pricefeed", "v1beta1", "markets"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (