diff --git a/src/Microsoft.AspNet.WebSockets.Client/Constants.cs b/src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/Constants.cs
rename to src/Microsoft.AspNetCore.WebSockets.Client/Constants.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.xproj b/src/Microsoft.AspNetCore.WebSockets.Client/Microsoft.AspNetCore.WebSockets.Client.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.xproj
rename to src/Microsoft.AspNetCore.WebSockets.Client/Microsoft.AspNetCore.WebSockets.Client.xproj
diff --git a/src/Microsoft.AspNet.WebSockets.Client/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.WebSockets.Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.WebSockets.Client/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Client/WebSocketClient.cs b/src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/WebSocketClient.cs
rename to src/Microsoft.AspNetCore.WebSockets.Client/WebSocketClient.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Client/project.json b/src/Microsoft.AspNetCore.WebSockets.Client/project.json
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/project.json
rename to src/Microsoft.AspNetCore.WebSockets.Client/project.json
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/CommonWebSocket.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/CommonWebSocket.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/CommonWebSocket.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/Constants.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/Constants.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/Constants.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/FrameHeader.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/FrameHeader.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/FrameHeader.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/HandshakeHelpers.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/HandshakeHelpers.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/HandshakeHelpers.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.xproj b/src/Microsoft.AspNetCore.WebSockets.Protocol/Microsoft.AspNetCore.WebSockets.Protocol.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.xproj
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/Microsoft.AspNetCore.WebSockets.Protocol.xproj
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/Utilities.cs b/src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/Utilities.cs
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/Utilities.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/project.json b/src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/project.json
rename to src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
diff --git a/src/Microsoft.AspNet.WebSockets.Server/ExtendedWebSocketAcceptContext.cs b/src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
rename to src/Microsoft.AspNetCore.WebSockets.Server/ExtendedWebSocketAcceptContext.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.xproj b/src/Microsoft.AspNetCore.WebSockets.Server/Microsoft.AspNetCore.WebSockets.Server.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.xproj
rename to src/Microsoft.AspNetCore.WebSockets.Server/Microsoft.AspNetCore.WebSockets.Server.xproj
diff --git a/src/Microsoft.AspNet.WebSockets.Server/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.WebSockets.Server/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.WebSockets.Server/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddleware.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddleware.cs
rename to src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddleware.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs
rename to src/Microsoft.AspNetCore.WebSockets.Server/WebSocketMiddlewareExtensions.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Server/WebSocketOptions.cs b/src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/WebSocketOptions.cs
rename to src/Microsoft.AspNetCore.WebSockets.Server/WebSocketOptions.cs
diff --git a/src/Microsoft.AspNet.WebSockets.Server/project.json b/src/Microsoft.AspNetCore.WebSockets.Server/project.json
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/project.json
rename to src/Microsoft.AspNetCore.WebSockets.Server/project.json
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs b/test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
rename to test/Microsoft.AspNetCore.WebSockets.Client.Test/KestrelWebSocketHelpers.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.xproj b/test/Microsoft.AspNetCore.WebSockets.Client.Test/Microsoft.AspNetCore.WebSockets.Client.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.xproj
rename to test/Microsoft.AspNetCore.WebSockets.Client.Test/Microsoft.AspNetCore.WebSockets.Client.Test.xproj
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/WebSocketClientTests.cs b/test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Client.Test/WebSocketClientTests.cs
rename to test/Microsoft.AspNetCore.WebSockets.Client.Test/WebSocketClientTests.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/project.json b/test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Client.Test/project.json
rename to test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/BufferStream.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/BufferStream.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/DuplexStream.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/DuplexStream.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/DuplexTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/DuplexTests.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexTests.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.xproj b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Microsoft.AspNetCore.WebSockets.Protocol.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.xproj
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Microsoft.AspNetCore.WebSockets.Protocol.Test.xproj
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.Net.WebSockets.Test.csproj b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Microsoft.Net.WebSockets.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.Net.WebSockets.Test.csproj
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Microsoft.Net.WebSockets.Test.csproj
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/Properties/AssemblyInfo.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/Utf8ValidationTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/Utf8ValidationTests.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/Utf8ValidationTests.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/UtilitiesTests.cs b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/UtilitiesTests.cs
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/UtilitiesTests.cs
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/project.json b/test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/project.json
rename to test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json