diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index ae9f54a3f2..6144e7e800 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -37,7 +37,7 @@
             "docset_name": "exchange-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -46,8 +46,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -86,7 +86,7 @@
             "docset_name": "skype-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -95,8 +95,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -108,7 +108,7 @@
             "docset_name": "spmt-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -117,8 +117,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -135,7 +135,7 @@
             "docset_name": "teams-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -144,8 +144,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -162,7 +162,7 @@
             "docset_name": "whiteboard-ps",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
@@ -171,8 +171,8 @@
             "type_mapping": {
                 "Conceptual": "Content",
                 "ManagedReference": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content",
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content",
                 "RestApi": "Content"
             },
             "version": 0
@@ -199,4 +199,4 @@
             "template_folder": "_themes.pdf"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/exchange/mapping/MAML2Yaml/monikerMapping.json b/exchange/mapping/monikerMapping.json
similarity index 100%
rename from exchange/mapping/MAML2Yaml/monikerMapping.json
rename to exchange/mapping/monikerMapping.json
diff --git a/skype/mapping/MAML2Yaml/monikerMapping.json b/skype/mapping/monikerMapping.json
similarity index 100%
rename from skype/mapping/MAML2Yaml/monikerMapping.json
rename to skype/mapping/monikerMapping.json
diff --git a/spmt/mapping/MAML2Yaml/monikerMapping.json b/spmt/mapping/monikerMapping.json
similarity index 100%
rename from spmt/mapping/MAML2Yaml/monikerMapping.json
rename to spmt/mapping/monikerMapping.json
diff --git a/teams/mapping/MAML2Yaml/monikerMapping.json b/teams/mapping/monikerMapping.json
similarity index 100%
rename from teams/mapping/MAML2Yaml/monikerMapping.json
rename to teams/mapping/monikerMapping.json
diff --git a/whiteboard/mapping/MAML2Yaml/monikerMapping.json b/whiteboard/mapping/monikerMapping.json
similarity index 100%
rename from whiteboard/mapping/MAML2Yaml/monikerMapping.json
rename to whiteboard/mapping/monikerMapping.json