diff --git a/_buildApi/BuildAPI/docfx-tmpl/src/toc.extension.js b/_buildApi/BuildAPI/docfx-tmpl/src/toc.extension.js
index 9c917ab..5b87203 100644
--- a/_buildApi/BuildAPI/docfx-tmpl/src/toc.extension.js
+++ b/_buildApi/BuildAPI/docfx-tmpl/src/toc.extension.js
@@ -18,7 +18,7 @@ exports.postTransform = function (model) {
         var item = nodes.pop();
 
         if (item.topicHref) {
-            item.topicHref = item.topicHref.replace(/.html$/i,"");
+            item.topicHref = item.topicHref.replace(/\.html$/i,"");
         }
 
         if (!!item.items) {
diff --git a/_buildApi/BuildApiReference.proj b/_buildApi/BuildApiReference.proj
index a65ab98..1f65c12 100644
--- a/_buildApi/BuildApiReference.proj
+++ b/_buildApi/BuildApiReference.proj
@@ -13,6 +13,7 @@
       RestoreNugetAPISolution;
       BuildAPISolution;
       ProcessSitemap;
+      ProcessHtmlFiles;
       DeleteDocFxFavicon;
       CopyAPIHtmlFilesToSiteFolder
     </BuildApiReferenceDependsOn>
@@ -145,11 +146,20 @@
     <Message Text="DEBUG INFO: SitemapFile=$(SitemapFile)" />
 
     <FileUpdate Files="$(SitemapFile)" Regex="(&lt;lastmod&gt;)(\d{4}-\d{2}-\d{2})(.*?)(&lt;\/lastmod&gt;)" ReplacementText="$1$2$4" />
+    <FileUpdate Files="$(SitemapFile)" Regex="\.html(&lt;/loc&gt;)" ReplacementText="$1" />
 
     <Copy SourceFiles='$(SitemapFile)' DestinationFolder='$(ApiOutputFolder)' />
 
   </Target>
 
+  <Target Name="ProcessHtmlFiles">
+    <ItemGroup>
+      <HtmlApiFiles Include="$(ApiOutputFolder)\*.html" />
+    </ItemGroup>
+    <FileUpdate Files="@(HtmlApiFiles)" Regex="href=&quot;([^&quot;]+)\.html([^&quot;]*)&quot;" ReplacementText="href=&quot;$1$2&quot;" />
+
+  </Target>
+
   <Target Name="CopyAPIHtmlFilesToSiteFolder">
 
     <ItemGroup>