diff --git a/.changelog/config.toml b/.changelog/config.toml
index 5ad5d5cc42..5cb7e69183 100644
--- a/.changelog/config.toml
+++ b/.changelog/config.toml
@@ -1,21 +1,7 @@
 project_url = "https://github.com/cosmos/interchain-security"
 
-# Settings related to components/sub-modules. Only relevant if you make use of
-# components/sub-modules.
-[components]
-
-# The title to use for the section of entries not relating to a specific
-# component.
-general_entries_title = "General"
-
 # The number of spaces to inject before each component-related entry.
 entry_indent = 2
 
-    # The components themselves. Each component has a name (used when rendered
-    # to Markdown) and a path relative to the project folder (i.e. relative to
-    # the parent of the `.changelog` folder).
-    [components.all]
-    provider = { name = "Provider", path = "x/ccv/provider" }
-    consumer = { name = "Consumer", path = "x/ccv/consumer" }
-    tests = { name = "Tests", path = "tests" }
-    docs = { name = "Documentation", path = "docs/docs" }
\ No newline at end of file
+[change_set_sections]
+sort_entries_by = "entry-text"
\ No newline at end of file
diff --git a/.changelog/unreleased/api-breaking/provider/2079-inactive-validators.md b/.changelog/unreleased/api-breaking/2079-inactive-validators.md
similarity index 93%
rename from .changelog/unreleased/api-breaking/provider/2079-inactive-validators.md
rename to .changelog/unreleased/api-breaking/2079-inactive-validators.md
index 815f730e58..0a83c58da4 100644
--- a/.changelog/unreleased/api-breaking/provider/2079-inactive-validators.md
+++ b/.changelog/unreleased/api-breaking/2079-inactive-validators.md
@@ -1,4 +1,4 @@
-- Add the _Inactive Provider Validators_ feature (as per 
+- `[x/provider]` Add the _Inactive Provider Validators_ feature (as per 
   [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)),
   which entails the following changes on the provider.
   ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))
diff --git a/.changelog/unreleased/api-breaking/provider/2098-vscmatured-removal.md b/.changelog/unreleased/api-breaking/2098-vscmatured-removal.md
similarity index 77%
rename from .changelog/unreleased/api-breaking/provider/2098-vscmatured-removal.md
rename to .changelog/unreleased/api-breaking/2098-vscmatured-removal.md
index b5bb3ff5cc..b457835911 100644
--- a/.changelog/unreleased/api-breaking/provider/2098-vscmatured-removal.md
+++ b/.changelog/unreleased/api-breaking/2098-vscmatured-removal.md
@@ -1,4 +1,4 @@
-- The removal of `VSCMaturedPackets` entail several API breaking changes.
+- `[x/provider]` The removal of `VSCMaturedPackets` entail several API breaking changes.
   ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))
   
   - Remove the `oldest_unconfirmed_vsc` query -- used to get
diff --git a/.changelog/unreleased/api-breaking/provider/2171-permissionless-ics.md b/.changelog/unreleased/api-breaking/2171-permissionless-ics.md
similarity index 98%
rename from .changelog/unreleased/api-breaking/provider/2171-permissionless-ics.md
rename to .changelog/unreleased/api-breaking/2171-permissionless-ics.md
index e674b4cb0c..55aab0b637 100644
--- a/.changelog/unreleased/api-breaking/provider/2171-permissionless-ics.md
+++ b/.changelog/unreleased/api-breaking/2171-permissionless-ics.md
@@ -1,4 +1,4 @@
-- Add the  Permissionless ICS feature on the provider (as per 
+- `[x/provider]` Add the  Permissionless ICS feature on the provider (as per 
   [ADR-019](https://cosmos.github.io/interchain-security/adrs/adr-019-permissionless-ics)),
   which entails the following api-breaking changes on the provider.
   ([\#2171](https://github.com/cosmos/interchain-security/pull/2171))
diff --git a/.changelog/unreleased/state-breaking/provider/2035-min-stake-max-rank.md b/.changelog/unreleased/features/2035-min-stake-max-rank.md
similarity index 59%
rename from .changelog/unreleased/state-breaking/provider/2035-min-stake-max-rank.md
rename to .changelog/unreleased/features/2035-min-stake-max-rank.md
index e48d7f299f..bc2e10912b 100644
--- a/.changelog/unreleased/state-breaking/provider/2035-min-stake-max-rank.md
+++ b/.changelog/unreleased/features/2035-min-stake-max-rank.md
@@ -1,3 +1,3 @@
-- Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
+- `[x/provider]` Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
   the minimum amount of provider stake every validator needs to be eligible to opt-in.
   ([\#2035](https://github.com/cosmos/interchain-security/pull/2035))
diff --git a/.changelog/unreleased/features/provider/2066-allow-inactive-vals.md b/.changelog/unreleased/features/2066-allow-inactive-vals.md
similarity index 60%
rename from .changelog/unreleased/features/provider/2066-allow-inactive-vals.md
rename to .changelog/unreleased/features/2066-allow-inactive-vals.md
index d5f85f9508..1ceadd285e 100644
--- a/.changelog/unreleased/features/provider/2066-allow-inactive-vals.md
+++ b/.changelog/unreleased/features/2066-allow-inactive-vals.md
@@ -1,3 +1,3 @@
-- Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
+- `[x/provider]` Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
   to specify whether validators outside the active provider validator set are eligible to opt-in. 
   ([\#2066](https://github.com/cosmos/interchain-security/pull/2066))
\ No newline at end of file
diff --git a/.changelog/unreleased/features/provider/2079-inactive-validators.md b/.changelog/unreleased/features/2079-inactive-validators.md
similarity index 93%
rename from .changelog/unreleased/features/provider/2079-inactive-validators.md
rename to .changelog/unreleased/features/2079-inactive-validators.md
index 815f730e58..0a83c58da4 100644
--- a/.changelog/unreleased/features/provider/2079-inactive-validators.md
+++ b/.changelog/unreleased/features/2079-inactive-validators.md
@@ -1,4 +1,4 @@
-- Add the _Inactive Provider Validators_ feature (as per 
+- `[x/provider]` Add the _Inactive Provider Validators_ feature (as per 
   [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)),
   which entails the following changes on the provider.
   ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))
diff --git a/.changelog/unreleased/features/provider/2098-vscmatured-removal.md b/.changelog/unreleased/features/2098-vscmatured-removal.md
similarity index 76%
rename from .changelog/unreleased/features/provider/2098-vscmatured-removal.md
rename to .changelog/unreleased/features/2098-vscmatured-removal.md
index aa370d81d2..d727da4dbb 100644
--- a/.changelog/unreleased/features/provider/2098-vscmatured-removal.md
+++ b/.changelog/unreleased/features/2098-vscmatured-removal.md
@@ -1,4 +1,4 @@
-- Remove `VSCMaturedPackets` from the provider module, which entails the following 
+- `[x/provider]` Remove `VSCMaturedPackets` from the provider module, which entails the following 
   changes to the provider. 
   ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))
 
diff --git a/.changelog/unreleased/features/2106-query-blocks-until-next-epoch.md b/.changelog/unreleased/features/2106-query-blocks-until-next-epoch.md
new file mode 100644
index 0000000000..658937dd35
--- /dev/null
+++ b/.changelog/unreleased/features/2106-query-blocks-until-next-epoch.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Add a query to get the blocks until the next epoch begins
+  ([\#2106](https://github.com/cosmos/interchain-security/pull/2106))
\ No newline at end of file
diff --git a/.changelog/unreleased/features/provider/2171-permissionless-ics.md b/.changelog/unreleased/features/2171-permissionless-ics.md
similarity index 97%
rename from .changelog/unreleased/features/provider/2171-permissionless-ics.md
rename to .changelog/unreleased/features/2171-permissionless-ics.md
index df00a3d243..692f5142d0 100644
--- a/.changelog/unreleased/features/provider/2171-permissionless-ics.md
+++ b/.changelog/unreleased/features/2171-permissionless-ics.md
@@ -1,4 +1,4 @@
-- Add the _Permissionless ICS_ feature (as per 
+- `[x/provider]` Add the _Permissionless ICS_ feature (as per 
   [ADR-019](https://cosmos.github.io/interchain-security/adrs/adr-019-permissionless-ics)),
   which entails the following CLI and API enhancements on the provider.
   ([\#2171](https://github.com/cosmos/interchain-security/pull/2171))
diff --git a/.changelog/unreleased/features/provider/2211-deprecate-migration.md b/.changelog/unreleased/features/2211-deprecate-migration.md
similarity index 75%
rename from .changelog/unreleased/features/provider/2211-deprecate-migration.md
rename to .changelog/unreleased/features/2211-deprecate-migration.md
index 2363098b91..ba42310b3e 100644
--- a/.changelog/unreleased/features/provider/2211-deprecate-migration.md
+++ b/.changelog/unreleased/features/2211-deprecate-migration.md
@@ -1,4 +1,4 @@
-- Remove provider migrations to consensus versions lower than 7.
+- `[x/provider]` Remove provider migrations to consensus versions lower than 7.
   To migrate the provider module from consensus version 3, 4, or 5 to consensus version 7 or higher, 
   users should use v4.3.x in production to migrate to consensus version 6.
   ([\#2211](https://github.com/cosmos/interchain-security/pull/2211))
\ No newline at end of file
diff --git a/.changelog/unreleased/features/provider/2106-query-blocks-until-next-epoch.md b/.changelog/unreleased/features/provider/2106-query-blocks-until-next-epoch.md
deleted file mode 100644
index 070fa487e9..0000000000
--- a/.changelog/unreleased/features/provider/2106-query-blocks-until-next-epoch.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add a query to get the blocks until the next epoch begins
-  ([\#2106](https://github.com/cosmos/interchain-security/pull/2106))
\ No newline at end of file
diff --git a/.changelog/unreleased/features/provider/2035-min-stake-max-rank.md b/.changelog/unreleased/state-breaking/2035-min-stake-max-rank.md
similarity index 59%
rename from .changelog/unreleased/features/provider/2035-min-stake-max-rank.md
rename to .changelog/unreleased/state-breaking/2035-min-stake-max-rank.md
index e48d7f299f..bc2e10912b 100644
--- a/.changelog/unreleased/features/provider/2035-min-stake-max-rank.md
+++ b/.changelog/unreleased/state-breaking/2035-min-stake-max-rank.md
@@ -1,3 +1,3 @@
-- Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
+- `[x/provider]` Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
   the minimum amount of provider stake every validator needs to be eligible to opt-in.
   ([\#2035](https://github.com/cosmos/interchain-security/pull/2035))
diff --git a/.changelog/unreleased/state-breaking/provider/2066-allow-inactive-vals.md b/.changelog/unreleased/state-breaking/2066-allow-inactive-vals.md
similarity index 60%
rename from .changelog/unreleased/state-breaking/provider/2066-allow-inactive-vals.md
rename to .changelog/unreleased/state-breaking/2066-allow-inactive-vals.md
index d5f85f9508..1ceadd285e 100644
--- a/.changelog/unreleased/state-breaking/provider/2066-allow-inactive-vals.md
+++ b/.changelog/unreleased/state-breaking/2066-allow-inactive-vals.md
@@ -1,3 +1,3 @@
-- Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
+- `[x/provider]` Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
   to specify whether validators outside the active provider validator set are eligible to opt-in. 
   ([\#2066](https://github.com/cosmos/interchain-security/pull/2066))
\ No newline at end of file
diff --git a/.changelog/unreleased/state-breaking/provider/2079-inactive-validators.md b/.changelog/unreleased/state-breaking/2079-inactive-validators.md
similarity index 70%
rename from .changelog/unreleased/state-breaking/provider/2079-inactive-validators.md
rename to .changelog/unreleased/state-breaking/2079-inactive-validators.md
index 6760b3071d..c2c5af1ca5 100644
--- a/.changelog/unreleased/state-breaking/provider/2079-inactive-validators.md
+++ b/.changelog/unreleased/state-breaking/2079-inactive-validators.md
@@ -1,3 +1,3 @@
-- Add the _Inactive Provider Validators_ feature (as per 
+- `[x/provider]` Add the _Inactive Provider Validators_ feature (as per 
   [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)).
   ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))
\ No newline at end of file
diff --git a/.changelog/unreleased/state-breaking/provider/2098-vscmatured-removal.md b/.changelog/unreleased/state-breaking/2098-vscmatured-removal.md
similarity index 67%
rename from .changelog/unreleased/state-breaking/provider/2098-vscmatured-removal.md
rename to .changelog/unreleased/state-breaking/2098-vscmatured-removal.md
index c0e77998df..cc0e381f58 100644
--- a/.changelog/unreleased/state-breaking/provider/2098-vscmatured-removal.md
+++ b/.changelog/unreleased/state-breaking/2098-vscmatured-removal.md
@@ -1,3 +1,3 @@
-- Remove `VSCMaturedPackets` from the provider module (as per 
+- `[x/provider]` Remove `VSCMaturedPackets` from the provider module (as per 
   [ADR-018](https://cosmos.github.io/interchain-security/adrs/adr-018-remove-vscmatured)).
   ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))
diff --git a/.changelog/unreleased/state-breaking/provider/2171-permissionless-ics.md b/.changelog/unreleased/state-breaking/2171-permissionless-ics.md
similarity index 71%
rename from .changelog/unreleased/state-breaking/provider/2171-permissionless-ics.md
rename to .changelog/unreleased/state-breaking/2171-permissionless-ics.md
index fd89591e26..acaf84c498 100644
--- a/.changelog/unreleased/state-breaking/provider/2171-permissionless-ics.md
+++ b/.changelog/unreleased/state-breaking/2171-permissionless-ics.md
@@ -1,3 +1,3 @@
-- Add the _Permissionless ICS_ feature (as per 
+- `[x/provider]` Add the _Permissionless ICS_ feature (as per 
   [ADR-019](https://cosmos.github.io/interchain-security/adrs/adr-019-permissionless-ics)).
   ([\#2171](https://github.com/cosmos/interchain-security/pull/2171))
\ No newline at end of file
diff --git a/.changelog/v5.0.0/features/1698-add-update-provider-params-msg.md b/.changelog/v5.0.0/features/1698-add-update-provider-params-msg.md
new file mode 100644
index 0000000000..7866a3de2f
--- /dev/null
+++ b/.changelog/v5.0.0/features/1698-add-update-provider-params-msg.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Add provider `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
+([\#1698](https://github.com/cosmos/interchain-security/pull/1698)).
\ No newline at end of file
diff --git a/.changelog/v5.0.0/features/1814-add-update-consumer-params-msg.md b/.changelog/v5.0.0/features/1814-add-update-consumer-params-msg.md
new file mode 100644
index 0000000000..ec64bc4a5e
--- /dev/null
+++ b/.changelog/v5.0.0/features/1814-add-update-consumer-params-msg.md
@@ -0,0 +1,2 @@
+- `[x/consumer]` Add consumer `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
+([\#1814](https://github.com/cosmos/interchain-security/pull/1814)).
\ No newline at end of file
diff --git a/.changelog/v5.0.0/features/consumer/1814-add-update-consumer-params-msg.md b/.changelog/v5.0.0/features/consumer/1814-add-update-consumer-params-msg.md
deleted file mode 100644
index 811c56401b..0000000000
--- a/.changelog/v5.0.0/features/consumer/1814-add-update-consumer-params-msg.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add consumer `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
-([\#1814](https://github.com/cosmos/interchain-security/pull/1814)).
\ No newline at end of file
diff --git a/.changelog/v5.0.0/features/provider/1698-add-update-provider-params-msg.md b/.changelog/v5.0.0/features/provider/1698-add-update-provider-params-msg.md
deleted file mode 100644
index ca2ce372e2..0000000000
--- a/.changelog/v5.0.0/features/provider/1698-add-update-provider-params-msg.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Add provider `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
-([\#1698](https://github.com/cosmos/interchain-security/pull/1698)).
\ No newline at end of file
diff --git a/.changelog/v5.1.0/api-breaking/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/api-breaking/1998-change-ux-in-key-assignment.md
new file mode 100644
index 0000000000..48274705b2
--- /dev/null
+++ b/.changelog/v5.1.0/api-breaking/1998-change-ux-in-key-assignment.md
@@ -0,0 +1,3 @@
+- `[x/provider]` Change the UX in key assignment by returning an error if a validator tries to
+  reuse the same consumer key.
+  ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
diff --git a/.changelog/v5.1.0/api-breaking/provider/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/api-breaking/provider/1998-change-ux-in-key-assignment.md
deleted file mode 100644
index 094583d465..0000000000
--- a/.changelog/v5.1.0/api-breaking/provider/1998-change-ux-in-key-assignment.md
+++ /dev/null
@@ -1,3 +0,0 @@
-- Change the UX in key assignment by returning an error if a validator tries to
-  reuse the same consumer key.
-([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
diff --git a/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md b/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
index 6b447d3ed6..34ac7ab786 100644
--- a/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
+++ b/.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md
@@ -1,2 +1,2 @@
 - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
-  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
+  - Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
diff --git a/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md b/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
index 6b447d3ed6..34ac7ab786 100644
--- a/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
+++ b/.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md
@@ -1,2 +1,2 @@
 - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
-  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
+  - Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
\ No newline at end of file
diff --git a/.changelog/v5.1.0/state-breaking/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/state-breaking/1998-change-ux-in-key-assignment.md
new file mode 100644
index 0000000000..48274705b2
--- /dev/null
+++ b/.changelog/v5.1.0/state-breaking/1998-change-ux-in-key-assignment.md
@@ -0,0 +1,3 @@
+- `[x/provider]` Change the UX in key assignment by returning an error if a validator tries to
+  reuse the same consumer key.
+  ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
diff --git a/.changelog/v5.1.0/state-breaking/provider/1998-change-ux-in-key-assignment.md b/.changelog/v5.1.0/state-breaking/provider/1998-change-ux-in-key-assignment.md
deleted file mode 100644
index 094583d465..0000000000
--- a/.changelog/v5.1.0/state-breaking/provider/1998-change-ux-in-key-assignment.md
+++ /dev/null
@@ -1,3 +0,0 @@
-- Change the UX in key assignment by returning an error if a validator tries to
-  reuse the same consumer key.
-([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
diff --git a/.changelog/v5.1.1/api-breaking/2095-proto-message-fix.md b/.changelog/v5.1.1/api-breaking/2095-proto-message-fix.md
new file mode 100644
index 0000000000..450c33ce27
--- /dev/null
+++ b/.changelog/v5.1.1/api-breaking/2095-proto-message-fix.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/.changelog/v5.1.1/api-breaking/provider/2095-proto-message-fix.md b/.changelog/v5.1.1/api-breaking/provider/2095-proto-message-fix.md
deleted file mode 100644
index 2fa746a166..0000000000
--- a/.changelog/v5.1.1/api-breaking/provider/2095-proto-message-fix.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fix incorrect message definitions in the proto files of the provider module
-  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/.changelog/v5.1.1/state-breaking/2095-proto-message-fix.md b/.changelog/v5.1.1/state-breaking/2095-proto-message-fix.md
new file mode 100644
index 0000000000..450c33ce27
--- /dev/null
+++ b/.changelog/v5.1.1/state-breaking/2095-proto-message-fix.md
@@ -0,0 +1,2 @@
+- `[x/provider]` Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/.changelog/v5.1.1/state-breaking/provider/2095-proto-message-fix.md b/.changelog/v5.1.1/state-breaking/provider/2095-proto-message-fix.md
deleted file mode 100644
index 2fa746a166..0000000000
--- a/.changelog/v5.1.1/state-breaking/provider/2095-proto-message-fix.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fix incorrect message definitions in the proto files of the provider module
-  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
\ No newline at end of file
diff --git a/.changelog/v5.2.0/bug-fixes/provider/1dd3885-msg-validation.md b/.changelog/v5.2.0/bug-fixes/1dd3885-msg-validation.md
similarity index 66%
rename from .changelog/v5.2.0/bug-fixes/provider/1dd3885-msg-validation.md
rename to .changelog/v5.2.0/bug-fixes/1dd3885-msg-validation.md
index 379e981ac0..3aa7eceea9 100644
--- a/.changelog/v5.2.0/bug-fixes/provider/1dd3885-msg-validation.md
+++ b/.changelog/v5.2.0/bug-fixes/1dd3885-msg-validation.md
@@ -1,2 +1,2 @@
-- Improve provider message validation.
+- `[x/provider]` Improve provider message validation.
   ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
\ No newline at end of file
diff --git a/.changelog/v5.2.0/state-breaking/provider/1dd3885-msg-validation.md b/.changelog/v5.2.0/state-breaking/1dd3885-msg-validation.md
similarity index 66%
rename from .changelog/v5.2.0/state-breaking/provider/1dd3885-msg-validation.md
rename to .changelog/v5.2.0/state-breaking/1dd3885-msg-validation.md
index 379e981ac0..3aa7eceea9 100644
--- a/.changelog/v5.2.0/state-breaking/provider/1dd3885-msg-validation.md
+++ b/.changelog/v5.2.0/state-breaking/1dd3885-msg-validation.md
@@ -1,2 +1,2 @@
-- Improve provider message validation.
+- `[x/provider]` Improve provider message validation.
   ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 893c5b12e2..34c267db52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,15 +6,13 @@
 
 ### BUG FIXES
 
-- [Provider](x/ccv/provider)
-  - Improve provider message validation.
-    ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
+- `[x/provider]` Improve provider message validation.
+  ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
 
 ### STATE BREAKING
 
-- [Provider](x/ccv/provider)
-  - Improve provider message validation.
-    ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
+- `[x/provider]` Improve provider message validation.
+  ([1dd3885](https://github.com/cosmos/interchain-security/commit/1dd38851dbb9e0d98c61bd11375ee7e140527833))
 
 ## v5.1.1
 
@@ -22,15 +20,13 @@
 
 ### API BREAKING
 
-- [Provider](x/ccv/provider)
-  - Fix incorrect message definitions in the proto files of the provider module
-    ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
+- `[x/provider]` Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
 
 ### STATE BREAKING
 
-- [Provider](x/ccv/provider)
-  - Fix incorrect message definitions in the proto files of the provider module
-    ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
+- `[x/provider]` Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
 
 ## v5.1.0
 
@@ -38,49 +34,45 @@
 
 ### API BREAKING
 
-- General
-  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
-    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
-- [Provider](x/ccv/provider)
-  - Change the UX in key assignment by returning an error if a validator tries to
-    reuse the same consumer key.
-    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+- `[x/provider]` Change the UX in key assignment by returning an error if a validator tries to
+  reuse the same consumer key.
+  ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
 
 ### DEPENDENCIES
 
 - Bump [CometBFT](https://github.com/cometbft/cometbft) to
   [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
   ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
-- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
-  [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
-  ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
 - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
 [v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
 ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+  ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
 
 ### FEATURES
 
 - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
-  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+  - Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
 
 ### STATE BREAKING
 
-- General
-  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
-    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
-  - Bump [CometBFT](https://github.com/cometbft/cometbft) to
-    [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
-    ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
-  - Bump [ibc-go](https://github.com/cosmos/ibc-go) to
-    [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
-    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
-  - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
-    [v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
-    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
-- [Provider](x/ccv/provider)
-  - Change the UX in key assignment by returning an error if a validator tries to
-    reuse the same consumer key.
-    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+- Bump [CometBFT](https://github.com/cometbft/cometbft) to
+  [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
+  ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+[v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
+([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+  ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  - Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+- `[x/provider]` Change the UX in key assignment by returning an error if a validator tries to
+  reuse the same consumer key.
+  ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
 
 ## v5.0.0
 
@@ -88,36 +80,34 @@
 
 ### DEPENDENCIES
 
-- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
-  [v8.1.x](https://github.com/cosmos/ibc-go/releases/tag/v8.1.0).
-  ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 - Bump [CometBFT](https://github.com/cometbft/cometbft) to
   [v0.38.4\5](https://github.com/cometbft/cometbft/releases/tag/v0.38.5).
   ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
 [v0.50.x](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.4)
 ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.1.x](https://github.com/cosmos/ibc-go/releases/tag/v8.1.0).
+  ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 
 ### FEATURES
 
-- [Consumer](x/ccv/consumer)
-  - Add consumer `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
-    ([\#1814](https://github.com/cosmos/interchain-security/pull/1814)).
-- [Provider](x/ccv/provider)
-  - Add provider `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
-    ([\#1698](https://github.com/cosmos/interchain-security/pull/1698)).
+- `[x/consumer]` Add consumer `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
+([\#1814](https://github.com/cosmos/interchain-security/pull/1814)).
+- `[x/provider]` Add provider `MsgUpdateParams` from [cosmos-sdk](https://github.com/cosmos/cosmos-sdk).
+([\#1698](https://github.com/cosmos/interchain-security/pull/1698)).
 
 ### STATE BREAKING
 
-- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
-  [v8.1.x](https://github.com/cosmos/ibc-go/releases/tag/v8.1.0).
-  ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 - Bump [CometBFT](https://github.com/cometbft/cometbft) to
   [v0.38.4\5](https://github.com/cometbft/cometbft/releases/tag/v0.38.5).
   ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
 [v0.50.x](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.4)
 ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.1.x](https://github.com/cosmos/ibc-go/releases/tag/v8.1.0).
+  ([\#1698](https://github.com/cosmos/interchain-security/pull/1698))
 - Revert `PutUnbondingOnHold` behavior to ICS@v1
 ([\#1819](https://github.com/cosmos/interchain-security/pull/1819))
 
@@ -395,20 +385,20 @@ May 17, 2024
 - General
   - Split out consumer genesis state to reduce shared data between provider and
     consumer. ([\#1324](https://github.com/cosmos/interchain-security/pull/1324))
-  - Note: This breaks json format used by augmenting Genesis files of consumer
-    chains with consumer genesis content exported from provider chain. Consumer
-    Genesis content exported from a provider chain using major version 1, 2 or 3
-    of the provider module needs to be transformed with the transformation command
-    introduced by this PR:
-    ```
-    Transform the consumer genesis file from a provider version v1, v2 or v3 to a version supported by this consumer. Result is printed to STDOUT.
-    
-    Example:
-    $ <appd> transform /path/to/ccv_consumer_genesis.json
-    
-    Usage:
-    interchain-security-cd genesis transform [genesis-file] [flags]
-    ```
+    - Note: This breaks json format used by augmenting Genesis files of consumer
+      chains with consumer genesis content exported from provider chain. Consumer
+      Genesis content exported from a provider chain using major version 1, 2 or 3
+      of the provider module needs to be transformed with the transformation command
+      introduced by this PR:
+      ```
+      Transform the consumer genesis file from a provider version v1, v2 or v3 to a version supported by this consumer. Result is printed to STDOUT.
+      
+      Example:
+      $ <appd> transform /path/to/ccv_consumer_genesis.json
+      
+      Usage:
+      interchain-security-cd genesis transform [genesis-file] [flags]
+      ```
   - Refactor shared events, codecs and errors assign to
     consumer and provider dedicated types where possible.
     ([\#1350](https://github.com/cosmos/interchain-security/pull/1350))