diff --git a/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs b/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs
index 84a3376..1e5004c 100644
--- a/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs
+++ b/src/Microsoft.Content.Build.Code2Yaml.Steps/GenerateServiceMappingFile.cs
@@ -108,7 +108,7 @@ group v.Value by v.Key.Category into g0
                                                name = service,
                                                href = hrefAndType.Item1,
                                                landingPageType = hrefAndType.Item2,
-                                               uid = "azure.java.sdk.landingpage.services." + service,
+                                               uid = "azure.java.sdk.landingpage.services." + FormatUid(service),
                                                items = new ServiceMapping(from item in pair.Value
                                                                           let category = item.Category
                                                                           let chrefAndType = GetHrefAndType(hrefMapping, GetKey(service, category))
@@ -117,7 +117,7 @@ group v.Value by v.Key.Category into g0
                                                                               name = item.Category,
                                                                               href = chrefAndType.Item1,
                                                                               landingPageType = chrefAndType.Item2,
-                                                                              uid = "azure.java.sdk.landingpage.services." + service.Replace(" ", "").ToLower() + "." + category,
+                                                                              uid = "azure.java.sdk.landingpage.services." + FormatUid(service) + "." + category,
                                                                               children = item.Uids.ToList()
                                                                           })
                                            }).OrderBy(s => s.name))
@@ -185,5 +185,10 @@ private static string GetKey(string service, string category)
         {
             return service + "." + category;
         }
+
+        private static string FormatUid(string service)
+        {
+            return service.Replace(" ", "").ToLower();
+        }
     }
 }