diff --git a/src/SourceLink.GitWeb/GetSourceLinkUrl.cs b/src/SourceLink.GitWeb/GetSourceLinkUrl.cs
index a971fc8a..7b671182 100644
--- a/src/SourceLink.GitWeb/GetSourceLinkUrl.cs
+++ b/src/SourceLink.GitWeb/GetSourceLinkUrl.cs
@@ -20,15 +20,14 @@ public sealed class GetSourceLinkUrl : GetSourceLinkUrlGitTask
 
         protected override string BuildSourceLinkUrl(Uri contentUri, Uri gitUri, string relativeUrl, string revisionId, ITaskItem hostItem)
         {
-            var trimLeadingSlash = relativeUrl.TrimStart('/', '\\');
+            var trimLeadingSlash = relativeUrl.TrimStart('/');
             var trimmedContentUrl = contentUri.ToString().TrimEnd('/', '\\');
 
-            /* p = project/path
-             * a = action
-             * hb = SHA/revision
-             * f = repo file path
-             */
-            var gitwebRawUrl = $"{trimmedContentUrl}/?p={trimLeadingSlash}.git;a=blob_plain;hb={revisionId};f=*";
+            // p = project/path
+            // a = action
+            // hb = SHA/revision
+            // f = repo file path
+            var gitwebRawUrl = UriUtilities.Combine(trimmedContentUrl, $"?p={trimLeadingSlash}.git;a=blob_plain;hb={revisionId};f=*");
             return gitwebRawUrl;
         }
     }
diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec
index 3df879b5..5acaea90 100644
--- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec
+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec
@@ -9,9 +9,9 @@
   </metadata>
   <files>
     $CommonFileElements$
-    <file src="**\SourceLink.GitWeb.*" target="tools" />
+    <file src="**\Microsoft.SourceLink.GitWeb.*" target="tools" />
 
     <file src="$ProjectDirectory$\build\*.*" target="build" />
     <file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/SourceLink.GitWeb/build/SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets
similarity index 100%
rename from src/SourceLink.GitWeb/build/SourceLink.GitWeb.targets
rename to src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets
diff --git a/src/SourceLink.GitWeb/buildMultiTargeting/SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets
similarity index 100%
rename from src/SourceLink.GitWeb/buildMultiTargeting/SourceLink.GitWeb.targets
rename to src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets