diff --git a/WebSockets.sln b/WebSockets.sln
index 6b9df02739..dbe1d22aaf 100644
--- a/WebSockets.sln
+++ b/WebSockets.sln
@@ -11,26 +11,26 @@ 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.kproj", "{E0C10DEC-3339-4A47-85BC-3100C5D34AD4}"
+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}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Protocol.Test", "test\Microsoft.AspNet.WebSockets.Protocol.Test\Microsoft.AspNet.WebSockets.Protocol.Test.kproj", "{62A07A24-4D06-4DDA-B6BF-02D0C9CB7D32}"
+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}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestClient", "test\TestClient\TestClient.kproj", "{8C8EAC01-DC49-4C5E-B348-E4E46FE675F9}"
+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.kproj", "{4A1C4875-AE21-4A78-979A-F0E4DF5EB518}"
+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}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Client.Test", "test\Microsoft.AspNet.WebSockets.Client.Test\Microsoft.AspNet.WebSockets.Client.Test.kproj", "{6604D154-817F-4BC5-BE95-FF7E851179D9}"
+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}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Server", "src\Microsoft.AspNet.WebSockets.Server\Microsoft.AspNet.WebSockets.Server.kproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}"
+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}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86E1ADA2-631C-484F-906C-2D0BCF628E65}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutobahnTestServer", "test\AutobahnTestServer\AutobahnTestServer.kproj", "{C03C43FE-9201-48A6-B434-AD67EF627D67}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutobahnTestServer", "test\AutobahnTestServer\AutobahnTestServer.xproj", "{C03C43FE-9201-48A6-B434-AD67EF627D67}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutobahnTestClient", "test\AutobahnTestClient\AutobahnTestClient.kproj", "{BC4D2BB1-05A8-4816-8BC1-3A664F09EE32}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutobahnTestClient", "test\AutobahnTestClient\AutobahnTestClient.xproj", "{BC4D2BB1-05A8-4816-8BC1-3A664F09EE32}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.kproj b/src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.kproj
rename to src/Microsoft.AspNet.WebSockets.Client/Microsoft.AspNet.WebSockets.Client.xproj
diff --git a/src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.kproj b/src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.kproj
rename to src/Microsoft.AspNet.WebSockets.Protocol/Microsoft.AspNet.WebSockets.Protocol.xproj
diff --git a/src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.kproj b/src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.xproj
similarity index 100%
rename from src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.kproj
rename to src/Microsoft.AspNet.WebSockets.Server/Microsoft.AspNet.WebSockets.Server.xproj
diff --git a/test/AutobahnTestClient/AutobahnTestClient.kproj b/test/AutobahnTestClient/AutobahnTestClient.xproj
similarity index 100%
rename from test/AutobahnTestClient/AutobahnTestClient.kproj
rename to test/AutobahnTestClient/AutobahnTestClient.xproj
diff --git a/test/AutobahnTestServer/AutobahnTestServer.kproj b/test/AutobahnTestServer/AutobahnTestServer.xproj
similarity index 100%
rename from test/AutobahnTestServer/AutobahnTestServer.kproj
rename to test/AutobahnTestServer/AutobahnTestServer.xproj
diff --git a/test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.kproj b/test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.kproj
rename to test/Microsoft.AspNet.WebSockets.Client.Test/Microsoft.AspNet.WebSockets.Client.Test.xproj
diff --git a/test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.kproj b/test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.kproj
rename to test/Microsoft.AspNet.WebSockets.Protocol.Test/Microsoft.AspNet.WebSockets.Protocol.Test.xproj
diff --git a/test/TestClient/TestClient.kproj b/test/TestClient/TestClient.xproj
similarity index 100%
rename from test/TestClient/TestClient.kproj
rename to test/TestClient/TestClient.xproj