diff --git a/Microsoft.RestApi.RestSplitter/Generator/BaseGenerator.cs b/Microsoft.RestApi.RestSplitter/Generator/BaseGenerator.cs
index f1dbad4..beb6bf8 100644
--- a/Microsoft.RestApi.RestSplitter/Generator/BaseGenerator.cs
+++ b/Microsoft.RestApi.RestSplitter/Generator/BaseGenerator.cs
@@ -117,9 +117,10 @@ protected IEnumerable<FileNameInfo> GenerateOperations(JObject rootJObj, JObject
                     }
 
                     var groupNamePath = Utility.TryToFormalizeUrl(groupName, OrgsMappingFile.FormalizeUrl);
+                    var legacyGroupNamePath = groupNamePath;
                     groupNamePath = Utility.ExtractPascalFileNameByRegex(groupNamePath, OrgsMappingFile.NoSplitWords, "-");
                     var operationNamePath = Utility.TryToFormalizeUrl(operationId, OrgsMappingFile.FormalizeUrl);
-                    var operationFile = Utility.Serialize(Path.Combine(targetDir, groupNamePath), Utility.ExtractPascalFileNameByRegex(RemoveTag(operationNamePath, groupNamePath), OrgsMappingFile.NoSplitWords, "-"), rootJObj);
+                    var operationFile = Utility.Serialize(Path.Combine(targetDir, groupNamePath), Utility.ExtractPascalFileNameByRegex(RemoveTag(operationNamePath, legacyGroupNamePath), OrgsMappingFile.NoSplitWords, "-"), rootJObj);
                     ClearKey(rootJObj, "x-internal-split-type");
                     ClearKey(rootJObj, "x-internal-operation-id");
                     ClearKey(rootJObj, "x-internal-operation-name");