diff --git a/eng/docgeneration/service-mapper.json b/eng/docgeneration/service-mapper.json
index 7483fa7316fe..ac782c08d101 100644
--- a/eng/docgeneration/service-mapper.json
+++ b/eng/docgeneration/service-mapper.json
@@ -4,6 +4,7 @@
   "apimanagement": "Api Management",
   "appconfiguration": "App Configuration",
   "applicationinsights": "Application Insights",
+  "appplatform": "App Platform",
   "appservice": "App Service",
   "authorization": "Authorization",
   "automation": "Automation",
@@ -23,11 +24,14 @@
   "core": "Core",
   "cosmos": "Cosmos",
   "cosmosdb": "Cosmos DB",
+  "costmanagement":"Cost Management",
   "customer-insights": "Customer Insights",
   "databox": "Data Box",
   "databricks": "Databricks",
   "datacatalog": "Data Catalog",
   "datafactory": "Data Factory",
+  "datalakeanalytics":"Data Lake Analytics",
+  "datalakestore":"Data Lake Store",
   "datamigration": "Database Migration",
   "deploymentmanager": "Deployment Manager",
   "deviceprovisioningservices": "Device Provisioning Services",
@@ -58,6 +62,7 @@
   "machinelearningcompute": "Machine Learning Compute",
   "machinelearningexperimentation": "Machine Learning Experimentation",
   "machinelearningservices": "Machine Learning Services",
+  "maintenance": "Maintenance",
   "managedapplications": "Managed Applications",
   "managementgroups": "Management Groups",
   "managementpartner": "Management Partner",
@@ -83,8 +88,8 @@
   "powerbiembedded": "PowerBI Embedded",
   "privatedns": "Private DNS",
   "recoveryservices": "Recovery Services",
-  "recoveryservicesbackup": "Recovery Services Backup",
-  "recoveryservicessiterecovery": "Recovery Services Site Recovery",
+  "recoveryservices.backup": "Recovery Services Backup",
+  "recoveryservices.siterecovery": "Recovery Services Site Recovery",
   "redis": "Redis",
   "relay": "Relay",
   "reservations": "Reservations",
@@ -102,6 +107,7 @@
   "sql": "SQL",
   "sqlvirtualmachine": "SQL Virtual Machine",
   "storage": "Storage",
+  "storagecache": "Storage Cache",
   "storageimportexport": "Storage Import Export",
   "storagesync": "Storage Sync",
   "storsimple1200series": "Storsimple 1200 Series",
diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml
index a68b14eb724e..b2b466605894 100644
--- a/eng/pipelines/docindex.yml
+++ b/eng/pipelines/docindex.yml
@@ -160,7 +160,7 @@ jobs:
                 if ($mgmtArr.Count -gt 0) 
                 {
                     Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "# Management Libraries"
-                    foreach($lib in $clientArr) 
+                    foreach($lib in $mgmtArr) 
                     {
                         Write-Output "Write $($lib) to $($Dir.Name).md"
                         Add-Content -Path "$($YmlPath)/$($Dir.Name).md" -Value "#### $lib"