From 01b001f5cbd04b5edc9d47fd3b633a060297277d Mon Sep 17 00:00:00 2001
From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:36:14 -0700
Subject: [PATCH] some fixes

---
 tests/e2e/actions.go              |  20 +-
 tests/e2e/main.go                 |   2 +-
 tests/e2e/state.go                |  14 +-
 tests/e2e/steps_downtime.go       | 120 ++++++------
 tests/integration/slashing.go     |   4 +-
 x/ccv/consumer/types/query.pb.go  | 110 +++++------
 x/ccv/provider/types/query.pb.go  | 138 ++++++-------
 x/ccv/types/params.go             |   4 +-
 x/ccv/types/shared_consumer.pb.go | 315 +++++++++++++++---------------
 9 files changed, 362 insertions(+), 365 deletions(-)

diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
index 6982ea0df0..9ebc50221d 100644
--- a/tests/e2e/actions.go
+++ b/tests/e2e/actions.go
@@ -2047,16 +2047,16 @@ func (tr TestRun) assignConsumerPubKey(action assignConsumerPubKeyAction, verbos
 
 // slashMeterReplenishmentAction polls the slash meter on provider until value is achieved
 type slashMeterReplenishmentAction struct {
-	targetValue int64
+	TargetValue int64
 	// panic if timeout is exceeded
-	timeout time.Duration
+	Timeout time.Duration
 }
 
 func (tr TestRun) waitForSlashMeterReplenishment(
 	action slashMeterReplenishmentAction,
 	verbose bool,
 ) {
-	timeout := time.Now().Add(action.timeout)
+	timeout := time.Now().Add(action.Timeout)
 	initialSlashMeter := tr.getSlashMeter()
 
 	if initialSlashMeter >= 0 {
@@ -2070,28 +2070,28 @@ func (tr TestRun) waitForSlashMeterReplenishment(
 		}
 
 		// check if meter has reached target value
-		if slashMeter >= action.targetValue {
+		if slashMeter >= action.TargetValue {
 			break
 		}
 
 		if time.Now().After(timeout) {
-			panic(fmt.Sprintf("\n\nwaitForSlashMeterReplenishment has timed out after: %s\n\n", action.timeout))
+			panic(fmt.Sprintf("\n\nwaitForSlashMeterReplenishment has timed out after: %s\n\n", action.Timeout))
 		}
 
 		tr.WaitTime(5 * time.Second)
 	}
 }
 
-type WaitTimeAction struct {
-	consumer chainID
-	waitTime time.Duration
+type waitTimeAction struct {
+	Consumer ChainID
+	WaitTime time.Duration
 }
 
 func (tr TestRun) waitForTime(
-	action WaitTimeAction,
+	action waitTimeAction,
 	verbose bool,
 ) {
-	tr.WaitTime(action.waitTime)
+	tr.WaitTime(action.WaitTime)
 }
 
 // GetPathNameForGorelayer returns the name of the path between two given chains used by Gorelayer.
diff --git a/tests/e2e/main.go b/tests/e2e/main.go
index 3f28c557a5..73d9b786c0 100644
--- a/tests/e2e/main.go
+++ b/tests/e2e/main.go
@@ -256,7 +256,7 @@ func (tr *TestRun) runStep(step Step, verbose bool) {
 		tr.assignConsumerPubKey(action, verbose)
 	case slashMeterReplenishmentAction:
 		tr.waitForSlashMeterReplenishment(action, verbose)
-	case WaitTimeAction:
+	case waitTimeAction:
 		tr.waitForTime(action, verbose)
 	case startRelayerAction:
 		tr.startRelayer(action, verbose)
diff --git a/tests/e2e/state.go b/tests/e2e/state.go
index 7746ae7508..0cda18c6a3 100644
--- a/tests/e2e/state.go
+++ b/tests/e2e/state.go
@@ -23,9 +23,9 @@ type ChainState struct {
 	RepresentativePowers           *map[ValidatorID]uint
 	Params                         *[]Param
 	Rewards                        *Rewards
-	ConsumerChains                 *map[chainID]bool
-	AssignedKeys                   *map[validatorID]string
-	ProviderKeys                   *map[validatorID]string // validatorID: validator provider key
+	ConsumerChains                 *map[ChainID]bool
+	AssignedKeys                   *map[ValidatorID]string
+	ProviderKeys                   *map[ValidatorID]string // validatorID: validator provider key
 	ConsumerPendingPacketQueueSize *uint                   // Only relevant to consumer chains
 	RegisteredConsumerRewardDenoms *[]string
 }
@@ -661,7 +661,7 @@ func (tr TestRun) getProviderAddressFromConsumer(consumerChain ChainID, validato
 func (tr TestRun) getSlashMeter() int64 {
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	cmd := exec.Command("docker", "exec",
-		tr.containerConfig.instanceName, tr.chainConfigs[chainID("provi")].binaryName,
+		tr.containerConfig.InstanceName, tr.chainConfigs[ChainID("provi")].BinaryName,
 
 		"query", "provider", "throttle-state",
 		`--node`, tr.getQueryNode(ChainID("provi")),
@@ -698,9 +698,9 @@ func (tr TestRun) getRegisteredConsumerRewardDenoms(chain ChainID) []string {
 	return rewardDenoms
 }
 
-func (tr TestRun) getPendingPacketQueueSize(chain chainID) uint {
+func (tr TestRun) getPendingPacketQueueSize(chain ChainID) uint {
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
-	cmd := exec.Command("docker", "exec", tr.containerConfig.instanceName, tr.chainConfigs[chain].binaryName,
+	cmd := exec.Command("docker", "exec", tr.containerConfig.InstanceName, tr.chainConfigs[chain].BinaryName,
 
 		"query", "ccvconsumer", "throttle-state",
 		`--node`, tr.getQueryNode(chain),
@@ -719,7 +719,7 @@ func (tr TestRun) getPendingPacketQueueSize(chain chainID) uint {
 	return uint(len(packetData))
 }
 
-func (tr TestRun) getValidatorNode(chain chainID, validator validatorID) string {
+func (tr TestRun) getValidatorNode(chain ChainID, validator ValidatorID) string {
 	// for CometMock, validatorNodes are all the same address as the query node (which is CometMocks address)
 	if tr.useCometmock {
 		return tr.getQueryNode(chain)
diff --git a/tests/e2e/steps_downtime.go b/tests/e2e/steps_downtime.go
index 17cdc5dbdd..01f277eea8 100644
--- a/tests/e2e/steps_downtime.go
+++ b/tests/e2e/steps_downtime.go
@@ -53,12 +53,12 @@ func stepsDowntime(consumerName string) []Step {
 						ValidatorID("carol"): 501,
 					},
 				},
-				chainID(consumerName): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 509,
+				ChainID(consumerName): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 509,
 						// Bob's stake may or may not be slashed at this point depending on comet vs cometmock
 						// See https://github.com/cosmos/interchain-security/issues/1304
-						validatorID("carol"): 501,
+						ValidatorID("carol"): 501,
 					},
 				},
 			},
@@ -278,13 +278,13 @@ func stepsThrottledDowntime(consumerName string) []Step {
 				Chain:     ChainID(consumerName),
 				Validator: ValidatorID("bob"),
 			},
-			state: State{
+			State: State{
 				// slash packet queued for bob on consumer, but powers not affected on either chain yet
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   500,
-						validatorID("carol"): 500,
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   500,
+						ValidatorID("carol"): 500,
 					},
 				},
 				ChainID(consumerName): ChainState{
@@ -332,19 +332,19 @@ func stepsThrottledDowntime(consumerName string) []Step {
 				Chain:     ChainID(consumerName),
 				Validator: ValidatorID("carol"),
 			},
-			state: State{
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0,
-						validatorID("carol"): 500,
+			State: State{
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0,
+						ValidatorID("carol"): 500,
 					},
 				},
-				chainID(consumerName): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   500, // VSC packet jailing bob is not yet relayed to consumer
-						validatorID("carol"): 500,
+				ChainID(consumerName): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   500, // VSC packet jailing bob is not yet relayed to consumer
+						ValidatorID("carol"): 500,
 					},
 					ConsumerPendingPacketQueueSize: uintPtr(1), // carol's downtime slash packet is queued
 				},
@@ -358,39 +358,39 @@ func stepsThrottledDowntime(consumerName string) []Step {
 				Port:    "provider",
 				Channel: 0,
 			},
-			state: State{
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0,
-						validatorID("carol"): 500, // slash packet for carol recv by provider, carol not slashed due to throttling
+			State: State{
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0,
+						ValidatorID("carol"): 500, // slash packet for carol recv by provider, carol not slashed due to throttling
 					},
 				},
-				chainID(consumerName): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0, // VSC packet applying bob jailing is also relayed and recv by consumer
-						validatorID("carol"): 500,
+				ChainID(consumerName): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0, // VSC packet applying bob jailing is also relayed and recv by consumer
+						ValidatorID("carol"): 500,
 					},
 					ConsumerPendingPacketQueueSize: uintPtr(1), // slash packet bounced ack keeps carol's downtime slash packet queued
 				},
 			},
 		},
 		{
-			action: slashMeterReplenishmentAction{
-				targetValue: 0, // We just want slash meter to be non-negative
+			Action: slashMeterReplenishmentAction{
+				TargetValue: 0, // We just want slash meter to be non-negative
 
 				// Slash meter replenish fraction is set to 10%, replenish period is 20 seconds, see config.go
 				// Meter is initially at 10%, decremented to -23% from bob being jailed. It'll then take three replenishments
 				// for meter to become positive again. 3*20 = 60 seconds + buffer = 100 seconds
-				timeout: 100 * time.Second,
-			},
-			state: State{
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0,
-						validatorID("carol"): 500, // Carol still not slashed, packet must be retried
+				Timeout: 100 * time.Second,
+			},
+			State: State{
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0,
+						ValidatorID("carol"): 500, // Carol still not slashed, packet must be retried
 					},
 				},
 				ChainID(consumerName): ChainState{
@@ -408,19 +408,19 @@ func stepsThrottledDowntime(consumerName string) []Step {
 		// Retry delay period is set to 30 seconds, see config.go,
 		// wait this amount of time to elapse the period.
 		{
-			action: WaitTimeAction{
-				consumer: chainID(consumerName),
-				waitTime: 30 * time.Second,
-			},
-			state: State{
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0,
-						validatorID("carol"): 500,
+			Action: waitTimeAction{
+				Consumer: ChainID(consumerName),
+				WaitTime: 30 * time.Second,
+			},
+			State: State{
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0,
+						ValidatorID("carol"): 500,
 					},
 				},
-				chainID(consumerName): ChainState{
+				ChainID(consumerName): ChainState{
 					ConsumerPendingPacketQueueSize: uintPtr(1), // packet still queued
 				},
 			},
@@ -433,15 +433,15 @@ func stepsThrottledDowntime(consumerName string) []Step {
 				Port:    "provider",
 				Channel: 0,
 			},
-			state: State{
-				chainID("provi"): ChainState{
-					ValPowers: &map[validatorID]uint{
-						validatorID("alice"): 511,
-						validatorID("bob"):   0,
-						validatorID("carol"): 0, // jailed!
+			State: State{
+				ChainID("provi"): ChainState{
+					ValPowers: &map[ValidatorID]uint{
+						ValidatorID("alice"): 511,
+						ValidatorID("bob"):   0,
+						ValidatorID("carol"): 0, // jailed!
 					},
 				},
-				chainID(consumerName): ChainState{
+				ChainID(consumerName): ChainState{
 					ConsumerPendingPacketQueueSize: uintPtr(0), // relayed slash packet handled ack clears consumer queue
 				},
 			},
diff --git a/tests/integration/slashing.go b/tests/integration/slashing.go
index 4dc3c0aa91..e80775f1c2 100644
--- a/tests/integration/slashing.go
+++ b/tests/integration/slashing.go
@@ -72,8 +72,8 @@ func (s *CCVTestSuite) TestRelayAndApplyDowntimePacket() {
 		timeoutHeight    = clienttypes.Height{}
 		timeoutTimestamp = uint64(s.getFirstBundle().GetCtx().BlockTime().Add(ccv.DefaultCCVTimeoutPeriod).UnixNano())
 	)
-	slashPacket := s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmVal, stakingtypes.Infraction_INFRACTION_DOWNTIME)
-	sequence, err := s.getFirstBundle().Path.EndpointA.SendPacket(timeoutHeight, timeoutTimestamp, slashPacket.GetBytes())
+	slashPacket := s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmVal, stakingtypes.Infraction_INFRACTION_DOWNTIME, 1)
+	sequence, err := s.getFirstBundle().Path.EndpointA.SendPacket(timeoutHeight, timeoutTimestamp, slashPacket.GetData())
 	s.Require().NoError(err)
 
 	// Set outstanding slashing flag for first consumer, it's important to use the consumer's cons addr here
diff --git a/x/ccv/consumer/types/query.pb.go b/x/ccv/consumer/types/query.pb.go
index 282718d4e8..e1dd01af4b 100644
--- a/x/ccv/consumer/types/query.pb.go
+++ b/x/ccv/consumer/types/query.pb.go
@@ -253,7 +253,7 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo
 // QueryParamsResponse is response type for the Query/Params RPC method.
 type QueryParamsResponse struct {
 	// params holds all the parameters of this module.
-	Params types.Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
+	Params types.ConsumerParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
 }
 
 func (m *QueryParamsResponse) Reset()         { *m = QueryParamsResponse{} }
@@ -289,11 +289,11 @@ func (m *QueryParamsResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo
 
-func (m *QueryParamsResponse) GetParams() types.Params {
+func (m *QueryParamsResponse) GetParams() types.ConsumerParams {
 	if m != nil {
 		return m.Params
 	}
-	return types.Params{}
+	return types.ConsumerParams{}
 }
 
 type QueryProviderInfoRequest struct {
@@ -559,58 +559,58 @@ func init() {
 
 var fileDescriptor_f627751d3cc10225 = []byte{
 	// 825 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0xe3, 0x44,
-	0x14, 0x8e, 0xd3, 0x36, 0xbb, 0x99, 0x2e, 0x42, 0x3b, 0x04, 0xc9, 0x78, 0x57, 0xa1, 0x32, 0x20,
-	0x02, 0x52, 0xec, 0x24, 0x3d, 0x74, 0x39, 0x2c, 0x5b, 0xb5, 0xa1, 0x22, 0x12, 0xa0, 0xd4, 0xad,
-	0x54, 0xc1, 0x25, 0x4c, 0x27, 0xd3, 0xc4, 0x22, 0xf1, 0xb8, 0x33, 0x63, 0xd3, 0xde, 0x10, 0xdc,
-	0x11, 0x12, 0xff, 0x84, 0x3f, 0xc0, 0xb5, 0x12, 0x07, 0x2a, 0x71, 0x00, 0x2e, 0x08, 0xb5, 0xfc,
-	0x08, 0x8e, 0x68, 0xc6, 0xe3, 0xd4, 0x69, 0xd3, 0xc4, 0x2d, 0x7b, 0xb3, 0xdf, 0x37, 0xef, 0x7b,
-	0xdf, 0xf7, 0x3c, 0xef, 0x25, 0xc0, 0xf5, 0x03, 0x41, 0x18, 0x1e, 0x22, 0x3f, 0xe8, 0x71, 0x82,
-	0x23, 0xe6, 0x8b, 0x53, 0x17, 0xe3, 0xd8, 0xc5, 0x34, 0xe0, 0xd1, 0x98, 0x30, 0x37, 0x6e, 0xba,
-	0xc7, 0x11, 0x61, 0xa7, 0x4e, 0xc8, 0xa8, 0xa0, 0xf0, 0xad, 0x19, 0x09, 0x0e, 0xc6, 0xb1, 0x93,
-	0x26, 0x38, 0x71, 0xd3, 0x6a, 0xdc, 0xc6, 0x1a, 0x37, 0x5d, 0x3e, 0x44, 0x8c, 0xf4, 0x7b, 0x93,
-	0xe3, 0x8a, 0xd6, 0xaa, 0x0c, 0xe8, 0x80, 0xaa, 0x47, 0x57, 0x3e, 0xe9, 0xe8, 0xd3, 0x01, 0xa5,
-	0x83, 0x11, 0x71, 0x51, 0xe8, 0xbb, 0x28, 0x08, 0xa8, 0x40, 0xc2, 0xa7, 0x01, 0xd7, 0x68, 0x2b,
-	0x8f, 0xf6, 0x6b, 0x75, 0xde, 0x99, 0xa3, 0xec, 0x6b, 0x9f, 0x91, 0xe4, 0x98, 0xfd, 0x7d, 0x11,
-	0x3c, 0xf9, 0x8c, 0x9c, 0x88, 0x1d, 0x42, 0xda, 0x3e, 0x17, 0xcc, 0x3f, 0x8c, 0x64, 0xe5, 0x8f,
-	0xb8, 0xf0, 0xc7, 0x48, 0x10, 0xf8, 0x36, 0x78, 0x05, 0x47, 0x8c, 0x91, 0x40, 0x7c, 0x4c, 0xfc,
-	0xc1, 0x50, 0x98, 0xc6, 0x9a, 0x51, 0x5b, 0xf2, 0xa6, 0x83, 0xb0, 0x0a, 0xc0, 0x08, 0xf1, 0xf4,
-	0x48, 0x51, 0x1d, 0xc9, 0x44, 0x24, 0x1e, 0x90, 0x93, 0x14, 0x5f, 0x4a, 0xf0, 0xab, 0x08, 0x5c,
-	0x07, 0xaf, 0xf7, 0x33, 0xd5, 0x7b, 0x47, 0x0c, 0x61, 0xf9, 0x60, 0x2e, 0xaf, 0x19, 0xb5, 0xb2,
-	0x57, 0xc9, 0x82, 0x3b, 0x1a, 0x83, 0x15, 0xb0, 0x22, 0xa8, 0x40, 0x23, 0x73, 0x45, 0x1d, 0x4a,
-	0x5e, 0x64, 0x29, 0x41, 0xbb, 0x8c, 0xc6, 0x7e, 0x9f, 0x30, 0xb3, 0xa4, 0xa0, 0x4c, 0x24, 0xc1,
-	0xb7, 0x75, 0xaf, 0xcc, 0x07, 0x29, 0x9e, 0x46, 0xec, 0xf7, 0xc0, 0xbb, 0xbb, 0xf2, 0x16, 0xcc,
-	0x69, 0x8a, 0x47, 0x8e, 0x23, 0xc2, 0x85, 0xfd, 0x8d, 0x01, 0x6a, 0x8b, 0xcf, 0xf2, 0x90, 0x06,
-	0x9c, 0xc0, 0x7d, 0xb0, 0xdc, 0x47, 0x02, 0xa9, 0xfe, 0xad, 0xb6, 0x36, 0x9d, 0x1c, 0xb7, 0xcb,
-	0x99, 0xc7, 0xab, 0xd8, 0xec, 0x0a, 0x80, 0x4a, 0x41, 0x17, 0x31, 0x34, 0xe6, 0xa9, 0xb0, 0x03,
-	0xf0, 0xda, 0x54, 0x54, 0x4b, 0xd8, 0x04, 0xa5, 0x50, 0x45, 0xb4, 0x08, 0xfb, 0x56, 0x11, 0x71,
-	0xd3, 0x49, 0x72, 0xb7, 0x96, 0xcf, 0xfe, 0x7a, 0xb3, 0xe0, 0xe9, 0x3c, 0xdb, 0x02, 0x66, 0x42,
-	0xac, 0xbb, 0xd9, 0x09, 0x8e, 0x68, 0x5a, 0xf4, 0x67, 0x03, 0xbc, 0x31, 0x03, 0xd4, 0xb5, 0xbb,
-	0xe0, 0x61, 0xea, 0x4c, 0x57, 0x77, 0x72, 0xb5, 0x60, 0x5b, 0xc2, 0x92, 0x49, 0x2b, 0x99, 0xb0,
-	0x48, 0xc6, 0x30, 0xfd, 0xcc, 0xc5, 0xff, 0xc3, 0x98, 0xb2, 0xd8, 0x4f, 0xb4, 0x81, 0xfd, 0x21,
-	0xa3, 0x42, 0x8c, 0xc8, 0x9e, 0xc8, 0x7c, 0xec, 0x3f, 0x0d, 0x60, 0xcd, 0x42, 0xb5, 0xbf, 0xcf,
-	0xc1, 0x23, 0x3e, 0x42, 0x7c, 0xd8, 0x63, 0x04, 0x53, 0xd6, 0xd7, 0x1e, 0x1b, 0xb9, 0x14, 0xed,
-	0xc9, 0x44, 0x4f, 0xe5, 0x29, 0x4d, 0x86, 0xb7, 0xca, 0xaf, 0x42, 0xf0, 0x4b, 0xf0, 0x38, 0x44,
-	0xf8, 0x2b, 0x22, 0x7a, 0xf2, 0x93, 0xf7, 0x8e, 0x23, 0x12, 0x11, 0xb3, 0xb8, 0xb6, 0x34, 0xd7,
-	0xb1, 0x34, 0xaa, 0x4b, 0x74, 0x55, 0x72, 0x1b, 0x09, 0xa4, 0x1d, 0xbf, 0x1a, 0x4e, 0x22, 0xbb,
-	0x92, 0xcc, 0xfe, 0xce, 0x00, 0xe5, 0x49, 0x5b, 0xa0, 0x09, 0x1e, 0x28, 0xc2, 0x4e, 0x5b, 0xb9,
-	0x28, 0x7b, 0xe9, 0x2b, 0xb4, 0xc0, 0x43, 0x3c, 0xf2, 0x49, 0x20, 0x3a, 0x6d, 0xd5, 0xf2, 0xb2,
-	0x37, 0x79, 0x87, 0x36, 0x78, 0x84, 0x69, 0x10, 0x10, 0x35, 0x9b, 0x9d, 0xb6, 0x1a, 0xf2, 0xb2,
-	0x37, 0x15, 0x83, 0x4f, 0x41, 0x19, 0x0f, 0x51, 0x10, 0x90, 0x51, 0xa7, 0xad, 0x47, 0xfb, 0x2a,
-	0xd0, 0xfa, 0xbd, 0x04, 0x56, 0x54, 0x87, 0xe1, 0xbf, 0x86, 0xbe, 0x67, 0x33, 0x06, 0x00, 0x7e,
-	0x92, 0xab, 0xa7, 0x39, 0x67, 0xd8, 0xfa, 0xf4, 0x25, 0xb1, 0x25, 0xd7, 0xc0, 0x7e, 0xf1, 0xed,
-	0x6f, 0xff, 0xfc, 0x58, 0xfc, 0x00, 0x6e, 0x2c, 0xfe, 0xb9, 0x91, 0xeb, 0xaf, 0x7e, 0x44, 0x48,
-	0x3d, 0xbb, 0xdc, 0xe0, 0x4f, 0x06, 0x58, 0xcd, 0xcc, 0x2e, 0xdc, 0xc8, 0xaf, 0x6f, 0x6a, 0x07,
-	0x58, 0xcf, 0xee, 0x9e, 0xa8, 0x3d, 0x34, 0x94, 0x87, 0xf7, 0x61, 0x6d, 0xb1, 0x87, 0x64, 0x2d,
-	0xc0, 0x5f, 0x0c, 0xf0, 0xf8, 0xc6, 0xe8, 0xc3, 0xe7, 0x77, 0x50, 0x70, 0x73, 0x9f, 0x58, 0x1f,
-	0xde, 0x37, 0x5d, 0xdb, 0xd8, 0x50, 0x36, 0x9a, 0xd0, 0xcd, 0x61, 0x43, 0xe7, 0xd7, 0x7d, 0xa9,
-	0xfb, 0x57, 0x43, 0x2f, 0xd5, 0xa9, 0x49, 0x87, 0x77, 0xd0, 0x33, 0x6b, 0x81, 0x58, 0x2f, 0xee,
-	0x9d, 0xaf, 0x0d, 0x3d, 0x53, 0x86, 0x5a, 0xb0, 0xb1, 0xd8, 0x90, 0xd0, 0x04, 0x3d, 0x2e, 0x19,
-	0xb6, 0x0e, 0xce, 0x2e, 0xaa, 0xc6, 0xf9, 0x45, 0xd5, 0xf8, 0xfb, 0xa2, 0x6a, 0xfc, 0x70, 0x59,
-	0x2d, 0x9c, 0x5f, 0x56, 0x0b, 0x7f, 0x5c, 0x56, 0x0b, 0x5f, 0x3c, 0x1f, 0xf8, 0x62, 0x18, 0x1d,
-	0x3a, 0x98, 0x8e, 0x5d, 0x4c, 0xf9, 0x98, 0xf2, 0x0c, 0x79, 0x7d, 0x42, 0x1e, 0xaf, 0xbb, 0x27,
-	0xd7, 0x2a, 0x9c, 0x86, 0x84, 0x1f, 0x96, 0xd4, 0x9f, 0x88, 0xf5, 0xff, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x98, 0xfe, 0x6e, 0x83, 0x5d, 0x09, 0x00, 0x00,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
+	0x14, 0x8f, 0xd3, 0x36, 0xbb, 0x99, 0x2e, 0x42, 0x3b, 0x04, 0xc9, 0x78, 0x57, 0xa1, 0x32, 0x20,
+	0xc2, 0x4a, 0xb1, 0x93, 0xf4, 0xd0, 0xe5, 0xb0, 0x2c, 0xda, 0x86, 0xaa, 0x91, 0x00, 0xb5, 0x6e,
+	0x25, 0x04, 0x17, 0x33, 0x9d, 0x4c, 0x13, 0x8b, 0xc4, 0xe3, 0xce, 0x8c, 0x4d, 0x7b, 0x43, 0x70,
+	0x47, 0x48, 0x7c, 0x13, 0xbe, 0x00, 0xd7, 0x4a, 0x1c, 0xa8, 0xc4, 0x01, 0xb8, 0x20, 0xd4, 0xf2,
+	0x21, 0x38, 0xa2, 0x19, 0x8f, 0x53, 0xa7, 0x4d, 0x13, 0xb7, 0xec, 0xcd, 0xf3, 0xfe, 0xfc, 0xde,
+	0xef, 0xf7, 0x66, 0xde, 0x4b, 0x80, 0x1b, 0x84, 0x82, 0x30, 0x3c, 0x44, 0x41, 0xe8, 0x73, 0x82,
+	0x63, 0x16, 0x88, 0x13, 0x17, 0xe3, 0xc4, 0xc5, 0x34, 0xe4, 0xf1, 0x98, 0x30, 0x37, 0x69, 0xbb,
+	0x47, 0x31, 0x61, 0x27, 0x4e, 0xc4, 0xa8, 0xa0, 0xf0, 0xad, 0x19, 0x09, 0x0e, 0xc6, 0x89, 0x93,
+	0x25, 0x38, 0x49, 0xdb, 0x6a, 0xdd, 0x84, 0x9a, 0xb4, 0x5d, 0x3e, 0x44, 0x8c, 0xf4, 0xfd, 0x49,
+	0xb8, 0x82, 0xb5, 0x6a, 0x03, 0x3a, 0xa0, 0xea, 0xd3, 0x95, 0x5f, 0xda, 0xfa, 0x78, 0x40, 0xe9,
+	0x60, 0x44, 0x5c, 0x14, 0x05, 0x2e, 0x0a, 0x43, 0x2a, 0x90, 0x08, 0x68, 0xc8, 0xb5, 0xb7, 0x53,
+	0x84, 0xfb, 0x95, 0x3a, 0xef, 0xcc, 0x61, 0xf6, 0x75, 0xc0, 0x48, 0x1a, 0x66, 0x7f, 0x5f, 0x06,
+	0x8f, 0x3e, 0x25, 0xc7, 0x62, 0x8b, 0x90, 0x6e, 0xc0, 0x05, 0x0b, 0x0e, 0x62, 0x59, 0xf9, 0x23,
+	0x2e, 0x82, 0x31, 0x12, 0x04, 0xbe, 0x0d, 0x5e, 0xc1, 0x31, 0x63, 0x24, 0x14, 0xdb, 0x24, 0x18,
+	0x0c, 0x85, 0x69, 0xac, 0x19, 0x8d, 0x25, 0x6f, 0xda, 0x08, 0xeb, 0x00, 0x8c, 0x10, 0xcf, 0x42,
+	0xca, 0x2a, 0x24, 0x67, 0x91, 0xfe, 0x90, 0x1c, 0x67, 0xfe, 0xa5, 0xd4, 0x7f, 0x69, 0x81, 0xeb,
+	0xe0, 0xf5, 0x7e, 0xae, 0xba, 0x7f, 0xc8, 0x10, 0x96, 0x1f, 0xe6, 0xf2, 0x9a, 0xd1, 0xa8, 0x7a,
+	0xb5, 0xbc, 0x73, 0x4b, 0xfb, 0x60, 0x0d, 0xac, 0x08, 0x2a, 0xd0, 0xc8, 0x5c, 0x51, 0x41, 0xe9,
+	0x41, 0x96, 0x12, 0x74, 0x87, 0xd1, 0x24, 0xe8, 0x13, 0x66, 0x56, 0x94, 0x2b, 0x67, 0x49, 0xfd,
+	0x9b, 0xba, 0x57, 0xe6, 0xbd, 0xcc, 0x9f, 0x59, 0xec, 0xf7, 0xc0, 0xbb, 0xbb, 0xf2, 0x15, 0xcc,
+	0x69, 0x8a, 0x47, 0x8e, 0x62, 0xc2, 0x85, 0xfd, 0x8d, 0x01, 0x1a, 0x8b, 0x63, 0x79, 0x44, 0x43,
+	0x4e, 0xe0, 0x3e, 0x58, 0xee, 0x23, 0x81, 0x54, 0xff, 0x56, 0x3b, 0x1f, 0x3a, 0x05, 0x5e, 0x97,
+	0x33, 0x0f, 0x57, 0xa1, 0xd9, 0x35, 0x00, 0x15, 0x83, 0x1d, 0xc4, 0xd0, 0x98, 0x67, 0xc4, 0x7c,
+	0xf0, 0xda, 0x94, 0x55, 0x53, 0xd8, 0x06, 0x95, 0x48, 0x59, 0x34, 0x89, 0x27, 0x37, 0x92, 0x48,
+	0xda, 0x4e, 0xd6, 0x90, 0x14, 0xe3, 0xc5, 0xf2, 0xe9, 0x5f, 0x6f, 0x96, 0x3c, 0x9d, 0x6f, 0x5b,
+	0xc0, 0x4c, 0x0b, 0xe8, 0xae, 0xf6, 0xc2, 0x43, 0x9a, 0x15, 0xff, 0xd9, 0x00, 0x6f, 0xcc, 0x70,
+	0x6a, 0x0e, 0x3b, 0xe0, 0x7e, 0xa6, 0x50, 0xb3, 0x70, 0x0a, 0xb5, 0x62, 0x53, 0xba, 0x25, 0x92,
+	0x66, 0x32, 0x41, 0x91, 0x88, 0x51, 0x76, 0xdd, 0xe5, 0xff, 0x83, 0x98, 0xa1, 0xd8, 0x8f, 0xb4,
+	0x80, 0xfd, 0x21, 0xa3, 0x42, 0x8c, 0xc8, 0x9e, 0xc8, 0x5d, 0xfa, 0x9f, 0x06, 0xb0, 0x66, 0x79,
+	0xb5, 0xbe, 0xcf, 0xc1, 0x03, 0x3e, 0x42, 0x7c, 0xe8, 0x33, 0x82, 0x29, 0xeb, 0x6b, 0x8d, 0xad,
+	0x42, 0x8c, 0xf6, 0x64, 0xa2, 0xa7, 0xf2, 0x14, 0x27, 0xc3, 0x5b, 0xe5, 0x97, 0x26, 0xf8, 0x25,
+	0x78, 0x18, 0x21, 0xfc, 0x15, 0x11, 0xbe, 0xbc, 0x7a, 0xff, 0x28, 0x26, 0x31, 0x31, 0xcb, 0x6b,
+	0x4b, 0x73, 0x15, 0x4f, 0xdd, 0xa4, 0x4c, 0xee, 0x22, 0x81, 0xb4, 0xe2, 0x57, 0xa3, 0x89, 0x65,
+	0x57, 0x82, 0xd9, 0xdf, 0x19, 0xa0, 0x3a, 0x69, 0x0b, 0x34, 0xc1, 0x3d, 0x05, 0xd8, 0xeb, 0x2a,
+	0x15, 0x55, 0x2f, 0x3b, 0x42, 0x0b, 0xdc, 0xc7, 0xa3, 0x80, 0x84, 0xa2, 0xd7, 0x55, 0x2d, 0xaf,
+	0x7a, 0x93, 0x33, 0xb4, 0xc1, 0x03, 0x4c, 0xc3, 0x90, 0xa8, 0x19, 0xed, 0x75, 0xd5, 0xb0, 0x57,
+	0xbd, 0x29, 0x1b, 0x7c, 0x0c, 0xaa, 0x78, 0x88, 0xc2, 0x90, 0x8c, 0x7a, 0x5d, 0x3d, 0xe2, 0x97,
+	0x86, 0xce, 0xef, 0x15, 0xb0, 0xa2, 0x3a, 0x0c, 0xff, 0x35, 0xf4, 0x3b, 0x9b, 0x31, 0x08, 0xf0,
+	0xe3, 0x42, 0x3d, 0x2d, 0x38, 0xcb, 0xd6, 0x27, 0x2f, 0x09, 0x2d, 0x7d, 0x06, 0xf6, 0xf3, 0x6f,
+	0x7f, 0xfb, 0xe7, 0xc7, 0xf2, 0xfb, 0x70, 0x63, 0xf1, 0xcf, 0x8e, 0x5c, 0x83, 0xcd, 0x43, 0x42,
+	0x9a, 0xf9, 0x25, 0x07, 0x7f, 0x32, 0xc0, 0x6a, 0x6e, 0x86, 0xe1, 0x46, 0x71, 0x7e, 0x53, 0xbb,
+	0xc0, 0x7a, 0x7a, 0xfb, 0x44, 0xad, 0xa1, 0xa5, 0x34, 0x3c, 0x81, 0x8d, 0xc5, 0x1a, 0xd2, 0xb5,
+	0x00, 0x7f, 0x31, 0xc0, 0xc3, 0x6b, 0xa3, 0x0f, 0x9f, 0xdd, 0x82, 0xc1, 0xf5, 0x7d, 0x62, 0x7d,
+	0x70, 0xd7, 0x74, 0x2d, 0x63, 0x43, 0xc9, 0x68, 0x43, 0xb7, 0x80, 0x0c, 0x9d, 0xdf, 0x0c, 0x24,
+	0xef, 0x5f, 0x0d, 0xbd, 0x5c, 0xa7, 0x26, 0x1d, 0xde, 0x82, 0xcf, 0xac, 0x05, 0x62, 0x3d, 0xbf,
+	0x73, 0xbe, 0x16, 0xf4, 0x54, 0x09, 0xea, 0xc0, 0xd6, 0x62, 0x41, 0x42, 0x03, 0xf8, 0x5c, 0x22,
+	0xbc, 0xf8, 0xec, 0xf4, 0xbc, 0x6e, 0x9c, 0x9d, 0xd7, 0x8d, 0xbf, 0xcf, 0xeb, 0xc6, 0x0f, 0x17,
+	0xf5, 0xd2, 0xd9, 0x45, 0xbd, 0xf4, 0xc7, 0x45, 0xbd, 0xf4, 0xc5, 0xb3, 0x41, 0x20, 0x86, 0xf1,
+	0x81, 0x83, 0xe9, 0xd8, 0xc5, 0x94, 0x8f, 0x29, 0xcf, 0x81, 0x37, 0x27, 0xe0, 0xc9, 0xba, 0x7b,
+	0x7c, 0xa5, 0xc2, 0x49, 0x44, 0xf8, 0x41, 0x45, 0xfd, 0x99, 0x58, 0xff, 0x2f, 0x00, 0x00, 0xff,
+	0xff, 0x0e, 0x14, 0x5a, 0xa9, 0x65, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go
index 0ff8aba62c..37ef05d20f 100644
--- a/x/ccv/provider/types/query.pb.go
+++ b/x/ccv/provider/types/query.pb.go
@@ -79,7 +79,7 @@ func (m *QueryConsumerGenesisRequest) GetChainId() string {
 }
 
 type QueryConsumerGenesisResponse struct {
-	GenesisState types.GenesisState `protobuf:"bytes,1,opt,name=genesis_state,json=genesisState,proto3" json:"genesis_state"`
+	GenesisState types.ConsumerGenesisState `protobuf:"bytes,1,opt,name=genesis_state,json=genesisState,proto3" json:"genesis_state"`
 }
 
 func (m *QueryConsumerGenesisResponse) Reset()         { *m = QueryConsumerGenesisResponse{} }
@@ -115,11 +115,11 @@ func (m *QueryConsumerGenesisResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryConsumerGenesisResponse proto.InternalMessageInfo
 
-func (m *QueryConsumerGenesisResponse) GetGenesisState() types.GenesisState {
+func (m *QueryConsumerGenesisResponse) GetGenesisState() types.ConsumerGenesisState {
 	if m != nil {
 		return m.GenesisState
 	}
-	return types.GenesisState{}
+	return types.ConsumerGenesisState{}
 }
 
 type QueryConsumerChainsRequest struct {
@@ -806,74 +806,74 @@ func init() {
 }
 
 var fileDescriptor_422512d7b7586cd7 = []byte{
-	// 1059 bytes of a gzipped FileDescriptorProto
+	// 1060 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xdc, 0x44,
-	0x14, 0x5e, 0x27, 0x34, 0x24, 0x13, 0x20, 0xd5, 0xb4, 0x94, 0xad, 0x13, 0xed, 0x16, 0x57, 0xc0,
-	0xb6, 0x80, 0xdd, 0xdd, 0x5c, 0xda, 0xa2, 0x74, 0xb3, 0x1b, 0x42, 0xa8, 0xda, 0xaa, 0xc1, 0xa9,
-	0x40, 0x02, 0x84, 0x35, 0xb1, 0x87, 0x5d, 0x4b, 0x5e, 0x8f, 0x3b, 0x33, 0xeb, 0x34, 0x42, 0x1c,
+	0x14, 0x5e, 0x27, 0x34, 0x24, 0x13, 0x20, 0xd5, 0xb4, 0x94, 0xad, 0x13, 0xed, 0x16, 0x57, 0x40,
+	0x5a, 0xc0, 0xce, 0x6e, 0x2e, 0x6d, 0x51, 0xba, 0xd9, 0x0d, 0x21, 0x54, 0x6d, 0xd5, 0xe0, 0x56,
+	0x20, 0x01, 0xc2, 0x9a, 0xd8, 0xc3, 0xae, 0x25, 0xaf, 0xc7, 0x9d, 0x99, 0x75, 0x1a, 0x55, 0x1c,
 	0xe0, 0x00, 0x3d, 0x56, 0x42, 0x70, 0xee, 0x9f, 0xd3, 0x1b, 0x45, 0xbd, 0x70, 0x2a, 0x28, 0xe1,
-	0xc0, 0x11, 0x71, 0x47, 0x42, 0x1e, 0x8f, 0xbd, 0xbf, 0x9c, 0x5d, 0x67, 0x9b, 0x5b, 0xf6, 0xcd,
-	0x7b, 0xdf, 0xfb, 0xbe, 0xa7, 0x37, 0xf3, 0x39, 0xc0, 0x70, 0x7d, 0x8e, 0xa9, 0xdd, 0x46, 0xae,
-	0x6f, 0x31, 0x6c, 0x77, 0xa9, 0xcb, 0xf7, 0x0d, 0xdb, 0x0e, 0x8d, 0x80, 0x92, 0xd0, 0x75, 0x30,
-	0x35, 0xc2, 0xaa, 0x71, 0xbf, 0x8b, 0xe9, 0xbe, 0x1e, 0x50, 0xc2, 0x09, 0xbc, 0x98, 0x51, 0xa0,
-	0xdb, 0x76, 0xa8, 0x27, 0x05, 0x7a, 0x58, 0x55, 0x57, 0x5a, 0x84, 0xb4, 0x3c, 0x6c, 0xa0, 0xc0,
-	0x35, 0x90, 0xef, 0x13, 0x8e, 0xb8, 0x4b, 0x7c, 0x16, 0x43, 0xa8, 0x67, 0x5b, 0xa4, 0x45, 0xc4,
-	0x9f, 0x46, 0xf4, 0x97, 0x8c, 0x96, 0x65, 0x8d, 0xf8, 0xb5, 0xdb, 0xfd, 0xda, 0xe0, 0x6e, 0x07,
-	0x33, 0x8e, 0x3a, 0x81, 0x4c, 0xa8, 0xe5, 0xa1, 0x9a, 0xb2, 0x88, 0x6b, 0xae, 0x1c, 0x55, 0x13,
-	0x56, 0x0d, 0xd6, 0x46, 0x14, 0x3b, 0x96, 0x4d, 0x7c, 0xd6, 0xed, 0xa4, 0x15, 0x6f, 0x8d, 0xa9,
-	0xd8, 0x73, 0x29, 0x8e, 0xd3, 0xb4, 0xab, 0x60, 0xf9, 0x93, 0x68, 0x2a, 0x1b, 0xb2, 0x7a, 0x0b,
-	0xfb, 0x98, 0xb9, 0xcc, 0xc4, 0xf7, 0xbb, 0x98, 0x71, 0x78, 0x1e, 0xcc, 0xc7, 0x10, 0xae, 0x53,
-	0x54, 0x2e, 0x28, 0x95, 0x05, 0xf3, 0x65, 0xf1, 0xfb, 0xa6, 0xa3, 0x31, 0xb0, 0x92, 0x5d, 0xc9,
-	0x02, 0xe2, 0x33, 0x0c, 0x77, 0xc0, 0xab, 0xad, 0x38, 0x64, 0x31, 0x8e, 0x38, 0x16, 0xf5, 0x8b,
-	0xb5, 0x8a, 0x7e, 0xd4, 0xe0, 0xc3, 0xaa, 0x2e, 0x31, 0x76, 0xa2, 0xfc, 0xe6, 0x4b, 0x4f, 0x9e,
-	0x97, 0x0b, 0xe6, 0x2b, 0xad, 0xbe, 0x98, 0xb6, 0x02, 0xd4, 0x81, 0xa6, 0x1b, 0x11, 0x4c, 0xc2,
-	0x56, 0x43, 0x43, 0x62, 0x92, 0x53, 0xc9, 0xa8, 0x09, 0xe6, 0x44, 0x5b, 0x56, 0x54, 0x2e, 0xcc,
-	0x56, 0x16, 0x6b, 0x97, 0xf5, 0x1c, 0x3b, 0xa0, 0x0b, 0x10, 0x53, 0x56, 0x6a, 0x97, 0xc0, 0x3b,
-	0xa3, 0x2d, 0x76, 0x38, 0xa2, 0x7c, 0x9b, 0x92, 0x80, 0x30, 0xe4, 0xa5, 0x6c, 0x1e, 0x2a, 0xa0,
-	0x32, 0x39, 0x57, 0x72, 0xfb, 0x12, 0x2c, 0x04, 0x49, 0x50, 0x4e, 0xea, 0x46, 0x3e, 0x7a, 0x12,
-	0xbc, 0xe1, 0x38, 0x6e, 0xb4, 0x9c, 0x3d, 0xe8, 0x1e, 0xa0, 0x56, 0x01, 0x6f, 0x67, 0x31, 0x21,
-	0xc1, 0x08, 0xe9, 0x1f, 0x94, 0x6c, 0x81, 0x03, 0xa9, 0x92, 0xf3, 0x17, 0xa3, 0x9c, 0xd7, 0x8e,
-	0xc5, 0xd9, 0xc4, 0x1d, 0x12, 0x22, 0x2f, 0x93, 0x72, 0x1d, 0x9c, 0x12, 0xad, 0xc7, 0xac, 0x20,
-	0x5c, 0x06, 0x0b, 0xb6, 0xe7, 0x62, 0x9f, 0x47, 0x67, 0x33, 0xe2, 0x6c, 0x3e, 0x0e, 0xdc, 0x74,
-	0xb4, 0x1f, 0x15, 0xf0, 0xa6, 0x50, 0xf2, 0x29, 0xf2, 0x5c, 0x07, 0x71, 0x42, 0xfb, 0x46, 0x45,
-	0x27, 0x2f, 0x38, 0x5c, 0x03, 0xa7, 0x13, 0xd2, 0x16, 0x72, 0x1c, 0x8a, 0x19, 0x8b, 0x9b, 0x34,
-	0xe1, 0xbf, 0xcf, 0xcb, 0xaf, 0xed, 0xa3, 0x8e, 0x77, 0x5d, 0x93, 0x07, 0x9a, 0xb9, 0x94, 0xe4,
-	0x36, 0xe2, 0xc8, 0xf5, 0xf9, 0x87, 0x8f, 0xcb, 0x85, 0xbf, 0x1f, 0x97, 0x0b, 0xda, 0x5d, 0xa0,
-	0x8d, 0x23, 0x22, 0xa7, 0x79, 0x09, 0x9c, 0x4e, 0xae, 0x70, 0xda, 0x2e, 0x66, 0xb4, 0x64, 0xf7,
-	0xe5, 0x47, 0xcd, 0x46, 0xa5, 0x6d, 0xf7, 0x35, 0xcf, 0x27, 0x6d, 0xa4, 0xd7, 0x18, 0x69, 0x43,
-	0xfd, 0xc7, 0x49, 0x1b, 0x24, 0xd2, 0x93, 0x36, 0x32, 0x49, 0x29, 0x6d, 0x68, 0x6a, 0xda, 0x32,
-	0x38, 0x2f, 0x00, 0xef, 0xb5, 0x29, 0xe1, 0xdc, 0xc3, 0xe2, 0xda, 0x27, 0xcb, 0xf9, 0x9b, 0x22,
-	0xaf, 0xff, 0xd0, 0xa9, 0x6c, 0x53, 0x06, 0x8b, 0xcc, 0x43, 0xac, 0x6d, 0x75, 0x30, 0xc7, 0x54,
-	0x74, 0x98, 0x35, 0x81, 0x08, 0xdd, 0x89, 0x22, 0xb0, 0x06, 0x5e, 0xef, 0x4b, 0xb0, 0x90, 0xe7,
-	0x91, 0x3d, 0xe4, 0xdb, 0x58, 0x68, 0x9f, 0x35, 0xcf, 0xf4, 0x52, 0x1b, 0xc9, 0x11, 0xfc, 0x0a,
-	0x14, 0x7d, 0xfc, 0x80, 0x5b, 0x14, 0x07, 0x1e, 0xf6, 0x5d, 0xd6, 0xb6, 0x6c, 0xe4, 0x3b, 0x91,
-	0x58, 0x5c, 0x9c, 0x15, 0x3b, 0xaf, 0xea, 0xf1, 0x8b, 0xaf, 0x27, 0x2f, 0xbe, 0x7e, 0x2f, 0x79,
-	0xf1, 0x9b, 0xf3, 0xd1, 0x1b, 0xf6, 0xe8, 0x8f, 0xb2, 0x62, 0x9e, 0x8b, 0x50, 0xcc, 0x04, 0x64,
-	0x23, 0xc1, 0xd0, 0xde, 0x03, 0x97, 0x85, 0x24, 0x13, 0xb7, 0x5c, 0xc6, 0x31, 0xc5, 0x4e, 0xef,
-	0x76, 0xec, 0x21, 0xea, 0x7c, 0x88, 0x7d, 0xd2, 0x49, 0xaf, 0xe7, 0x26, 0x78, 0x37, 0x57, 0xb6,
-	0x9c, 0xc8, 0x39, 0x30, 0xe7, 0x88, 0x88, 0x78, 0xf1, 0x16, 0x4c, 0xf9, 0xab, 0xf6, 0xcb, 0x12,
-	0x38, 0x25, 0x70, 0xe0, 0x81, 0x02, 0xce, 0x66, 0x3d, 0xe3, 0x70, 0x3d, 0xd7, 0x4d, 0x1e, 0xe3,
-	0x1d, 0x6a, 0xe3, 0x05, 0x10, 0x62, 0xfe, 0xda, 0xe6, 0xf7, 0xcf, 0xfe, 0xfa, 0x69, 0xa6, 0x0e,
-	0xd7, 0x26, 0xdb, 0x7b, 0xba, 0xcf, 0xd2, 0x2f, 0x8c, 0x6f, 0x92, 0xe5, 0xff, 0x16, 0x3e, 0x53,
-	0xc0, 0x99, 0x0c, 0x63, 0x80, 0xf5, 0xe3, 0x33, 0x1c, 0x30, 0x1c, 0x75, 0x7d, 0x7a, 0x00, 0xa9,
-	0xf0, 0x9a, 0x50, 0xb8, 0x0a, 0xab, 0xc7, 0x50, 0x18, 0x5b, 0x11, 0xfc, 0x6e, 0x06, 0x14, 0x8f,
-	0xf0, 0x17, 0x06, 0x6f, 0x4f, 0xc9, 0x2c, 0xd3, 0xca, 0xd4, 0x3b, 0x27, 0x84, 0x26, 0x45, 0x7f,
-	0x2c, 0x44, 0x37, 0xe1, 0xfa, 0x71, 0x45, 0x47, 0x5f, 0x12, 0x94, 0x5b, 0xa9, 0x4b, 0xc0, 0xff,
-	0x14, 0xf0, 0x46, 0xb6, 0x5d, 0x31, 0x78, 0x6b, 0x6a, 0xd2, 0xa3, 0xbe, 0xa8, 0xde, 0x3e, 0x19,
-	0x30, 0x39, 0x80, 0x2d, 0x31, 0x80, 0x06, 0xac, 0x4f, 0x31, 0x00, 0x12, 0xf4, 0xe9, 0xff, 0x27,
-	0x79, 0x11, 0x33, 0xbd, 0x05, 0x7e, 0x94, 0x9f, 0xf5, 0x38, 0x97, 0x54, 0xb7, 0x5e, 0x18, 0x47,
-	0x0a, 0x6f, 0x08, 0xe1, 0x1f, 0xc0, 0x6b, 0x39, 0xbe, 0xd7, 0x13, 0x20, 0x6b, 0xc0, 0xaa, 0x32,
-	0x24, 0xf7, 0x7b, 0xce, 0x54, 0x92, 0x33, 0xdc, 0x73, 0x2a, 0xc9, 0x59, 0xe6, 0x37, 0x9d, 0xe4,
-	0x01, 0xbb, 0x84, 0xbf, 0x2a, 0x00, 0x8e, 0xfa, 0x1e, 0xbc, 0x91, 0x9f, 0x62, 0x96, 0x9d, 0xaa,
-	0xf5, 0xa9, 0xeb, 0xa5, 0xb4, 0xab, 0x42, 0x5a, 0x0d, 0x5e, 0x99, 0x2c, 0x8d, 0x4b, 0x80, 0xf8,
-	0x7f, 0x01, 0xf8, 0xf3, 0x0c, 0xb8, 0x98, 0xc3, 0xc8, 0xe0, 0xdd, 0xfc, 0x14, 0x73, 0x19, 0xa8,
-	0xba, 0x7d, 0x72, 0x80, 0x72, 0x08, 0xb7, 0xc4, 0x10, 0x36, 0xe1, 0xc6, 0xe4, 0x21, 0xd0, 0x14,
-	0xb1, 0xb7, 0xd3, 0x54, 0x60, 0x5a, 0xb1, 0x31, 0x37, 0x3f, 0x7b, 0x72, 0x50, 0x52, 0x9e, 0x1e,
-	0x94, 0x94, 0x3f, 0x0f, 0x4a, 0xca, 0xa3, 0xc3, 0x52, 0xe1, 0xe9, 0x61, 0xa9, 0xf0, 0xfb, 0x61,
-	0xa9, 0xf0, 0xf9, 0x5a, 0xcb, 0xe5, 0xed, 0xee, 0xae, 0x6e, 0x93, 0x8e, 0x61, 0x13, 0xd6, 0x21,
-	0xac, 0xaf, 0xdf, 0xfb, 0x69, 0xbf, 0x70, 0xd5, 0x78, 0x30, 0x34, 0xf9, 0xfd, 0x00, 0xb3, 0xdd,
-	0x39, 0xf1, 0x71, 0xb2, 0xfa, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x26, 0xbd, 0x0a, 0x28,
-	0x0f, 0x00, 0x00,
+	0xc0, 0x11, 0x71, 0x47, 0xaa, 0x3c, 0x1e, 0x7b, 0x7f, 0x39, 0xbb, 0xce, 0x26, 0x37, 0x7b, 0xe6,
+	0xbd, 0xef, 0x7d, 0xdf, 0xdb, 0x37, 0xf3, 0x79, 0x81, 0xe1, 0xfa, 0x1c, 0x53, 0xbb, 0x85, 0x5c,
+	0xdf, 0x62, 0xd8, 0xee, 0x50, 0x97, 0xef, 0x19, 0xb6, 0x1d, 0x1a, 0x01, 0x25, 0xa1, 0xeb, 0x60,
+	0x6a, 0x84, 0x15, 0xe3, 0x7e, 0x07, 0xd3, 0x3d, 0x3d, 0xa0, 0x84, 0x13, 0x78, 0x31, 0x23, 0x41,
+	0xb7, 0xed, 0x50, 0x4f, 0x12, 0xf4, 0xb0, 0xa2, 0x2e, 0x35, 0x09, 0x69, 0x7a, 0xd8, 0x40, 0x81,
+	0x6b, 0x20, 0xdf, 0x27, 0x1c, 0x71, 0x97, 0xf8, 0x2c, 0x86, 0x50, 0xcf, 0x36, 0x49, 0x93, 0x88,
+	0x47, 0x23, 0x7a, 0x92, 0xab, 0x65, 0x99, 0x23, 0xde, 0x76, 0x3a, 0xdf, 0x1a, 0xdc, 0x6d, 0x63,
+	0xc6, 0x51, 0x3b, 0x90, 0x01, 0xd5, 0x3c, 0x54, 0x53, 0x16, 0x71, 0xce, 0xca, 0x61, 0x39, 0x61,
+	0xc5, 0x60, 0x2d, 0x44, 0xb1, 0x63, 0xd9, 0xc4, 0x67, 0x9d, 0x76, 0x9a, 0xf1, 0xce, 0x88, 0x8c,
+	0x5d, 0x97, 0xe2, 0x38, 0x4c, 0xbb, 0x02, 0x16, 0x3f, 0x8b, 0xba, 0xb2, 0x21, 0xb3, 0xb7, 0xb0,
+	0x8f, 0x99, 0xcb, 0x4c, 0x7c, 0xbf, 0x83, 0x19, 0x87, 0xe7, 0xc1, 0x6c, 0x0c, 0xe1, 0x3a, 0x45,
+	0xe5, 0x82, 0xb2, 0x3c, 0x67, 0xbe, 0x2a, 0xde, 0x6f, 0x38, 0xda, 0x43, 0xb0, 0x94, 0x9d, 0xc9,
+	0x02, 0xe2, 0x33, 0x0c, 0xbf, 0x02, 0xaf, 0x37, 0xe3, 0x25, 0x8b, 0x71, 0xc4, 0xb1, 0xc8, 0x9f,
+	0xaf, 0xae, 0xe8, 0x87, 0x35, 0x3e, 0xac, 0xe8, 0x03, 0x58, 0x77, 0xa3, 0xbc, 0xc6, 0x2b, 0x4f,
+	0x5f, 0x94, 0x0b, 0xe6, 0x6b, 0xcd, 0x9e, 0x35, 0x6d, 0x09, 0xa8, 0x7d, 0xc5, 0x37, 0x22, 0xb8,
+	0x84, 0xb5, 0x86, 0x06, 0x44, 0x25, 0xbb, 0x92, 0x59, 0x03, 0xcc, 0x88, 0xf2, 0xac, 0xa8, 0x5c,
+	0x98, 0x5e, 0x9e, 0xaf, 0x5e, 0xd6, 0x73, 0xcc, 0x82, 0x2e, 0x40, 0x4c, 0x99, 0xa9, 0x5d, 0x02,
+	0xef, 0x0d, 0x97, 0xb8, 0xcb, 0x11, 0xe5, 0xdb, 0x94, 0x04, 0x84, 0x21, 0x2f, 0x65, 0xf3, 0x48,
+	0x01, 0xcb, 0xe3, 0x63, 0x25, 0xb7, 0xaf, 0xc1, 0x5c, 0x90, 0x2c, 0xca, 0x8e, 0x5d, 0xcf, 0x47,
+	0x4f, 0x82, 0xd7, 0x1d, 0xc7, 0x8d, 0x86, 0xb4, 0x0b, 0xdd, 0x05, 0xd4, 0x96, 0xc1, 0xbb, 0x59,
+	0x4c, 0x48, 0x30, 0x44, 0xfa, 0x47, 0x25, 0x5b, 0x60, 0x5f, 0x68, 0xfa, 0x4b, 0x0f, 0x71, 0x5e,
+	0x3b, 0x12, 0x67, 0x13, 0xb7, 0x49, 0x88, 0xbc, 0x4c, 0xca, 0x35, 0x70, 0x4a, 0x94, 0x1e, 0x31,
+	0x8a, 0x70, 0x11, 0xcc, 0xd9, 0x9e, 0x8b, 0x7d, 0x1e, 0xed, 0x4d, 0x89, 0xbd, 0xd9, 0x78, 0xe1,
+	0x86, 0xa3, 0xfd, 0xa4, 0x80, 0xb7, 0x85, 0x92, 0xcf, 0x91, 0xe7, 0x3a, 0x88, 0x13, 0xda, 0xd3,
+	0x2a, 0x3a, 0x7e, 0xd0, 0xe1, 0x1a, 0x38, 0x9d, 0x90, 0xb6, 0x90, 0xe3, 0x50, 0xcc, 0x58, 0x5c,
+	0xa4, 0x01, 0xff, 0x7b, 0x51, 0x7e, 0x63, 0x0f, 0xb5, 0xbd, 0x6b, 0x9a, 0xdc, 0xd0, 0xcc, 0x85,
+	0x24, 0xb6, 0x1e, 0xaf, 0x5c, 0x9b, 0x7d, 0xf4, 0xa4, 0x5c, 0xf8, 0xe7, 0x49, 0xb9, 0xa0, 0xdd,
+	0x01, 0xda, 0x28, 0x22, 0xb2, 0x9b, 0x97, 0xc0, 0xe9, 0xe4, 0x28, 0xa7, 0xe5, 0x62, 0x46, 0x0b,
+	0x76, 0x4f, 0x7c, 0x54, 0x6c, 0x58, 0xda, 0x76, 0x4f, 0xf1, 0x7c, 0xd2, 0x86, 0x6a, 0x8d, 0x90,
+	0x36, 0x50, 0x7f, 0x94, 0xb4, 0x7e, 0x22, 0x5d, 0x69, 0x43, 0x9d, 0x94, 0xd2, 0x06, 0xba, 0xa6,
+	0x2d, 0x82, 0xf3, 0x02, 0xf0, 0x5e, 0x8b, 0x12, 0xce, 0x3d, 0x2c, 0x8e, 0x7d, 0x32, 0x9c, 0xbf,
+	0x2b, 0xf2, 0xf8, 0x0f, 0xec, 0xca, 0x32, 0x65, 0x30, 0xcf, 0x3c, 0xc4, 0x5a, 0x56, 0x1b, 0x73,
+	0x4c, 0x45, 0x85, 0x69, 0x13, 0x88, 0xa5, 0xdb, 0xd1, 0x0a, 0xac, 0x82, 0x37, 0x7b, 0x02, 0x2c,
+	0xe4, 0x79, 0x64, 0x17, 0xf9, 0x36, 0x16, 0xda, 0xa7, 0xcd, 0x33, 0xdd, 0xd0, 0x7a, 0xb2, 0x05,
+	0xbf, 0x01, 0x45, 0x1f, 0x3f, 0xe0, 0x16, 0xc5, 0x81, 0x87, 0x7d, 0x97, 0xb5, 0x2c, 0x1b, 0xf9,
+	0x4e, 0x24, 0x16, 0x17, 0xa7, 0xc5, 0xcc, 0xab, 0x7a, 0x7c, 0xf3, 0xeb, 0xc9, 0xcd, 0xaf, 0xdf,
+	0x4b, 0x6e, 0xfe, 0xc6, 0x6c, 0x74, 0x87, 0x3d, 0xfe, 0xb3, 0xac, 0x98, 0xe7, 0x22, 0x14, 0x33,
+	0x01, 0xd9, 0x48, 0x30, 0xb4, 0x0f, 0xc0, 0x65, 0x21, 0xc9, 0xc4, 0x4d, 0x97, 0x71, 0x4c, 0xb1,
+	0xd3, 0x3d, 0x1d, 0xbb, 0x88, 0x3a, 0x1f, 0x63, 0x9f, 0xb4, 0xd3, 0xe3, 0xb9, 0x09, 0xde, 0xcf,
+	0x15, 0x2d, 0x3b, 0x72, 0x0e, 0xcc, 0x38, 0x62, 0x45, 0xdc, 0x78, 0x73, 0xa6, 0x7c, 0xab, 0xfe,
+	0xba, 0x00, 0x4e, 0x09, 0x1c, 0xb8, 0xaf, 0x80, 0xb3, 0x59, 0xd7, 0x39, 0x5c, 0xcf, 0x75, 0x92,
+	0x47, 0x78, 0x88, 0x5a, 0x3f, 0x06, 0x42, 0xcc, 0x5f, 0xdb, 0xfc, 0xe1, 0xf9, 0xdf, 0x3f, 0x4f,
+	0xd5, 0xe0, 0xda, 0x78, 0x9b, 0x4f, 0xe7, 0x59, 0xfa, 0x85, 0xf1, 0x30, 0x19, 0xfe, 0xef, 0xe0,
+	0x73, 0x05, 0x9c, 0xc9, 0x30, 0x06, 0x58, 0x3b, 0x3a, 0xc3, 0x3e, 0xc3, 0x51, 0xd7, 0x27, 0x07,
+	0x90, 0x0a, 0xaf, 0x0a, 0x85, 0xab, 0xb0, 0x72, 0x04, 0x85, 0xb1, 0x15, 0xc1, 0xef, 0xa7, 0x40,
+	0xf1, 0x10, 0x7f, 0x61, 0xf0, 0xd6, 0x84, 0xcc, 0x32, 0xad, 0x4c, 0xbd, 0x7d, 0x42, 0x68, 0x52,
+	0xf4, 0xa7, 0x42, 0x74, 0x03, 0xae, 0x1f, 0x55, 0x74, 0xf4, 0x45, 0x41, 0xb9, 0x95, 0xba, 0x04,
+	0xfc, 0x5f, 0x01, 0x6f, 0x65, 0xdb, 0x15, 0x83, 0x37, 0x27, 0x26, 0x3d, 0xec, 0x8b, 0xea, 0xad,
+	0x93, 0x01, 0x93, 0x0d, 0xd8, 0x12, 0x0d, 0xa8, 0xc3, 0xda, 0x04, 0x0d, 0x20, 0x41, 0x8f, 0xfe,
+	0x7f, 0x93, 0x1b, 0x31, 0xd3, 0x5b, 0xe0, 0x27, 0xf9, 0x59, 0x8f, 0x72, 0x49, 0x75, 0xeb, 0xd8,
+	0x38, 0x52, 0x78, 0x5d, 0x08, 0xff, 0x08, 0x5e, 0xcd, 0xf1, 0xdd, 0x9e, 0x00, 0x59, 0x7d, 0x56,
+	0x95, 0x21, 0xb9, 0xd7, 0x73, 0x26, 0x92, 0x9c, 0xe1, 0x9e, 0x13, 0x49, 0xce, 0x32, 0xbf, 0xc9,
+	0x24, 0xf7, 0xd9, 0x25, 0xfc, 0x4d, 0x01, 0x70, 0xd8, 0xf7, 0xe0, 0xf5, 0xfc, 0x14, 0xb3, 0xec,
+	0x54, 0xad, 0x4d, 0x9c, 0x2f, 0xa5, 0x5d, 0x11, 0xd2, 0xaa, 0x70, 0x65, 0xbc, 0x34, 0x2e, 0x01,
+	0xe2, 0xff, 0x04, 0xf0, 0x97, 0x29, 0x70, 0x31, 0x87, 0x91, 0xc1, 0x3b, 0xf9, 0x29, 0xe6, 0x32,
+	0x50, 0x75, 0xfb, 0xe4, 0x00, 0x65, 0x13, 0x6e, 0x8a, 0x26, 0x6c, 0xc2, 0x8d, 0xf1, 0x4d, 0xa0,
+	0x29, 0x62, 0x77, 0xa6, 0xa9, 0xc0, 0xb4, 0x62, 0x63, 0x6e, 0x7c, 0xf1, 0x74, 0xbf, 0xa4, 0x3c,
+	0xdb, 0x2f, 0x29, 0x7f, 0xed, 0x97, 0x94, 0xc7, 0x07, 0xa5, 0xc2, 0xb3, 0x83, 0x52, 0xe1, 0x8f,
+	0x83, 0x52, 0xe1, 0xcb, 0xb5, 0xa6, 0xcb, 0x5b, 0x9d, 0x1d, 0xdd, 0x26, 0x6d, 0xc3, 0x26, 0xac,
+	0x4d, 0x58, 0x4f, 0xbd, 0x0f, 0xd3, 0x7a, 0xe1, 0xaa, 0xf1, 0x60, 0xa0, 0xf3, 0x7b, 0x01, 0x66,
+	0x3b, 0x33, 0xe2, 0xe3, 0x64, 0xf5, 0x65, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0x57, 0x98, 0xb7,
+	0x30, 0x0f, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/ccv/types/params.go b/x/ccv/types/params.go
index 82e8e84361..c80e353d66 100644
--- a/x/ccv/types/params.go
+++ b/x/ccv/types/params.go
@@ -72,8 +72,8 @@ func NewParams(enabled bool, blocksPerDistributionTransmission int64,
 	consumerRedistributionFraction string, historicalEntries int64,
 	consumerUnbondingPeriod time.Duration, softOptOutThreshold string,
 	rewardDenoms, providerRewardDenoms []string, retryDelayPeriod time.Duration,
-) Params {
-	return Params{
+) ConsumerParams {
+	return ConsumerParams{
 		Enabled:                           enabled,
 		BlocksPerDistributionTransmission: blocksPerDistributionTransmission,
 		DistributionTransmissionChannel:   distributionTransmissionChannel,
diff --git a/x/ccv/types/shared_consumer.pb.go b/x/ccv/types/shared_consumer.pb.go
index 36d54394cb..e979c70f4b 100644
--- a/x/ccv/types/shared_consumer.pb.go
+++ b/x/ccv/types/shared_consumer.pb.go
@@ -31,13 +31,11 @@ var _ = time.Kitchen
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// Params defines the parameters for CCV consumer module.
+// ConsumerParams defines the parameters for CCV consumer module.
 //
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
-//
-// TODO: Rename to ConsumerParams. See https://github.com/cosmos/interchain-security/issues/1206
-type Params struct {
+type ConsumerParams struct {
 	// TODO: Remove enabled flag and find a better way to setup integration tests
 	// See: https://github.com/cosmos/interchain-security/issues/339
 	Enabled bool `protobuf:"varint,1,opt,name=enabled,proto3" json:"enabled,omitempty"`
@@ -83,18 +81,18 @@ type Params struct {
 	RetryDelayPeriod time.Duration `protobuf:"bytes,13,opt,name=retry_delay_period,json=retryDelayPeriod,proto3,stdduration" json:"retry_delay_period"`
 }
 
-func (m *Params) Reset()         { *m = Params{} }
-func (m *Params) String() string { return proto.CompactTextString(m) }
-func (*Params) ProtoMessage()    {}
-func (*Params) Descriptor() ([]byte, []int) {
+func (m *ConsumerParams) Reset()         { *m = ConsumerParams{} }
+func (m *ConsumerParams) String() string { return proto.CompactTextString(m) }
+func (*ConsumerParams) ProtoMessage()    {}
+func (*ConsumerParams) Descriptor() ([]byte, []int) {
 	return fileDescriptor_d0a8be0efc64dfbc, []int{0}
 }
-func (m *Params) XXX_Unmarshal(b []byte) error {
+func (m *ConsumerParams) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *ConsumerParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_Params.Marshal(b, m, deterministic)
+		return xxx_messageInfo_ConsumerParams.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -104,120 +102,118 @@ func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return b[:n], nil
 	}
 }
-func (m *Params) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Params.Merge(m, src)
+func (m *ConsumerParams) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerParams.Merge(m, src)
 }
-func (m *Params) XXX_Size() int {
+func (m *ConsumerParams) XXX_Size() int {
 	return m.Size()
 }
-func (m *Params) XXX_DiscardUnknown() {
-	xxx_messageInfo_Params.DiscardUnknown(m)
+func (m *ConsumerParams) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConsumerParams.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_Params proto.InternalMessageInfo
+var xxx_messageInfo_ConsumerParams proto.InternalMessageInfo
 
-func (m *Params) GetEnabled() bool {
+func (m *ConsumerParams) GetEnabled() bool {
 	if m != nil {
 		return m.Enabled
 	}
 	return false
 }
 
-func (m *Params) GetBlocksPerDistributionTransmission() int64 {
+func (m *ConsumerParams) GetBlocksPerDistributionTransmission() int64 {
 	if m != nil {
 		return m.BlocksPerDistributionTransmission
 	}
 	return 0
 }
 
-func (m *Params) GetDistributionTransmissionChannel() string {
+func (m *ConsumerParams) GetDistributionTransmissionChannel() string {
 	if m != nil {
 		return m.DistributionTransmissionChannel
 	}
 	return ""
 }
 
-func (m *Params) GetProviderFeePoolAddrStr() string {
+func (m *ConsumerParams) GetProviderFeePoolAddrStr() string {
 	if m != nil {
 		return m.ProviderFeePoolAddrStr
 	}
 	return ""
 }
 
-func (m *Params) GetCcvTimeoutPeriod() time.Duration {
+func (m *ConsumerParams) GetCcvTimeoutPeriod() time.Duration {
 	if m != nil {
 		return m.CcvTimeoutPeriod
 	}
 	return 0
 }
 
-func (m *Params) GetTransferTimeoutPeriod() time.Duration {
+func (m *ConsumerParams) GetTransferTimeoutPeriod() time.Duration {
 	if m != nil {
 		return m.TransferTimeoutPeriod
 	}
 	return 0
 }
 
-func (m *Params) GetConsumerRedistributionFraction() string {
+func (m *ConsumerParams) GetConsumerRedistributionFraction() string {
 	if m != nil {
 		return m.ConsumerRedistributionFraction
 	}
 	return ""
 }
 
-func (m *Params) GetHistoricalEntries() int64 {
+func (m *ConsumerParams) GetHistoricalEntries() int64 {
 	if m != nil {
 		return m.HistoricalEntries
 	}
 	return 0
 }
 
-func (m *Params) GetUnbondingPeriod() time.Duration {
+func (m *ConsumerParams) GetUnbondingPeriod() time.Duration {
 	if m != nil {
 		return m.UnbondingPeriod
 	}
 	return 0
 }
 
-func (m *Params) GetSoftOptOutThreshold() string {
+func (m *ConsumerParams) GetSoftOptOutThreshold() string {
 	if m != nil {
 		return m.SoftOptOutThreshold
 	}
 	return ""
 }
 
-func (m *Params) GetRewardDenoms() []string {
+func (m *ConsumerParams) GetRewardDenoms() []string {
 	if m != nil {
 		return m.RewardDenoms
 	}
 	return nil
 }
 
-func (m *Params) GetProviderRewardDenoms() []string {
+func (m *ConsumerParams) GetProviderRewardDenoms() []string {
 	if m != nil {
 		return m.ProviderRewardDenoms
 	}
 	return nil
 }
 
-func (m *Params) GetRetryDelayPeriod() time.Duration {
+func (m *ConsumerParams) GetRetryDelayPeriod() time.Duration {
 	if m != nil {
 		return m.RetryDelayPeriod
 	}
 	return 0
 }
 
-// GenesisState defines the CCV consumer chain genesis state.
+// ConsumerGenesisState defines the CCV consumer chain genesis state.
 //
 // Note this type is referenced in both the consumer and provider CCV modules,
 // and persisted on the provider, see MakeConsumerGenesis and SetConsumerGenesis.
-//
-// TODO: Rename to ConsumerGenesisState. See https://github.com/cosmos/interchain-security/issues/1206
-type GenesisState struct {
-	Params            Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
-	ProviderClientId  string `protobuf:"bytes,2,opt,name=provider_client_id,json=providerClientId,proto3" json:"provider_client_id,omitempty"`
-	ProviderChannelId string `protobuf:"bytes,3,opt,name=provider_channel_id,json=providerChannelId,proto3" json:"provider_channel_id,omitempty"`
-	NewChain          bool   `protobuf:"varint,4,opt,name=new_chain,json=newChain,proto3" json:"new_chain,omitempty"`
+type ConsumerGenesisState struct {
+	Params            ConsumerParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
+	ProviderClientId  string         `protobuf:"bytes,2,opt,name=provider_client_id,json=providerClientId,proto3" json:"provider_client_id,omitempty"`
+	ProviderChannelId string         `protobuf:"bytes,3,opt,name=provider_channel_id,json=providerChannelId,proto3" json:"provider_channel_id,omitempty"`
+	NewChain          bool           `protobuf:"varint,4,opt,name=new_chain,json=newChain,proto3" json:"new_chain,omitempty"`
 	// ProviderClientState filled in on new chain, nil on restart.
 	ProviderClientState *_07_tendermint.ClientState `protobuf:"bytes,5,opt,name=provider_client_state,json=providerClientState,proto3" json:"provider_client_state,omitempty"`
 	// ProviderConsensusState filled in on new chain, nil on restart.
@@ -237,18 +233,18 @@ type GenesisState struct {
 	PreCCV                      bool                        `protobuf:"varint,13,opt,name=preCCV,proto3" json:"preCCV,omitempty"`
 }
 
-func (m *GenesisState) Reset()         { *m = GenesisState{} }
-func (m *GenesisState) String() string { return proto.CompactTextString(m) }
-func (*GenesisState) ProtoMessage()    {}
-func (*GenesisState) Descriptor() ([]byte, []int) {
+func (m *ConsumerGenesisState) Reset()         { *m = ConsumerGenesisState{} }
+func (m *ConsumerGenesisState) String() string { return proto.CompactTextString(m) }
+func (*ConsumerGenesisState) ProtoMessage()    {}
+func (*ConsumerGenesisState) Descriptor() ([]byte, []int) {
 	return fileDescriptor_d0a8be0efc64dfbc, []int{1}
 }
-func (m *GenesisState) XXX_Unmarshal(b []byte) error {
+func (m *ConsumerGenesisState) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *ConsumerGenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic)
+		return xxx_messageInfo_ConsumerGenesisState.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -258,103 +254,103 @@ func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
 		return b[:n], nil
 	}
 }
-func (m *GenesisState) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GenesisState.Merge(m, src)
+func (m *ConsumerGenesisState) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerGenesisState.Merge(m, src)
 }
-func (m *GenesisState) XXX_Size() int {
+func (m *ConsumerGenesisState) XXX_Size() int {
 	return m.Size()
 }
-func (m *GenesisState) XXX_DiscardUnknown() {
-	xxx_messageInfo_GenesisState.DiscardUnknown(m)
+func (m *ConsumerGenesisState) XXX_DiscardUnknown() {
+	xxx_messageInfo_ConsumerGenesisState.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_GenesisState proto.InternalMessageInfo
+var xxx_messageInfo_ConsumerGenesisState proto.InternalMessageInfo
 
-func (m *GenesisState) GetParams() Params {
+func (m *ConsumerGenesisState) GetParams() ConsumerParams {
 	if m != nil {
 		return m.Params
 	}
-	return Params{}
+	return ConsumerParams{}
 }
 
-func (m *GenesisState) GetProviderClientId() string {
+func (m *ConsumerGenesisState) GetProviderClientId() string {
 	if m != nil {
 		return m.ProviderClientId
 	}
 	return ""
 }
 
-func (m *GenesisState) GetProviderChannelId() string {
+func (m *ConsumerGenesisState) GetProviderChannelId() string {
 	if m != nil {
 		return m.ProviderChannelId
 	}
 	return ""
 }
 
-func (m *GenesisState) GetNewChain() bool {
+func (m *ConsumerGenesisState) GetNewChain() bool {
 	if m != nil {
 		return m.NewChain
 	}
 	return false
 }
 
-func (m *GenesisState) GetProviderClientState() *_07_tendermint.ClientState {
+func (m *ConsumerGenesisState) GetProviderClientState() *_07_tendermint.ClientState {
 	if m != nil {
 		return m.ProviderClientState
 	}
 	return nil
 }
 
-func (m *GenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusState {
+func (m *ConsumerGenesisState) GetProviderConsensusState() *_07_tendermint.ConsensusState {
 	if m != nil {
 		return m.ProviderConsensusState
 	}
 	return nil
 }
 
-func (m *GenesisState) GetMaturingPackets() []MaturingVSCPacket {
+func (m *ConsumerGenesisState) GetMaturingPackets() []MaturingVSCPacket {
 	if m != nil {
 		return m.MaturingPackets
 	}
 	return nil
 }
 
-func (m *GenesisState) GetInitialValSet() []types.ValidatorUpdate {
+func (m *ConsumerGenesisState) GetInitialValSet() []types.ValidatorUpdate {
 	if m != nil {
 		return m.InitialValSet
 	}
 	return nil
 }
 
-func (m *GenesisState) GetHeightToValsetUpdateId() []HeightToValsetUpdateID {
+func (m *ConsumerGenesisState) GetHeightToValsetUpdateId() []HeightToValsetUpdateID {
 	if m != nil {
 		return m.HeightToValsetUpdateId
 	}
 	return nil
 }
 
-func (m *GenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
+func (m *ConsumerGenesisState) GetOutstandingDowntimeSlashing() []OutstandingDowntime {
 	if m != nil {
 		return m.OutstandingDowntimeSlashing
 	}
 	return nil
 }
 
-func (m *GenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
+func (m *ConsumerGenesisState) GetPendingConsumerPackets() ConsumerPacketDataList {
 	if m != nil {
 		return m.PendingConsumerPackets
 	}
 	return ConsumerPacketDataList{}
 }
 
-func (m *GenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
+func (m *ConsumerGenesisState) GetLastTransmissionBlockHeight() LastTransmissionBlockHeight {
 	if m != nil {
 		return m.LastTransmissionBlockHeight
 	}
 	return LastTransmissionBlockHeight{}
 }
 
-func (m *GenesisState) GetPreCCV() bool {
+func (m *ConsumerGenesisState) GetPreCCV() bool {
 	if m != nil {
 		return m.PreCCV
 	}
@@ -616,8 +612,8 @@ func (m *ConsumerPacketDataList) GetList() []ConsumerPacketData {
 }
 
 func init() {
-	proto.RegisterType((*Params)(nil), "interchain_security.ccv.v1.Params")
-	proto.RegisterType((*GenesisState)(nil), "interchain_security.ccv.v1.GenesisState")
+	proto.RegisterType((*ConsumerParams)(nil), "interchain_security.ccv.v1.ConsumerParams")
+	proto.RegisterType((*ConsumerGenesisState)(nil), "interchain_security.ccv.v1.ConsumerGenesisState")
 	proto.RegisterType((*HeightToValsetUpdateID)(nil), "interchain_security.ccv.v1.HeightToValsetUpdateID")
 	proto.RegisterType((*OutstandingDowntime)(nil), "interchain_security.ccv.v1.OutstandingDowntime")
 	proto.RegisterType((*LastTransmissionBlockHeight)(nil), "interchain_security.ccv.v1.LastTransmissionBlockHeight")
@@ -630,85 +626,86 @@ func init() {
 }
 
 var fileDescriptor_d0a8be0efc64dfbc = []byte{
-	// 1200 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x73, 0x1b, 0x35,
-	0x14, 0x8f, 0x9b, 0x34, 0xb5, 0x95, 0x84, 0xa6, 0x4a, 0x6b, 0xb6, 0xc9, 0xe0, 0xb8, 0x06, 0x66,
-	0x3c, 0x03, 0xdd, 0x25, 0x69, 0x19, 0x66, 0x38, 0x30, 0x34, 0x36, 0xa5, 0x61, 0x4a, 0x93, 0x6e,
-	0xd2, 0x1c, 0xca, 0x0c, 0x1a, 0x59, 0x52, 0x6c, 0x4d, 0xd7, 0x92, 0x47, 0xd2, 0x6e, 0xc8, 0x95,
-	0x4f, 0xd0, 0x23, 0x1f, 0xa9, 0xc7, 0xde, 0xe0, 0x04, 0x4c, 0xfb, 0x45, 0x18, 0xfd, 0x59, 0xc7,
-	0x6e, 0x12, 0xd3, 0xde, 0x56, 0x7a, 0xbf, 0xdf, 0xfb, 0xff, 0x9e, 0x16, 0x7c, 0xc5, 0x85, 0x61,
-	0x8a, 0x0c, 0x30, 0x17, 0x48, 0x33, 0x92, 0x2b, 0x6e, 0x4e, 0x13, 0x42, 0x8a, 0xa4, 0xd8, 0x4a,
-	0xf4, 0x00, 0x2b, 0x46, 0x11, 0x91, 0x42, 0xe7, 0x43, 0xa6, 0xe2, 0x91, 0x92, 0x46, 0xc2, 0xf5,
-	0x0b, 0x18, 0x31, 0x21, 0x45, 0x5c, 0x6c, 0xad, 0x6f, 0x18, 0x26, 0x28, 0x53, 0x43, 0x2e, 0x4c,
-	0x82, 0x7b, 0x84, 0x27, 0xe6, 0x74, 0xc4, 0xb4, 0x27, 0xae, 0x27, 0xbc, 0x47, 0x92, 0x8c, 0xf7,
-	0x07, 0x86, 0x64, 0x9c, 0x09, 0xa3, 0x93, 0x09, 0x74, 0xb1, 0x35, 0x71, 0x0a, 0x84, 0x3b, 0x96,
-	0x40, 0xa4, 0x62, 0x09, 0x19, 0x60, 0x21, 0x58, 0x66, 0x51, 0xe1, 0x33, 0x40, 0x1a, 0x7d, 0x29,
-	0xfb, 0x19, 0x4b, 0xdc, 0xa9, 0x97, 0x1f, 0x27, 0x34, 0x57, 0xd8, 0x70, 0x29, 0x82, 0xfc, 0x66,
-	0x5f, 0xf6, 0xa5, 0xfb, 0x4c, 0xec, 0x57, 0xb8, 0xfd, 0x7c, 0x46, 0xd0, 0x27, 0x5c, 0xb1, 0x00,
-	0xdb, 0x7c, 0x57, 0xb9, 0xe1, 0x43, 0xa6, 0x0d, 0x1e, 0x8e, 0x3c, 0xa0, 0xf5, 0xe7, 0x22, 0x58,
-	0xdc, 0xc7, 0x0a, 0x0f, 0x35, 0x8c, 0xc0, 0x35, 0x26, 0x70, 0x2f, 0x63, 0x34, 0xaa, 0x34, 0x2b,
-	0xed, 0x6a, 0x5a, 0x1e, 0xe1, 0x1e, 0xf8, 0xac, 0x97, 0x49, 0xf2, 0x42, 0xa3, 0x11, 0x53, 0x88,
-	0x72, 0x6d, 0x14, 0xef, 0xe5, 0xd6, 0x47, 0x64, 0x14, 0x16, 0x7a, 0xc8, 0xb5, 0xe6, 0x52, 0x44,
-	0x57, 0x9a, 0x95, 0xf6, 0x7c, 0x7a, 0xc7, 0x63, 0xf7, 0x99, 0xea, 0x4e, 0x20, 0x0f, 0x27, 0x80,
-	0xf0, 0x27, 0x70, 0xe7, 0x52, 0x2d, 0x28, 0xa4, 0x27, 0x9a, 0x6f, 0x56, 0xda, 0xb5, 0x74, 0x93,
-	0x5e, 0xa2, 0xa4, 0xe3, 0x61, 0xf0, 0x5b, 0xb0, 0x3e, 0x52, 0xb2, 0xe0, 0x94, 0x29, 0x74, 0xcc,
-	0x18, 0x1a, 0x49, 0x99, 0x21, 0x4c, 0xa9, 0x42, 0xda, 0xa8, 0x68, 0xc1, 0x29, 0xa9, 0x97, 0x88,
-	0x87, 0x8c, 0xed, 0x4b, 0x99, 0x3d, 0xa0, 0x54, 0x1d, 0x18, 0x05, 0x9f, 0x02, 0x48, 0x48, 0x81,
-	0x6c, 0x52, 0x64, 0x6e, 0x6c, 0x74, 0x5c, 0xd2, 0xe8, 0x6a, 0xb3, 0xd2, 0x5e, 0xda, 0xbe, 0x1d,
-	0xfb, 0xdc, 0xc5, 0x65, 0xee, 0xe2, 0x6e, 0x28, 0xcc, 0x4e, 0xf5, 0xd5, 0xdf, 0x9b, 0x73, 0x7f,
-	0xfc, 0xb3, 0x59, 0x49, 0x57, 0x09, 0x29, 0x0e, 0x3d, 0x7b, 0xdf, 0x91, 0xe1, 0x2f, 0xe0, 0x63,
-	0x17, 0xcd, 0x31, 0x53, 0xef, 0xea, 0x5d, 0x7c, 0x7f, 0xbd, 0xb7, 0x4a, 0x1d, 0xd3, 0xca, 0x1f,
-	0x81, 0x66, 0xd9, 0xca, 0x48, 0xb1, 0xa9, 0x14, 0x1e, 0x2b, 0x4c, 0xec, 0x47, 0x74, 0xcd, 0x45,
-	0xdc, 0x28, 0x71, 0xe9, 0x14, 0xec, 0x61, 0x40, 0xc1, 0xbb, 0x00, 0x0e, 0xb8, 0x36, 0x52, 0x71,
-	0x82, 0x33, 0xc4, 0x84, 0x51, 0x9c, 0xe9, 0xa8, 0xea, 0x0a, 0x78, 0xe3, 0x4c, 0xf2, 0x83, 0x17,
-	0xc0, 0x27, 0x60, 0x35, 0x17, 0x3d, 0x29, 0x28, 0x17, 0xfd, 0x32, 0x9c, 0xda, 0xfb, 0x87, 0x73,
-	0x7d, 0x4c, 0x0e, 0x81, 0xdc, 0x03, 0x75, 0x2d, 0x8f, 0x0d, 0x92, 0x23, 0x83, 0x6c, 0x86, 0xcc,
-	0x40, 0x31, 0x3d, 0x90, 0x19, 0x8d, 0x80, 0x73, 0x7f, 0xcd, 0x4a, 0xf7, 0x46, 0x66, 0x2f, 0x37,
-	0x87, 0xa5, 0x08, 0x7e, 0x0a, 0x56, 0x14, 0x3b, 0xc1, 0x8a, 0x22, 0xca, 0x84, 0x1c, 0xea, 0x68,
-	0xa9, 0x39, 0xdf, 0xae, 0xa5, 0xcb, 0xfe, 0xb2, 0xeb, 0xee, 0xe0, 0x7d, 0x30, 0x2e, 0x36, 0x9a,
-	0x46, 0x2f, 0x3b, 0xf4, 0xcd, 0x52, 0x9a, 0x4e, 0xb2, 0x9e, 0x02, 0xa8, 0x98, 0x51, 0xa7, 0x88,
-	0xb2, 0x0c, 0x9f, 0x96, 0x11, 0xae, 0x7c, 0x40, 0x23, 0x38, 0x7a, 0xd7, 0xb2, 0x7d, 0x88, 0xad,
-	0x57, 0x55, 0xb0, 0xfc, 0x23, 0x13, 0x4c, 0x73, 0x7d, 0x60, 0xb0, 0x61, 0xf0, 0x7b, 0xb0, 0x38,
-	0x72, 0x93, 0xe6, 0xc6, 0x6b, 0x69, 0xbb, 0x15, 0x5f, 0xbe, 0x86, 0x62, 0x3f, 0x93, 0x3b, 0x0b,
-	0xd6, 0x40, 0x1a, 0x78, 0xf0, 0x4b, 0x00, 0xc7, 0xb1, 0xf9, 0x05, 0x84, 0x38, 0x75, 0x53, 0x57,
-	0x4b, 0x57, 0x4b, 0x49, 0xc7, 0x09, 0x76, 0x29, 0x8c, 0xc1, 0xda, 0x19, 0xda, 0x0f, 0x8b, 0x85,
-	0xfb, 0xb1, 0xba, 0x31, 0x86, 0x7b, 0xc9, 0x2e, 0x85, 0x1b, 0xa0, 0x26, 0xd8, 0x09, 0x72, 0xfe,
-	0xb8, 0xb9, 0xa9, 0xa6, 0x55, 0xc1, 0x4e, 0x3a, 0xf6, 0x0c, 0x11, 0xb8, 0xf5, 0xae, 0x69, 0x6d,
-	0xa3, 0x0a, 0xc3, 0xf2, 0x45, 0xcc, 0x7b, 0x24, 0x9e, 0xdc, 0x8c, 0xf1, 0xc4, 0x2e, 0x2c, 0xb6,
-	0x62, 0xef, 0x95, 0x4b, 0x44, 0xba, 0x36, 0xed, 0xaa, 0xcf, 0xce, 0x00, 0x44, 0x67, 0x06, 0xa4,
-	0xd0, 0x4c, 0xe8, 0x5c, 0x07, 0x1b, 0x7e, 0x70, 0xe2, 0xff, 0xb5, 0x51, 0xd2, 0xbc, 0x99, 0x71,
-	0x1f, 0x4c, 0xdf, 0xc3, 0x5f, 0xc1, 0xea, 0x10, 0x9b, 0x5c, 0xb9, 0x56, 0xc6, 0xe4, 0x05, 0x33,
-	0x3a, 0xba, 0xd6, 0x9c, 0x6f, 0x2f, 0x6d, 0xdf, 0x9d, 0x55, 0x91, 0x9f, 0x03, 0xe7, 0xe8, 0xa0,
-	0xb3, 0xef, 0x58, 0xa1, 0x38, 0xd7, 0x4b, 0x65, 0xfe, 0xd6, 0xce, 0xca, 0x75, 0x2e, 0xb8, 0xe1,
-	0x38, 0x43, 0x05, 0xce, 0x90, 0x66, 0x26, 0xaa, 0x3a, 0xf5, 0xcd, 0x49, 0x7f, 0xed, 0xdb, 0x12,
-	0x1f, 0xe1, 0x8c, 0x53, 0x6c, 0xa4, 0x7a, 0x36, 0xa2, 0xd8, 0xb0, 0xa0, 0x71, 0x25, 0xd0, 0x8f,
-	0x70, 0x76, 0xc0, 0x0c, 0x34, 0x60, 0x7d, 0xc0, 0x6c, 0xd4, 0xc8, 0x48, 0xab, 0x51, 0x33, 0x83,
-	0x72, 0x87, 0xb7, 0xe5, 0xac, 0x39, 0xd5, 0xdb, 0xb3, 0x3c, 0x7f, 0xe4, 0xd8, 0x87, 0xf2, 0xc8,
-	0x71, 0xbd, 0xa9, 0xdd, 0x6e, 0x30, 0x56, 0x1f, 0x5c, 0x24, 0xa5, 0xf0, 0x14, 0x7c, 0x22, 0x73,
-	0xa3, 0x0d, 0xf6, 0x33, 0x4f, 0xe5, 0x89, 0xb0, 0xeb, 0x0c, 0xe9, 0x0c, 0xeb, 0x01, 0x17, 0xfd,
-	0x08, 0x38, 0xc3, 0xc9, 0x2c, 0xc3, 0x7b, 0x67, 0x0a, 0xba, 0x81, 0x1f, 0xac, 0x6e, 0xc8, 0xf3,
-	0xa2, 0x83, 0xa0, 0x19, 0x2a, 0x10, 0x8d, 0x98, 0x37, 0x3b, 0xde, 0x76, 0x65, 0xa1, 0x96, 0x5c,
-	0x2b, 0xcc, 0x0c, 0xb7, 0x13, 0x38, 0xbe, 0x1e, 0x5d, 0x6c, 0xf0, 0x63, 0xae, 0xcb, 0x6a, 0xd5,
-	0x83, 0xe6, 0x69, 0x90, 0x86, 0xbf, 0x57, 0x40, 0x23, 0xc3, 0xda, 0x4c, 0x3f, 0x45, 0xee, 0x25,
-	0x43, 0x3e, 0x43, 0xd1, 0xb2, 0x33, 0xfd, 0xcd, 0x2c, 0xd3, 0x8f, 0xb1, 0x36, 0x93, 0x6f, 0xd4,
-	0x8e, 0xe5, 0xfb, 0xf4, 0x97, 0x81, 0x67, 0x97, 0x43, 0x60, 0x1d, 0x2c, 0x8e, 0x14, 0xeb, 0x74,
-	0x8e, 0xdc, 0xe6, 0xa9, 0xa6, 0xe1, 0xd4, 0x7a, 0x0e, 0xea, 0x17, 0xd7, 0xd0, 0x32, 0x82, 0x77,
-	0x76, 0xa7, 0x2c, 0xa4, 0xe1, 0x04, 0xdb, 0x60, 0xf5, 0x5c, 0xa7, 0x5c, 0x71, 0x88, 0x8f, 0x8a,
-	0xa9, 0x3a, 0xb7, 0x9e, 0x81, 0xb5, 0x0b, 0xca, 0x04, 0xbf, 0x03, 0x1b, 0x45, 0xd9, 0x9c, 0x13,
-	0xf3, 0x68, 0xdf, 0x55, 0xa6, 0xfd, 0x06, 0xab, 0xa5, 0xb7, 0xc7, 0x90, 0xf1, 0x88, 0x3d, 0xf0,
-	0x80, 0xd6, 0xd7, 0x60, 0xe3, 0xf1, 0xec, 0x48, 0x27, 0xfc, 0x9e, 0x2f, 0xfd, 0x6e, 0x19, 0x70,
-	0xe3, 0xdc, 0x9c, 0xc1, 0x9b, 0xe0, 0x6a, 0xa1, 0xc9, 0x2e, 0x0d, 0x31, 0xfa, 0x03, 0xdc, 0x05,
-	0x2b, 0x7e, 0xf2, 0xcc, 0xa9, 0x7b, 0x68, 0x5d, 0x7c, 0x4b, 0xdb, 0xeb, 0xe7, 0xb6, 0xf5, 0x61,
-	0xf9, 0xcb, 0xe3, 0xd7, 0xf5, 0x4b, 0xbb, 0xae, 0x97, 0x4b, 0xaa, 0x15, 0xb6, 0x7a, 0xa0, 0x7e,
-	0x71, 0xd3, 0xc0, 0x47, 0x60, 0x21, 0xe3, 0xda, 0x7a, 0x39, 0xef, 0x37, 0xd0, 0x87, 0xb4, 0x5d,
-	0x28, 0xb9, 0xd3, 0xb0, 0xf3, 0xe4, 0xd5, 0x9b, 0x46, 0xe5, 0xf5, 0x9b, 0x46, 0xe5, 0xdf, 0x37,
-	0x8d, 0xca, 0xcb, 0xb7, 0x8d, 0xb9, 0xd7, 0x6f, 0x1b, 0x73, 0x7f, 0xbd, 0x6d, 0xcc, 0x3d, 0xbf,
-	0xdf, 0xe7, 0x66, 0x90, 0xf7, 0x62, 0x22, 0x87, 0x09, 0x91, 0x7a, 0x28, 0x75, 0x72, 0x66, 0xe6,
-	0xee, 0xf8, 0xe7, 0xae, 0xb8, 0x97, 0xfc, 0xe6, 0xfe, 0xf0, 0xdc, 0x0f, 0x69, 0x6f, 0xd1, 0xc5,
-	0x77, 0xef, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x25, 0x59, 0xfe, 0xb0, 0xfe, 0x0a, 0x00, 0x00,
-}
-
-func (m *Params) Marshal() (dAtA []byte, err error) {
+	// 1203 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4d, 0x73, 0x13, 0x37,
+	0x18, 0x8e, 0x49, 0x08, 0xb6, 0x92, 0x40, 0x50, 0x82, 0xbb, 0x24, 0x53, 0xc7, 0xb8, 0xed, 0x8c,
+	0xa7, 0x2d, 0xbb, 0x25, 0xd0, 0xe9, 0x4c, 0x0f, 0x9d, 0x21, 0x76, 0x69, 0xd2, 0xa1, 0x24, 0x6c,
+	0x42, 0x0e, 0x74, 0xa6, 0x1a, 0x59, 0x52, 0x6c, 0x0d, 0x6b, 0xc9, 0x23, 0x69, 0x37, 0xcd, 0xb5,
+	0xbf, 0x80, 0x63, 0x7f, 0x12, 0x47, 0x8e, 0x9c, 0x4a, 0x07, 0xfe, 0x48, 0x47, 0x1f, 0xeb, 0xd8,
+	0xe4, 0xa3, 0x70, 0x5b, 0xe9, 0x7d, 0x9e, 0xf7, 0xfb, 0x7d, 0xb5, 0xe0, 0x3b, 0x2e, 0x0c, 0x53,
+	0x64, 0x80, 0xb9, 0x40, 0x9a, 0x91, 0x5c, 0x71, 0x73, 0x92, 0x10, 0x52, 0x24, 0xc5, 0xbd, 0x44,
+	0x0f, 0xb0, 0x62, 0x14, 0x11, 0x29, 0x74, 0x3e, 0x64, 0x2a, 0x1e, 0x29, 0x69, 0x24, 0x5c, 0x3b,
+	0x87, 0x11, 0x13, 0x52, 0xc4, 0xc5, 0xbd, 0xb5, 0x75, 0xc3, 0x04, 0x65, 0x6a, 0xc8, 0x85, 0x49,
+	0x70, 0x8f, 0xf0, 0xc4, 0x9c, 0x8c, 0x98, 0xf6, 0xc4, 0xb5, 0x84, 0xf7, 0x48, 0x92, 0xf1, 0xfe,
+	0xc0, 0x90, 0x8c, 0x33, 0x61, 0x74, 0x32, 0x81, 0x2e, 0xee, 0x4d, 0x9c, 0x02, 0xe1, 0x8e, 0x25,
+	0x10, 0xa9, 0x58, 0x42, 0x06, 0x58, 0x08, 0x96, 0x59, 0x54, 0xf8, 0x0c, 0x90, 0x46, 0x5f, 0xca,
+	0x7e, 0xc6, 0x12, 0x77, 0xea, 0xe5, 0x47, 0x09, 0xcd, 0x15, 0x36, 0x5c, 0x8a, 0x20, 0x5f, 0xed,
+	0xcb, 0xbe, 0x74, 0x9f, 0x89, 0xfd, 0x0a, 0xb7, 0x5f, 0x5d, 0x12, 0xf4, 0x31, 0x57, 0x2c, 0xc0,
+	0x36, 0x3e, 0x54, 0x6e, 0xf8, 0x90, 0x69, 0x83, 0x87, 0x23, 0x0f, 0x68, 0xbd, 0x9d, 0x07, 0xd7,
+	0x3b, 0x21, 0x3b, 0x7b, 0x58, 0xe1, 0xa1, 0x86, 0x11, 0xb8, 0xc6, 0x04, 0xee, 0x65, 0x8c, 0x46,
+	0x95, 0x66, 0xa5, 0x5d, 0x4d, 0xcb, 0x23, 0xdc, 0x05, 0x5f, 0xf6, 0x32, 0x49, 0x5e, 0x68, 0x34,
+	0x62, 0x0a, 0x51, 0xae, 0x8d, 0xe2, 0xbd, 0xdc, 0xfa, 0x8a, 0x8c, 0xc2, 0x42, 0x0f, 0xb9, 0xd6,
+	0x5c, 0x8a, 0xe8, 0x4a, 0xb3, 0xd2, 0x9e, 0x4d, 0xef, 0x78, 0xec, 0x1e, 0x53, 0xdd, 0x09, 0xe4,
+	0xc1, 0x04, 0x10, 0xfe, 0x0a, 0xee, 0x5c, 0xa8, 0x05, 0x85, 0x34, 0x45, 0xb3, 0xcd, 0x4a, 0xbb,
+	0x96, 0x6e, 0xd0, 0x0b, 0x94, 0x74, 0x3c, 0x0c, 0xfe, 0x08, 0xd6, 0x46, 0x4a, 0x16, 0x9c, 0x32,
+	0x85, 0x8e, 0x18, 0x43, 0x23, 0x29, 0x33, 0x84, 0x29, 0x55, 0x48, 0x1b, 0x15, 0xcd, 0x39, 0x25,
+	0xf5, 0x12, 0xf1, 0x88, 0xb1, 0x3d, 0x29, 0xb3, 0x87, 0x94, 0xaa, 0x7d, 0xa3, 0xe0, 0x53, 0x00,
+	0x09, 0x29, 0x90, 0x4d, 0x8e, 0xcc, 0x8d, 0x8d, 0x8e, 0x4b, 0x1a, 0x5d, 0x6d, 0x56, 0xda, 0x0b,
+	0x9b, 0xb7, 0x63, 0x9f, 0xc3, 0xb8, 0xcc, 0x61, 0xdc, 0x0d, 0x05, 0xda, 0xaa, 0xbe, 0xfa, 0x67,
+	0x63, 0xe6, 0xef, 0xb7, 0x1b, 0x95, 0x74, 0x99, 0x90, 0xe2, 0xc0, 0xb3, 0xf7, 0x1c, 0x19, 0xfe,
+	0x0e, 0x3e, 0x73, 0xd1, 0x1c, 0x31, 0xf5, 0xa1, 0xde, 0xf9, 0x8f, 0xd7, 0x7b, 0xab, 0xd4, 0x31,
+	0xad, 0x7c, 0x1b, 0x34, 0xcb, 0x96, 0x46, 0x8a, 0x4d, 0xa5, 0xf0, 0x48, 0x61, 0x62, 0x3f, 0xa2,
+	0x6b, 0x2e, 0xe2, 0x46, 0x89, 0x4b, 0xa7, 0x60, 0x8f, 0x02, 0x0a, 0xde, 0x05, 0x70, 0xc0, 0xb5,
+	0x91, 0x8a, 0x13, 0x9c, 0x21, 0x26, 0x8c, 0xe2, 0x4c, 0x47, 0x55, 0x57, 0xc0, 0x9b, 0xa7, 0x92,
+	0x9f, 0xbd, 0x00, 0x3e, 0x01, 0xcb, 0xb9, 0xe8, 0x49, 0x41, 0xb9, 0xe8, 0x97, 0xe1, 0xd4, 0x3e,
+	0x3e, 0x9c, 0x1b, 0x63, 0x72, 0x08, 0xe4, 0x3e, 0xa8, 0x6b, 0x79, 0x64, 0x90, 0x1c, 0x19, 0x64,
+	0x33, 0x64, 0x06, 0x8a, 0xe9, 0x81, 0xcc, 0x68, 0x04, 0x9c, 0xfb, 0x2b, 0x56, 0xba, 0x3b, 0x32,
+	0xbb, 0xb9, 0x39, 0x28, 0x45, 0xf0, 0x0b, 0xb0, 0xa4, 0xd8, 0x31, 0x56, 0x14, 0x51, 0x26, 0xe4,
+	0x50, 0x47, 0x0b, 0xcd, 0xd9, 0x76, 0x2d, 0x5d, 0xf4, 0x97, 0x5d, 0x77, 0x07, 0x1f, 0x80, 0x71,
+	0xb1, 0xd1, 0x34, 0x7a, 0xd1, 0xa1, 0x57, 0x4b, 0x69, 0x3a, 0xc9, 0x7a, 0x0a, 0xa0, 0x62, 0x46,
+	0x9d, 0x20, 0xca, 0x32, 0x7c, 0x52, 0x46, 0xb8, 0xf4, 0x09, 0x8d, 0xe0, 0xe8, 0x5d, 0xcb, 0xf6,
+	0x21, 0xb6, 0xde, 0x54, 0xc1, 0x6a, 0x39, 0x61, 0xbf, 0x30, 0xc1, 0x34, 0xd7, 0xfb, 0x06, 0x1b,
+	0x06, 0xb7, 0xc1, 0xfc, 0xc8, 0x4d, 0x9c, 0x1b, 0xb3, 0x85, 0xcd, 0xaf, 0xe3, 0x8b, 0xd7, 0x52,
+	0x3c, 0x3d, 0xa3, 0x5b, 0x73, 0xd6, 0x60, 0x1a, 0xf8, 0xf0, 0x5b, 0x00, 0xc7, 0xb1, 0xfa, 0xc5,
+	0x84, 0x38, 0x75, 0x53, 0x58, 0x4b, 0x97, 0x4b, 0x49, 0xc7, 0x09, 0x76, 0x28, 0x8c, 0xc1, 0xca,
+	0x29, 0xda, 0x0f, 0x8f, 0x85, 0xfb, 0x31, 0xbb, 0x39, 0x86, 0x7b, 0xc9, 0x0e, 0x85, 0xeb, 0xa0,
+	0x26, 0xd8, 0x31, 0x72, 0x7e, 0xb9, 0x39, 0xaa, 0xa6, 0x55, 0xc1, 0x8e, 0x3b, 0xf6, 0x0c, 0x11,
+	0xb8, 0xf5, 0xa1, 0x69, 0x6d, 0xa3, 0x0b, 0xc3, 0xf3, 0x4d, 0xcc, 0x7b, 0x24, 0x9e, 0xdc, 0x98,
+	0xf1, 0xc4, 0x8e, 0xb4, 0x71, 0xb9, 0x5b, 0x97, 0x90, 0x74, 0x65, 0xda, 0x55, 0x9f, 0xa5, 0x01,
+	0x88, 0x4e, 0x0d, 0x48, 0xa1, 0x99, 0xd0, 0xb9, 0x0e, 0x36, 0xfc, 0x20, 0xc5, 0xff, 0x6b, 0xa3,
+	0xa4, 0x79, 0x33, 0xe3, 0xbe, 0x98, 0xbe, 0x87, 0x7f, 0x80, 0xe5, 0x21, 0x36, 0xb9, 0x72, 0xad,
+	0x8d, 0xc9, 0x0b, 0x66, 0x74, 0x74, 0xad, 0x39, 0xdb, 0x5e, 0xd8, 0xbc, 0x7b, 0x59, 0x65, 0x7e,
+	0x0b, 0x9c, 0xc3, 0xfd, 0xce, 0x9e, 0x63, 0x85, 0xe2, 0xdc, 0x28, 0x95, 0xf9, 0x5b, 0x3b, 0x3b,
+	0x37, 0xb8, 0xe0, 0x86, 0xe3, 0x0c, 0x15, 0x38, 0x43, 0x9a, 0x99, 0xa8, 0xea, 0xd4, 0x37, 0x27,
+	0xfd, 0xb5, 0x6f, 0x4e, 0x7c, 0x88, 0x33, 0x4e, 0xb1, 0x91, 0xea, 0xd9, 0x88, 0x62, 0xc3, 0x82,
+	0xc6, 0xa5, 0x40, 0x3f, 0xc4, 0xd9, 0x3e, 0x33, 0xd0, 0x80, 0xb5, 0x01, 0xb3, 0x51, 0x23, 0x23,
+	0xad, 0x46, 0xcd, 0x0c, 0xca, 0x1d, 0xde, 0x96, 0xb3, 0xe6, 0x54, 0x6f, 0x5e, 0xe6, 0xf9, 0xb6,
+	0x63, 0x1f, 0xc8, 0x43, 0xc7, 0xf5, 0xa6, 0x76, 0xba, 0xc1, 0x58, 0x7d, 0x70, 0x9e, 0x94, 0xc2,
+	0x13, 0xf0, 0xb9, 0xcc, 0x8d, 0x36, 0xd8, 0xef, 0x00, 0x2a, 0x8f, 0x85, 0x5d, 0x6f, 0x48, 0x67,
+	0x58, 0x0f, 0xb8, 0xe8, 0x47, 0xc0, 0x19, 0x4e, 0x2e, 0x33, 0xbc, 0x7b, 0xaa, 0xa0, 0x1b, 0xf8,
+	0xc1, 0xea, 0xba, 0x3c, 0x2b, 0xda, 0x0f, 0x9a, 0xa1, 0x02, 0xd1, 0x88, 0x79, 0xb3, 0xe3, 0xed,
+	0x57, 0x16, 0x6a, 0xc1, 0xb5, 0xc2, 0xe6, 0xc7, 0x8d, 0x90, 0xa5, 0x74, 0xb1, 0xc1, 0x8f, 0xb9,
+	0x2e, 0xab, 0x55, 0x0f, 0x9a, 0xa7, 0x41, 0x1a, 0xfe, 0x55, 0x01, 0x8d, 0x0c, 0x6b, 0x33, 0xfd,
+	0x34, 0xb9, 0x97, 0x0d, 0xf9, 0x0c, 0x45, 0x8b, 0xce, 0xf4, 0x0f, 0x97, 0x99, 0x7e, 0x8c, 0xb5,
+	0x99, 0x7c, 0xb3, 0xb6, 0x2c, 0xdf, 0xa7, 0xbf, 0x0c, 0x3c, 0xbb, 0x18, 0x02, 0xeb, 0x60, 0x7e,
+	0xa4, 0x58, 0xa7, 0x73, 0xe8, 0x36, 0x51, 0x35, 0x0d, 0xa7, 0xd6, 0x73, 0x50, 0x3f, 0xbf, 0x86,
+	0x96, 0x11, 0xbc, 0xb3, 0xbb, 0x65, 0x2e, 0x0d, 0x27, 0xd8, 0x06, 0xcb, 0x67, 0x3a, 0xe5, 0x8a,
+	0x43, 0x5c, 0x2f, 0xa6, 0xea, 0xdc, 0x7a, 0x06, 0x56, 0xce, 0x29, 0x13, 0xfc, 0x09, 0xac, 0x17,
+	0x65, 0x73, 0x4e, 0xcc, 0xa3, 0x7d, 0x67, 0x99, 0xf6, 0x9b, 0xac, 0x96, 0xde, 0x1e, 0x43, 0xc6,
+	0x23, 0xf6, 0xd0, 0x03, 0x5a, 0xdf, 0x83, 0xf5, 0xc7, 0x97, 0x47, 0x3a, 0xe1, 0xf7, 0x6c, 0xe9,
+	0x77, 0xcb, 0x80, 0x9b, 0x67, 0xe6, 0x0c, 0xae, 0x82, 0xab, 0x85, 0x26, 0x3b, 0x34, 0xc4, 0xe8,
+	0x0f, 0x70, 0x07, 0x2c, 0xf9, 0xc9, 0x33, 0x27, 0xee, 0xe1, 0x75, 0xf1, 0x2d, 0x6c, 0xae, 0x9d,
+	0xd9, 0xde, 0x07, 0xe5, 0xaf, 0x90, 0x5f, 0xdf, 0x2f, 0xed, 0xfa, 0x5e, 0x2c, 0xa9, 0x56, 0xd8,
+	0xea, 0x81, 0xfa, 0xf9, 0x4d, 0x03, 0xb7, 0xc1, 0x5c, 0xc6, 0xb5, 0xf5, 0x72, 0xd6, 0x6f, 0xa0,
+	0x4f, 0x69, 0xbb, 0x50, 0x72, 0xa7, 0x61, 0xeb, 0xc9, 0xab, 0x77, 0x8d, 0xca, 0xeb, 0x77, 0x8d,
+	0xca, 0xbf, 0xef, 0x1a, 0x95, 0x97, 0xef, 0x1b, 0x33, 0xaf, 0xdf, 0x37, 0x66, 0xde, 0xbc, 0x6f,
+	0xcc, 0x3c, 0x7f, 0xd0, 0xe7, 0x66, 0x90, 0xf7, 0x62, 0x22, 0x87, 0x09, 0x91, 0x7a, 0x28, 0x75,
+	0x72, 0x6a, 0xe6, 0xee, 0xf8, 0xa7, 0xaf, 0xb8, 0x9f, 0xfc, 0xe9, 0xfe, 0xfc, 0xdc, 0x8f, 0x6a,
+	0x6f, 0xde, 0xc5, 0x77, 0xff, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x49, 0x54, 0x31, 0x16,
+	0x0b, 0x00, 0x00,
+}
+
+func (m *ConsumerParams) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -718,12 +715,12 @@ func (m *Params) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *Params) MarshalTo(dAtA []byte) (int, error) {
+func (m *ConsumerParams) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *ConsumerParams) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -829,7 +826,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *GenesisState) Marshal() (dAtA []byte, err error) {
+func (m *ConsumerGenesisState) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -839,12 +836,12 @@ func (m *GenesisState) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) {
+func (m *ConsumerGenesisState) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *ConsumerGenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1171,7 +1168,7 @@ func encodeVarintSharedConsumer(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	return base
 }
-func (m *Params) Size() (n int) {
+func (m *ConsumerParams) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1225,7 +1222,7 @@ func (m *Params) Size() (n int) {
 	return n
 }
 
-func (m *GenesisState) Size() (n int) {
+func (m *ConsumerGenesisState) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -1361,7 +1358,7 @@ func sovSharedConsumer(x uint64) (n int) {
 func sozSharedConsumer(x uint64) (n int) {
 	return sovSharedConsumer(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
-func (m *Params) Unmarshal(dAtA []byte) error {
+func (m *ConsumerParams) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1384,10 +1381,10 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: Params: wiretype end group for non-group")
+			return fmt.Errorf("proto: ConsumerParams: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ConsumerParams: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -1793,7 +1790,7 @@ func (m *Params) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *GenesisState) Unmarshal(dAtA []byte) error {
+func (m *ConsumerGenesisState) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -1816,10 +1813,10 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: GenesisState: wiretype end group for non-group")
+			return fmt.Errorf("proto: ConsumerGenesisState: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: ConsumerGenesisState: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1: