diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index 862a201066..7a6618e319 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -137,8 +137,8 @@
         "Conceptual": "Content",
         "ManagedReference": "Content",
         "RestApi": "Content",
-        "PowershellModule": "Content",
-        "PowershellCmdlet": "Content"
+        "PowerShellModule1": "Content",
+        "PowerShellCmdlet1": "Content"
       },
       "build_entry_point": "docs",
       "template_folder": "_themes",
@@ -149,7 +149,7 @@
         ]
       },
       "monikerPath": [
-        "mapping/MAML2Yaml/monikerMapping.json"
+        "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
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboards.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboards.md
index 79b19d9edd..98ca948043 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboards.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboards.md
@@ -105,7 +105,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -IncrementalRunName
@@ -137,7 +136,6 @@ Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboardsForTenant.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboardsForTenant.md
index 2d00aa0690..f7b62579a6 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboardsForTenant.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-OriginalFluidWhiteboardsForTenant.md
@@ -146,7 +146,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -IncrementalRunName
@@ -167,7 +166,6 @@ Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-Whiteboard.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-Whiteboard.md
index e892faa107..03e8645122 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-Whiteboard.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-Whiteboard.md
@@ -81,7 +81,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -UserId
@@ -99,7 +98,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhiteboardId
@@ -115,7 +113,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardOwners.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardOwners.md
index 914f8e16ae..91c7256f50 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardOwners.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardOwners.md
@@ -65,7 +65,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -ForceAuthPrompt
@@ -82,7 +81,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -Geography
@@ -100,7 +98,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardSettings.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardSettings.md
index 6e268b8fb1..1d6374671b 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardSettings.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardSettings.md
@@ -66,7 +66,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenant.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenant.md
index 09044f3041..99e434215a 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenant.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenant.md
@@ -102,7 +102,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -Geography
@@ -120,7 +119,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -IncrementalRunName
@@ -144,7 +142,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenantMigrated.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenantMigrated.md
index c7e2391a94..c9f0cb28ad 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenantMigrated.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsForTenantMigrated.md
@@ -144,7 +144,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -IncrementalRunName
@@ -165,7 +164,6 @@ Position: 0
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsMigrated.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsMigrated.md
index f7e2b24f2a..e9d9d7ec5d 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsMigrated.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Get-WhiteboardsMigrated.md
@@ -106,7 +106,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -IncrementalRunName
@@ -139,7 +138,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Invoke-TransferAllWhiteboards.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Invoke-TransferAllWhiteboards.md
index a5f23e4a0f..3ccd15a974 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Invoke-TransferAllWhiteboards.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Invoke-TransferAllWhiteboards.md
@@ -60,7 +60,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -NewOwnerId
@@ -77,7 +76,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -OldOwnerId
@@ -94,7 +92,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -Confirm
@@ -111,7 +108,6 @@ Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhatIf
@@ -128,7 +124,6 @@ Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Remove-Whiteboard.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Remove-Whiteboard.md
index 7409007747..e2032059a9 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Remove-Whiteboard.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Remove-Whiteboard.md
@@ -54,7 +54,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -UserId
@@ -71,7 +70,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhiteboardId
@@ -88,7 +86,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Restore-Whiteboard.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Restore-Whiteboard.md
index 63ace067d7..79b8d3c8f8 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Restore-Whiteboard.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Restore-Whiteboard.md
@@ -54,7 +54,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhiteboardId
@@ -71,7 +70,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardOwner.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardOwner.md
index 8f9f93835e..95090b1463 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardOwner.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardOwner.md
@@ -52,7 +52,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -NewOwnerId
@@ -69,7 +68,6 @@ Position: 3
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -OldOwnerId
@@ -86,7 +84,6 @@ Position: 2
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhiteboardId
@@ -103,7 +100,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -Confirm
@@ -120,7 +116,6 @@ Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -WhatIf
@@ -137,7 +132,6 @@ Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### CommonParameters
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardSettings.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardSettings.md
index 6b468841b2..f7f81517de 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardSettings.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/Set-WhiteboardSettings.md
@@ -53,7 +53,6 @@ Position: Named
 Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 ### -Settings
@@ -71,7 +70,6 @@ Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
-Applicable: Microsoft Whiteboard
 ```
 
 
diff --git a/whiteboard/whiteboard-ps/WhiteboardAdmin/WhiteboardAdmin.md b/whiteboard/whiteboard-ps/WhiteboardAdmin/WhiteboardAdmin.md
index f6f901d7ef..ff0f11e89b 100644
--- a/whiteboard/whiteboard-ps/WhiteboardAdmin/WhiteboardAdmin.md
+++ b/whiteboard/whiteboard-ps/WhiteboardAdmin/WhiteboardAdmin.md
@@ -35,7 +35,7 @@ described here is for Whiteboard content stored in Azure.
 > 3. In **User profiles**, select **Open** > **Manage User profiles** > **Search user** >
 >    **Manage site collection owners** > **Add Admin as Site Collection Administrator**.
 
-## WhiteboardAdmin cmdlets
+## WhiteboardAdmin Cmdlets
 
 ### [Get-OriginalFluidWhiteboards](Get-OriginalFluidWhiteboards.md)
 Gets one or more whiteboards that are originally created as Fluid whiteboards, directly into users OneDrive and return them as objects.