diff --git a/Microsoft.RestApi.RestSplitter/Generator/TagsGenerator.cs b/Microsoft.RestApi.RestSplitter/Generator/TagsGenerator.cs
index 5a88959..3e339ba 100644
--- a/Microsoft.RestApi.RestSplitter/Generator/TagsGenerator.cs
+++ b/Microsoft.RestApi.RestSplitter/Generator/TagsGenerator.cs
@@ -110,8 +110,9 @@ public override IEnumerable<FileNameInfo> Generate()
                         keyValuePairs.Add(fileName, Tuple.Create(new JObject(RootJObj), TargetDir));
                     }
                     
+                    fileName = $"{fileName}.json";
                     fileNameInfo.FileName = OrgsMappingFile.UseYamlSchema ? Path.ChangeExtension(fileName, "yml") : fileName;
-                    fileNameInfo.FilePath = Path.Combine(TargetDir, $"{fileName}.json");
+                    fileNameInfo.FilePath = Path.Combine(TargetDir, fileName);
                     fileNameInfo.Version = Version;
 
                     // Clear up internal data