diff --git a/mapping.json b/mapping.json
index 2f4ed0068..b6a47c2c8 100644
--- a/mapping.json
+++ b/mapping.json
@@ -1137,10 +1137,10 @@
     "src/monad/monad/src/engine/resources/Logging.resx":  "src/System.Management.Automation/resources/Logging.resx",
     "src/monad/monad/src/engine/resources/Metadata.resx":  "src/System.Management.Automation/resources/Metadata.resx",
     "src/monad/monad/src/engine/resources/MiniShellErrors.resx":  "src/System.Management.Automation/resources/MiniShellErrors.resx",
-    "src/monad/monad/src/engine/resources/modules.resx":  "src/System.Management.Automation/resources/modules.resx",
+    "src/monad/monad/src/engine/resources/modules.resx":  "src/System.Management.Automation/resources/Modules.resx",
     "src/monad/monad/src/engine/resources/MshHostRawUserInterfaceStrings.resx":  "src/System.Management.Automation/resources/MshHostRawUserInterfaceStrings.resx",
     "src/monad/monad/src/engine/resources/MshSignature.resx":  "src/System.Management.Automation/resources/MshSignature.resx",
-    "src/monad/monad/src/engine/resources/MshSnapinCmdletResources.resx":  "src/System.Management.Automation/resources/MshSnapinCmdletResources.resx",
+    "src/monad/monad/src/engine/resources/MshSnapinCmdletResources.resx":  "src/System.Management.Automation/resources/MshSnapInCmdletResources.resx",
     "src/monad/monad/src/engine/resources/MshSnapinInfo.resx":  "src/System.Management.Automation/resources/MshSnapinInfo.resx",
     "src/monad/monad/src/engine/resources/NativeCP.resx":  "src/System.Management.Automation/resources/NativeCP.resx",
     "src/monad/monad/src/engine/resources/ParameterBinderStrings.resx":  "src/System.Management.Automation/resources/ParameterBinderStrings.resx",
@@ -1155,7 +1155,7 @@
     "src/monad/monad/src/engine/resources/PSDataBufferStrings.resx":  "src/System.Management.Automation/resources/PSDataBufferStrings.resx",
     "src/monad/monad/src/engine/resources/PSListModifierStrings.resx":  "src/System.Management.Automation/resources/PSListModifierStrings.resx",
     "src/monad/monad/src/engine/resources/RegistryProviderStrings.resx":  "src/System.Management.Automation/resources/RegistryProviderStrings.resx",
-    "src/monad/monad/src/engine/resources/remotingerroridstrings.resx":  "src/System.Management.Automation/resources/remotingerroridstrings.resx",
+    "src/monad/monad/src/engine/resources/remotingerroridstrings.resx":  "src/System.Management.Automation/resources/RemotingErrorIdStrings.resx",
     "src/monad/monad/src/engine/resources/RunspaceInit.resx":  "src/System.Management.Automation/resources/RunspaceInit.resx",
     "src/monad/monad/src/engine/resources/RunspacePoolStrings.resx":  "src/System.Management.Automation/resources/RunspacePoolStrings.resx",
     "src/monad/monad/src/engine/resources/RunspaceStrings.resx":  "src/System.Management.Automation/resources/RunspaceStrings.resx",
diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json
index 7e20c7dbe..c2b5201ac 100644
--- a/src/Microsoft.PowerShell.Commands.Management/project.json
+++ b/src/Microsoft.PowerShell.Commands.Management/project.json
@@ -36,5 +36,5 @@
         }
     },
 
-    "compile": [ "../windows-build/gen/COMMANDS_MANAGEMENT/*.cs" ]
+    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ]
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json
index 4de41175b..77e6525e1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/project.json
+++ b/src/Microsoft.PowerShell.Commands.Utility/project.json
@@ -44,5 +44,5 @@
         }
     },
 
-    "compile": [ "../windows-build/gen/COMMANDS_UTILITY/*.cs" ]
+    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ]
 }
diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json
index 999371d72..76a1494a5 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/project.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/project.json
@@ -26,6 +26,6 @@
     },
 
     "compile": [
-        "../windows-build/gen/CONSOLE_HOST/*.cs"
+        "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs"
     ]
 }
diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json
index eac75ae00..bf6fd2486 100644
--- a/src/Microsoft.PowerShell.Security/project.json
+++ b/src/Microsoft.PowerShell.Security/project.json
@@ -23,5 +23,5 @@
         }
     },
 
-    "compile": [ "../windows-build/gen/SECURITY/*.cs" ]
+    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ]
 }
diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json
index b1a8470c4..cb230fb51 100644
--- a/src/System.Management.Automation/project.json
+++ b/src/System.Management.Automation/project.json
@@ -81,6 +81,6 @@
     },
 
     "compile": [
-        "../windows-build/gen/SYS_AUTO/*.cs"
+        "../windows-build/gen/System.Management.Automation/*.cs"
     ]
 }
diff --git a/src/System.Management.Automation/resources/modules.resx b/src/System.Management.Automation/resources/Modules.resx
similarity index 100%
rename from src/System.Management.Automation/resources/modules.resx
rename to src/System.Management.Automation/resources/Modules.resx
diff --git a/src/System.Management.Automation/resources/MshSnapinCmdletResources.resx b/src/System.Management.Automation/resources/MshSnapInCmdletResources.resx
similarity index 100%
rename from src/System.Management.Automation/resources/MshSnapinCmdletResources.resx
rename to src/System.Management.Automation/resources/MshSnapInCmdletResources.resx
diff --git a/src/System.Management.Automation/resources/remotingerroridstrings.resx b/src/System.Management.Automation/resources/RemotingErrorIdStrings.resx
similarity index 100%
rename from src/System.Management.Automation/resources/remotingerroridstrings.resx
rename to src/System.Management.Automation/resources/RemotingErrorIdStrings.resx