diff --git a/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.json b/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.json
index 639f8f874b4..ec369ba2053 100644
--- a/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.json
+++ b/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@autorest/testmodeler",
   "entries": [
+    {
+      "version": "2.3.1",
+      "tag": "@autorest/testmodeler_v2.3.1",
+      "date": "Fri, 05 Aug 2022 09:25:55 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Consolidate operation groups for examples with m4."
+          }
+        ]
+      }
+    },
     {
       "version": "2.3.0",
       "tag": "@autorest/testmodeler_v2.3.0",
diff --git a/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.md b/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.md
index 0a1409055a5..ba118436da5 100644
--- a/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.md
+++ b/tools/sdk-testgen/packages/autorest.testmodeler/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @autorest/testmodeler
 
-This log was last generated on Thu, 21 Jul 2022 06:46:35 GMT and should not be manually modified.
+This log was last generated on Fri, 05 Aug 2022 09:25:55 GMT and should not be manually modified.
+
+## 2.3.1
+Fri, 05 Aug 2022 09:25:55 GMT
+
+### Patches
+
+- Consolidate operation groups for examples with m4.
 
 ## 2.3.0
 Thu, 21 Jul 2022 06:46:35 GMT
diff --git a/tools/sdk-testgen/packages/autorest.testmodeler/package.json b/tools/sdk-testgen/packages/autorest.testmodeler/package.json
index 0620f72a4bb..e4b73a70186 100644
--- a/tools/sdk-testgen/packages/autorest.testmodeler/package.json
+++ b/tools/sdk-testgen/packages/autorest.testmodeler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@autorest/testmodeler",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "description": "Autorest extension for testmodeler",
     "main": "dist/index.js",
     "scripts": {
diff --git a/tools/sdk-testgen/packages/autorest.testmodeler/src/core/model.ts b/tools/sdk-testgen/packages/autorest.testmodeler/src/core/model.ts
index a8a3a9851b1..294eb9a87e6 100644
--- a/tools/sdk-testgen/packages/autorest.testmodeler/src/core/model.ts
+++ b/tools/sdk-testgen/packages/autorest.testmodeler/src/core/model.ts
@@ -51,7 +51,7 @@ export class MockTestDefinitionModel {
     exampleGroups: ExampleGroup[] = [];
     public static groupByOperationGroup(exampleGroups: ExampleGroup[]): Record<string, ExampleGroup[]> {
         return exampleGroups.reduce((r, exampleGroup) => {
-            const groupKey = exampleGroup.operationId.split('_')[0];
+            const groupKey = exampleGroup.operationGroup.$key;
             r[groupKey] = r[groupKey] || [];
             r[groupKey].push(exampleGroup);
             return r;