From d4feafd2e29adfca4ed0be48fefff91584254600 Mon Sep 17 00:00:00 2001
From: tyler <48813565+technicallyty@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:05:01 -0700
Subject: [PATCH 1/2] fix(x/group): rename group's legacy ORM error codespace
 to prevent collisions with new ORM codespace

---
 x/group/errors/orm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/group/errors/orm.go b/x/group/errors/orm.go
index 370abdb882b8..bfebd0e54deb 100644
--- a/x/group/errors/orm.go
+++ b/x/group/errors/orm.go
@@ -3,7 +3,7 @@ package errors
 import "cosmossdk.io/errors"
 
 // mathCodespace is the codespace for all errors defined in orm package
-const ormCodespace = "orm"
+const ormCodespace = "legacy_orm"
 
 var (
 	// ErrORMIteratorDone defines an error when an iterator is done

From 94e24285e86c2fd1da2cdba6938cff2b872fa52d Mon Sep 17 00:00:00 2001
From: tyler <48813565+technicallyty@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:12:01 -0700
Subject: [PATCH 2/2] docs: add changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bb7d2a4751c..ccad993bccfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (x/group) [#17146](https://github.com/cosmos/cosmos-sdk/pull/17146) Rename x/group legacy ORM package's error codespace from "orm" to "legacy_orm", preventing collisions with ORM's error codespace "orm".
+
 ### API Breaking Changes
 
 * (x/slashing) [17063](https://github.com/cosmos/cosmos-sdk/pull/17063) Use collections for `HistoricalInfo`: