diff --git a/WebListener.sln b/HttpSysServer.sln
similarity index 100%
rename from WebListener.sln
rename to HttpSysServer.sln
diff --git a/README.md b/README.md
index 3f73ae3aaf..d97493f457 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ HttpSysServer
 
 | AppVeyor | Travis |
 | ---- | ----
-| [![AppVeyor](https://ci.appveyor.com/api/projects/status/413hlt87c3p24on8/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/WebListener/branch/dev) | [![Travis](https://travis-ci.org/aspnet/WebListener.svg?branch=dev)](https://travis-ci.org/aspnet/WebListener) |
+| [![AppVeyor](https://ci.appveyor.com/api/projects/status/413hlt87c3p24on8/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/WebListener/branch/dev) | [![Travis](https://travis-ci.org/aspnet/HttpSysServer.svg?branch=dev)](https://travis-ci.org/aspnet/HttpSysServer) |
 
 This repo contains a web server for ASP.NET Core based on the Windows [Http Server API](https://msdn.microsoft.com/en-us/library/windows/desktop/aa364510.aspx).
 
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
index fd1dd9da04..9547a2ab3e 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         IHttpResponseFeature,
         IHttpSendFileFeature,
         ITlsConnectionFeature,
-        // ITlsTokenBindingFeature, TODO: https://github.com/aspnet/WebListener/issues/231
+        // ITlsTokenBindingFeature, TODO: https://github.com/aspnet/HttpSysServer/issues/231
         IHttpBufferingFeature,
         IHttpRequestLifetimeFeature,
         IHttpAuthenticationFeature,
@@ -332,7 +332,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         {
             return Request.IsHttps ? this : null;
         }
-        /* TODO: https://github.com/aspnet/WebListener/issues/231
+        /* TODO: https://github.com/aspnet/HttpSysServer/issues/231
         byte[] ITlsTokenBindingFeature.GetProvidedTokenBindingId() => Request.GetProvidedTokenBindingId();
 
         byte[] ITlsTokenBindingFeature.GetReferredTokenBindingId() => Request.GetReferredTokenBindingId();
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/NativeInterop/TokenBindingUtil.cs b/src/Microsoft.AspNetCore.Server.HttpSys/NativeInterop/TokenBindingUtil.cs
index 4c40acb935..ddb11c5240 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/NativeInterop/TokenBindingUtil.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/NativeInterop/TokenBindingUtil.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
     /// <summary>
     /// Contains helpers for dealing with TLS token binding.
     /// </summary>
-    // TODO: https://github.com/aspnet/WebListener/issues/231
+    // TODO: https://github.com/aspnet/HttpSysServer/issues/231
     internal unsafe static class TokenBindingUtil
     {
         private static byte[] ExtractIdentifierBlob(TOKENBINDING_RESULT_DATA* pTokenBindingResultData)
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Request.cs b/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Request.cs
index 78ed055204..06a57f89ba 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Request.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Request.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         private NativeRequestContext _nativeRequestContext;
 
         private X509Certificate2 _clientCert;
-        // TODO: https://github.com/aspnet/WebListener/issues/231
+        // TODO: https://github.com/aspnet/HttpSysServer/issues/231
         // private byte[] _providedTokenBindingId;
         // private byte[] _referredTokenBindingId;
 
@@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
 
             User = nativeRequestContext.GetUser();
 
-            // GetTlsTokenBindingInfo(); TODO: https://github.com/aspnet/WebListener/issues/231
+            // GetTlsTokenBindingInfo(); TODO: https://github.com/aspnet/HttpSysServer/issues/231
 
             // Finished directly accessing the HTTP_REQUEST structure.
             _nativeRequestContext.ReleasePins();
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Response.cs b/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Response.cs
index 31846b6541..ec766cd8ae 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Response.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/RequestProcessing/Response.cs
@@ -375,7 +375,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 {
                     // A single write with the whole content-length. Http.Sys will set the content-length for us in this scenario.
                     // If we don't remove it then range requests served from cache will have two.
-                    // https://github.com/aspnet/WebListener/issues/167
+                    // https://github.com/aspnet/HttpSysServer/issues/167
                     ContentLength = null;
                 }
             }
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/StandardFeatureCollection.cs b/src/Microsoft.AspNetCore.Server.HttpSys/StandardFeatureCollection.cs
index 8af2ddb7ba..710286fc9d 100644
--- a/src/Microsoft.AspNetCore.Server.HttpSys/StandardFeatureCollection.cs
+++ b/src/Microsoft.AspNetCore.Server.HttpSys/StandardFeatureCollection.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
             { typeof(IHttpResponseFeature), _identityFunc },
             { typeof(IHttpSendFileFeature), _identityFunc },
             { typeof(ITlsConnectionFeature), ctx => ctx.GetTlsConnectionFeature() },
-            // { typeof(ITlsTokenBindingFeature), ctx => ctx.GetTlsTokenBindingFeature() }, TODO: https://github.com/aspnet/WebListener/issues/231
+            // { typeof(ITlsTokenBindingFeature), ctx => ctx.GetTlsTokenBindingFeature() }, TODO: https://github.com/aspnet/HttpSysServer/issues/231
             { typeof(IHttpBufferingFeature), _identityFunc },
             { typeof(IHttpRequestLifetimeFeature), _identityFunc },
             { typeof(IHttpUpgradeFeature), _identityFunc },
diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/WebHostBuilderWebListenerExtensions.cs b/src/Microsoft.AspNetCore.Server.HttpSys/WebHostBuilderHttpSysExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.HttpSys/WebHostBuilderWebListenerExtensions.cs
rename to src/Microsoft.AspNetCore.Server.HttpSys/WebHostBuilderHttpSysExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs
index fa7705760e..18696e05dd 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs
@@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
             }
         }
 
-        [ConditionalFact(Skip = "https://github.com/aspnet/WebListener/issues/263")]
+        [ConditionalFact(Skip = "https://github.com/aspnet/HttpSysServer/issues/263")]
         public async Task ResponseBody_WriteContentLengthTooMuchWritten_Throws()
         {
             string address;
@@ -510,7 +510,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
             }
         }
 
-        [ConditionalFact(Skip = "https://github.com/aspnet/WebListener/issues/263")]
+        [ConditionalFact(Skip = "https://github.com/aspnet/HttpSysServer/issues/263")]
         public async Task ResponseBodyWriteExceptions_ClientDisconnectsBeforeSecondWriteAsync_WriteThrows()
         {
             string address;
diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
index 51967e9699..7a2e861b13 100644
--- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
+++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs
@@ -504,7 +504,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
             }
         }
 
-        [ConditionalFact(Skip = "Tests hanging: https://github.com/aspnet/WebListener/issues/270")]
+        [ConditionalFact(Skip = "Tests hanging: https://github.com/aspnet/HttpSysServer/issues/270")]
         public async Task ResponseSendFileExceptions_ClientDisconnectsBeforeSecondSend_SendThrows()
         {
             string address;