diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index fb6dff2589..f6d4502671 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,9 +9,9 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.WebSockets.Client": { },
-            "Microsoft.AspNet.WebSockets.Protocol": { },
-            "Microsoft.AspNet.WebSockets.Server": { }
+            "Microsoft.AspNetCore.WebSockets.Client": { },
+            "Microsoft.AspNetCore.WebSockets.Protocol": { },
+            "Microsoft.AspNetCore.WebSockets.Server": { }
         }
     },
     "Default": { // Ru les to run for packages not listed in any other set.
diff --git a/WebSockets.sln b/WebSockets.sln
index dbe1d22aaf..a7b3697b81 100644
--- a/WebSockets.sln
+++ b/WebSockets.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22216.0
@@ -11,17 +11,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C45106D0-7
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9E55FC5B-FD9C-4266-AB24-F3AA649D7C8B}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Protocol", "src\Microsoft.AspNet.WebSockets.Protocol\Microsoft.AspNet.WebSockets.Protocol.xproj", "{E0C10DEC-3339-4A47-85BC-3100C5D34AD4}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Protocol", "src\Microsoft.AspNetCore.WebSockets.Protocol\Microsoft.AspNetCore.WebSockets.Protocol.xproj", "{E0C10DEC-3339-4A47-85BC-3100C5D34AD4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Protocol.Test", "test\Microsoft.AspNet.WebSockets.Protocol.Test\Microsoft.AspNet.WebSockets.Protocol.Test.xproj", "{62A07A24-4D06-4DDA-B6BF-02D0C9CB7D32}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Protocol.Test", "test\Microsoft.AspNetCore.WebSockets.Protocol.Test\Microsoft.AspNetCore.WebSockets.Protocol.Test.xproj", "{62A07A24-4D06-4DDA-B6BF-02D0C9CB7D32}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestClient", "test\TestClient\TestClient.xproj", "{8C8EAC01-DC49-4C5E-B348-E4E46FE675F9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client", "src\Microsoft.AspNet.WebSockets.Client\Microsoft.AspNet.WebSockets.Client.xproj", "{4A1C4875-AE21-4A78-979A-F0E4DF5EB518}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Client", "src\Microsoft.AspNetCore.WebSockets.Client\Microsoft.AspNetCore.WebSockets.Client.xproj", "{4A1C4875-AE21-4A78-979A-F0E4DF5EB518}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client.Test", "test\Microsoft.AspNet.WebSockets.Client.Test\Microsoft.AspNet.WebSockets.Client.Test.xproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Client.Test", "test\Microsoft.AspNetCore.WebSockets.Client.Test\Microsoft.AspNetCore.WebSockets.Client.Test.xproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Server", "src\Microsoft.AspNet.WebSockets.Server\Microsoft.AspNet.WebSockets.Server.xproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebSockets.Server", "src\Microsoft.AspNetCore.WebSockets.Server\Microsoft.AspNetCore.WebSockets.Server.xproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86E1ADA2-631C-484F-906C-2D0BCF628E65}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs b/src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
index 7cc48a9baf..941c75c63b 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.WebSockets.Client
+namespace Microsoft.AspNetCore.WebSockets.Client
 {
     public static class Constants
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs b/src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
index 3ba9c3963f..8e924734f1 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
@@ -9,9 +9,9 @@ using System.Net;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.WebSockets.Protocol;
+using Microsoft.AspNetCore.WebSockets.Protocol;
 
-namespace Microsoft.AspNet.WebSockets.Client
+namespace Microsoft.AspNetCore.WebSockets.Client
 {
     public class WebSocketClient
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Client/project.json b/src/Microsoft.AspNetCore.WebSockets.Client/project.json
index 87056bc28c..71bae93c68 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Client/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Client/project.json
@@ -10,7 +10,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"
+    "Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*"
   },
   "frameworks": {
     "net451": { }
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
index f7e803ab08..56baf28d2f 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.WebSockets.Protocol
+namespace Microsoft.AspNetCore.WebSockets.Protocol
 {
     // https://tools.ietf.org/html/rfc6455
     public class CommonWebSocket : WebSocket
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
index 80a3bf8983..56e125afc2 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.WebSockets.Protocol
+namespace Microsoft.AspNetCore.WebSockets.Protocol
 {
     public static class Constants
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
index 749bf13d68..50fe6060b4 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
@@ -8,7 +8,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.WebSockets.Protocol
+namespace Microsoft.AspNetCore.WebSockets.Protocol
 {
     public class FrameHeader
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
index 478b61bfe5..8afe0a9ce5 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Microsoft.AspNet.WebSockets.Protocol
+namespace Microsoft.AspNetCore.WebSockets.Protocol
 {
     public static class HandshakeHelpers
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
index 385f4003a0..c8ec5768c2 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Net.WebSockets;
 
-namespace Microsoft.AspNet.WebSockets.Protocol
+namespace Microsoft.AspNetCore.WebSockets.Protocol
 {
     public static class Utilities
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs b/src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
index 6c6fa97f16..7d0ba9b945 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.WebSockets.Server
+namespace Microsoft.AspNetCore.WebSockets.Server
 {
     public class ExtendedWebSocketAcceptContext : WebSocketAcceptContext
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
index 8329d0789e..9bfccfd5c1 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
@@ -6,13 +6,13 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.WebSockets.Protocol;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.WebSockets.Protocol;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.WebSockets.Server
+namespace Microsoft.AspNetCore.WebSockets.Server
 {
     public class WebSocketMiddleware
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
index 8e71aab70a..32295ab5af 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.WebSockets.Server;
+using Microsoft.AspNetCore.WebSockets.Server;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public static class WebSocketMiddlewareExtensions
     {
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
index 69cfe2e177..d6603adf8a 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Configuration options for the WebSocketMiddleware
diff --git a/src/Microsoft.AspNetCore.WebSockets.Server/project.json b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
index 0c5563092e..df9dd72cdd 100644
--- a/src/Microsoft.AspNetCore.WebSockets.Server/project.json
+++ b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
@@ -10,8 +10,8 @@
     "url": "git://github.com/aspnet/websockets"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-    "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*"
   },
   "frameworks": {
diff --git a/test/AutobahnTestClient/Program.cs b/test/AutobahnTestClient/Program.cs
index 67df22e3ff..d6251c8b6f 100644
--- a/test/AutobahnTestClient/Program.cs
+++ b/test/AutobahnTestClient/Program.cs
@@ -6,7 +6,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.WebSockets.Client;
+using Microsoft.AspNetCore.WebSockets.Client;
 
 namespace AutobahnTestClient
 {
diff --git a/test/AutobahnTestClient/Project.json b/test/AutobahnTestClient/Project.json
index a671b8f913..592bb2db4a 100644
--- a/test/AutobahnTestClient/Project.json
+++ b/test/AutobahnTestClient/Project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.AspNet.WebSockets.Client": "1.0.0-*"
+        "Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*"
     },
     "commands": { 
         "run" : "run"
diff --git a/test/AutobahnTestClient/ReadMe.txt b/test/AutobahnTestClient/ReadMe.txt
index c49984330f..6da6360ccc 100644
--- a/test/AutobahnTestClient/ReadMe.txt
+++ b/test/AutobahnTestClient/ReadMe.txt
@@ -1,5 +1,5 @@
-This test server is for use in testing client side implementations of the WebSocekt protocol. It is currently implemented to test 
-Microsoft.AspNet.WebSockets.Client.WebSocketClient and System.Net.WebSockets.ClientWebSocket.
+This test server is for use in testing client side implementations of the WebSocekt protocol. It is currently implemented to test 
+Microsoft.AspNetCore.WebSockets.Client.WebSocketClient and System.Net.WebSockets.ClientWebSocket.
 
 See http://autobahn.ws/ to download and install the test framework.
 
diff --git a/test/AutobahnTestServer/Project.json b/test/AutobahnTestServer/Project.json
index ff0dac2eba..10188cf800 100644
--- a/test/AutobahnTestServer/Project.json
+++ b/test/AutobahnTestServer/Project.json
@@ -1,8 +1,8 @@
 {
   "exclude": "wwwroot/**/*",
   "dependencies": {
-    "Microsoft.AspNet.WebSockets.Server": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
+    "Microsoft.AspNetCore.WebSockets.Server": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/test/AutobahnTestServer/Startup.cs b/test/AutobahnTestServer/Startup.cs
index 5af6589de0..023d05ffaa 100644
--- a/test/AutobahnTestServer/Startup.cs
+++ b/test/AutobahnTestServer/Startup.cs
@@ -5,9 +5,9 @@ using System;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 
 namespace AutobahnTestServer
 {
diff --git a/test/AutobahnTestServer/hosting.json b/test/AutobahnTestServer/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/test/AutobahnTestServer/hosting.json
+++ b/test/AutobahnTestServer/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs b/test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
index 9f2a9b321e..d496873e16 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.WebSockets.Client.Test
+namespace Microsoft.AspNetCore.WebSockets.Client.Test
 {
     public class KestrelWebSocketHelpers
     {
@@ -47,7 +47,7 @@ namespace Microsoft.AspNet.WebSockets.Client.Test
 
             var host = new WebHostBuilder()
                 .UseConfiguration(config)
-                .UseServer("Microsoft.AspNet.Server.Kestrel")
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .Configure(startup)
                 .Build();
 
diff --git a/test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs b/test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
index 1d5ccf1f58..fe3e0d6852 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
@@ -6,10 +6,10 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNet.WebSockets.Client.Test
+namespace Microsoft.AspNetCore.WebSockets.Client.Test
 {
     public class WebSocketClientTests
     {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json b/test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
index 9ffd597ef0..228d842348 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
+++ b/test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
@@ -1,10 +1,10 @@
 {
     "dependencies": {
-        "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
-        "Microsoft.AspNet.WebSockets.Client": "1.0.0-*",
-        "Microsoft.AspNet.WebSockets.Server": "1.0.0-*",
-        "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-        "Microsoft.AspNet.Testing": "1.0.0-*",
+        "Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
+        "Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*",
+        "Microsoft.AspNetCore.WebSockets.Server": "1.0.0-*",
+        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+        "Microsoft.AspNetCore.Testing": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "frameworks": {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
index 9d49f8ec10..4a36510666 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.WebSockets.Protocol.Test
+namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
 {
     // This steam accepts writes from one side, buffers them internally, and returns the data via Reads
     // when requested on the other side.
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
index 09e87c660f..095029e5d8 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.WebSockets.Protocol.Test
+namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
 {
     // A duplex wrapper around a read and write stream.
     public class DuplexStream : Stream
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
index 2e5cc15d83..c0fe5dc66c 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.WebSockets.Protocol.Test
+namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
 {
     public class DuplexTests
     {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
index f42339a77f..10641f0dbd 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.WebSockets.Protocol.Test
+namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
 {
     public class Utf8ValidationTests
     {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
index 9f221f197b..0d69ed89f7 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.WebSockets.Protocol.Test
+namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
 {
     public class UtilitiesTests
     {
diff --git a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
index af40e33ade..263b03fb77 100644
--- a/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
+++ b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
+        "Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "frameworks": {
diff --git a/test/TestClient/Program.cs b/test/TestClient/Program.cs
index 37072d144d..7be260b81c 100644
--- a/test/TestClient/Program.cs
+++ b/test/TestClient/Program.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.WebSockets.Client;
+using Microsoft.AspNetCore.WebSockets.Client;
 
 namespace TestClient
 {
diff --git a/test/TestClient/project.json b/test/TestClient/project.json
index 2c1c4ae5e9..1b6b600c9d 100644
--- a/test/TestClient/project.json
+++ b/test/TestClient/project.json
@@ -3,8 +3,8 @@
         "TestClient": "TestClient"
     },
     "dependencies": {
-        "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*",
-        "Microsoft.AspNet.WebSockets.Client": "1.0.0-*"
+        "Microsoft.AspNetCore.WebSockets.Protocol": "1.0.0-*",
+        "Microsoft.AspNetCore.WebSockets.Client": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { }