diff --git a/NodeServices.sln b/NodeServices.sln
index 50c6f03..e8d88be 100644
--- a/NodeServices.sln
+++ b/NodeServices.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E6E88944-4800-40BA-8AF5-069EA3ADFEB8}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.NodeServices", "src\Microsoft.AspNet.NodeServices\Microsoft.AspNet.NodeServices.xproj", "{B0FA4175-8B29-4904-9780-28B3C24B0567}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.xproj", "{B0FA4175-8B29-4904-9780-28B3C24B0567}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ES2015Transpilation", "samples\misc\ES2015Transpilation\ES2015Transpilation.xproj", "{6D4BCDD6-7951-449B-BE55-CB7F014B7430}"
 EndProject
@@ -18,11 +18,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\angul
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactGrid", "samples\react\ReactGrid\ReactGrid.xproj", "{ABF90A5B-F4E0-438C-A6E4-9549FB43690B}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.AngularServices", "src\Microsoft.AspNet.AngularServices\Microsoft.AspNet.AngularServices.xproj", "{421807E6-B62C-417B-B901-46C5DEDAA8F1}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.AngularServices", "src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.xproj", "{421807E6-B62C-417B-B901-46C5DEDAA8F1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "src\Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.ReactServices", "src\Microsoft.AspNetCore.ReactServices\Microsoft.AspNetCore.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.SpaServices", "src\Microsoft.AspNet.SpaServices\Microsoft.AspNet.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.SpaServices", "src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{727E6D58-6830-4792-96C6-E138A33959FB}"
 EndProject
diff --git a/README.md b/README.md
index f6aea66..97162f3 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge
 
 ## What is this?
 
-This repo hosts sources for the `Microsoft.AspNet.AngularServices` and `Microsoft.AspNet.ReactServices` packages, along with samples and the underlying `Microsoft.AspNet.NodeServices` project.
+This repo hosts sources for the `Microsoft.AspNetCore.AngularServices` and `Microsoft.AspNetCore.ReactServices` packages, along with samples and the underlying `Microsoft.AspNetCore.NodeServices project`.
 
-#### `Microsoft.AspNet.AngularServices`
+#### `Microsoft.AspNetCore.AngularServices`
 
 This package provides facilities for developers building Angular 2 applications on ASP.NET.
 
@@ -20,7 +20,7 @@ A sample is included in this repo.
 
 We are also working with the Angular team to add support for other client+server features such as cache priming, so that the client-side SPA code does not need to wait for an initial set of ajax requests to complete - the necessary data can be bundled with the initial page. Another possible future feature would be helpers to emit a JSON representation of C# class model metadata, so some validation rules can transparently apply both on the server and the client.
 
-#### `Microsoft.AspNet.ReactServices`
+#### `Microsoft.AspNetCore.ReactServices`
 
 This package provides similar facilities for React applications on ASP.NET.
 
@@ -32,7 +32,7 @@ We are open to adding other client+server features that will make React develope
 
 Although we have finite resources and are currently focused on adding Angular 2 and React support, the architecture here is designed so that you can build your own server-side support for other client-side libraries and frameworks.
 
-The underlying `Microsoft.AspNet.NodeServices` package is a general-purpose way for ASP.NET applications (or .NET applications more generally) to interoperate with code running inside Node.js. That's how `AngularServices`/`ReactServices` server-side rendering works - those packages transparently spin up Node.js instances that can perform the server-side rendering. Any code that runs inside Node can efficiently be invoked from .NET via this package, which takes care of starting and stopping Node instances and manages the communication between .NET and Node.
+The underlying `Microsoft.AspNetCore.NodeServices` package is a general-purpose way for ASP.NET applications (or .NET applications more generally) to interoperate with code running inside Node.js. That's how `AngularServices`/`ReactServices` server-side rendering works - those packages transparently spin up Node.js instances that can perform the server-side rendering. Any code that runs inside Node can efficiently be invoked from .NET via this package, which takes care of starting and stopping Node instances and manages the communication between .NET and Node.
 
 ## Using AngularServices/ReactServices in your own projects
 
diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs
index 76bb747..c0dd205 100755
--- a/samples/angular/MusicStore/Startup.cs
+++ b/samples/angular/MusicStore/Startup.cs
@@ -36,10 +36,6 @@ namespace MusicStore
                     .AddEntityFrameworkStores<MusicStoreContext>()
                     .AddDefaultTokenProviders();
 
-            // Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
-            // You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
-            // services.AddWebApiConventions();
-
             // Configure Auth
             services.Configure<AuthorizationOptions>(options =>
             {
diff --git a/samples/angular/MusicStore/Views/_ViewImports.cshtml b/samples/angular/MusicStore/Views/_ViewImports.cshtml
index d5abf13..3e7a43a 100755
--- a/samples/angular/MusicStore/Views/_ViewImports.cshtml
+++ b/samples/angular/MusicStore/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
 @using MusicStore
-@using Microsoft.AspNet.AngularServices
+@using Microsoft.AspNetCore.AngularServices
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json
index b74d48a..b15a67e 100755
--- a/samples/angular/MusicStore/project.json
+++ b/samples/angular/MusicStore/project.json
@@ -22,11 +22,11 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.EntityFrameworkCore.SQLite": "1.0.0-*",
-    "Microsoft.AspNet.AngularServices": "1.0.0-*",
+    "Microsoft.AspNetCore.AngularServices": "1.0.0-*",
     "AutoMapper": "4.1.1"
   },
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
   "frameworks": {
     "netstandardapp1.5": {
diff --git a/samples/misc/ES2015Transpilation/Startup.cs b/samples/misc/ES2015Transpilation/Startup.cs
index 0156b83..7c6fbae 100755
--- a/samples/misc/ES2015Transpilation/Startup.cs
+++ b/samples/misc/ES2015Transpilation/Startup.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.NodeServices;
+using Microsoft.AspNetCore.NodeServices;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IO;
diff --git a/samples/misc/ES2015Transpilation/project.json b/samples/misc/ES2015Transpilation/project.json
index e01c5b2..eb224ae 100755
--- a/samples/misc/ES2015Transpilation/project.json
+++ b/samples/misc/ES2015Transpilation/project.json
@@ -20,7 +20,7 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.NodeServices": "1.0.0-*"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": {},
diff --git a/samples/misc/Webpack/Startup.cs b/samples/misc/Webpack/Startup.cs
index 443946f..15d11f6 100755
--- a/samples/misc/Webpack/Startup.cs
+++ b/samples/misc/Webpack/Startup.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IO;
diff --git a/samples/misc/Webpack/project.json b/samples/misc/Webpack/project.json
index 66cff29..4ad392e 100755
--- a/samples/misc/Webpack/project.json
+++ b/samples/misc/Webpack/project.json
@@ -20,11 +20,11 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.SpaServices": "1.0.0-*"
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/samples/react/MusicStore/Startup.cs b/samples/react/MusicStore/Startup.cs
index e5311f8..94e2e1d 100755
--- a/samples/react/MusicStore/Startup.cs
+++ b/samples/react/MusicStore/Startup.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Configuration;
@@ -37,10 +37,6 @@ namespace MusicStore
                     .AddEntityFrameworkStores<MusicStoreContext>()
                     .AddDefaultTokenProviders();
 
-            // Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
-            // You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
-            // services.AddWebApiConventions();
-
             // Configure Auth
             services.Configure<AuthorizationOptions>(options =>
             {
diff --git a/samples/react/MusicStore/Views/_ViewImports.cshtml b/samples/react/MusicStore/Views/_ViewImports.cshtml
index 191e162..1730292 100755
--- a/samples/react/MusicStore/Views/_ViewImports.cshtml
+++ b/samples/react/MusicStore/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using MusicStore
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/samples/react/MusicStore/project.json b/samples/react/MusicStore/project.json
index 9064551..6c1d18a 100755
--- a/samples/react/MusicStore/project.json
+++ b/samples/react/MusicStore/project.json
@@ -22,12 +22,12 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.EntityFrameworkCore.SQLite": "1.0.0-*",
-    "Microsoft.AspNet.ReactServices": "1.0.0-*",
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*",
     "AutoMapper": "4.1.1"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/samples/react/ReactGrid/Startup.cs b/samples/react/ReactGrid/Startup.cs
index 33149ca..1cb9501 100755
--- a/samples/react/ReactGrid/Startup.cs
+++ b/samples/react/ReactGrid/Startup.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
diff --git a/samples/react/ReactGrid/Views/_ViewImports.cshtml b/samples/react/ReactGrid/Views/_ViewImports.cshtml
index 5b5b5c3..3043884 100755
--- a/samples/react/ReactGrid/Views/_ViewImports.cshtml
+++ b/samples/react/ReactGrid/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using ReactExample
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json
index 5f9823a..5ea0489 100755
--- a/samples/react/ReactGrid/project.json
+++ b/samples/react/ReactGrid/project.json
@@ -16,10 +16,10 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.ReactServices": "1.0.0-*"
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
   },
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
   "frameworks": {
     "dnx451": {},
diff --git a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNet.AngularServices.xproj b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj
similarity index 93%
rename from src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNet.AngularServices.xproj
rename to src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj
index 82193b4..b037b32 100644
--- a/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNet.AngularServices.xproj
+++ b/src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>421807e6-b62c-417b-b901-46c5dedaa8f1</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.AngularServices</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.AngularServices</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs
index b802919..48fdeca 100644
--- a/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs
+++ b/src/Microsoft.AspNetCore.AngularServices/PrimeCacheHelper.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.AngularServices {
+namespace Microsoft.AspNetCore.AngularServices {
     public static class PrimeCacheHelper {
         public static async Task<HtmlString> PrimeCache(this IHtmlHelper html, string url) {
             // TODO: Consider deduplicating the PrimeCache calls (that is, if there are multiple requests to precache
diff --git a/src/Microsoft.AspNetCore.AngularServices/npm/package.json b/src/Microsoft.AspNetCore.AngularServices/npm/package.json
index 471f8c2..8f7c19e 100644
--- a/src/Microsoft.AspNetCore.AngularServices/npm/package.json
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/package.json
@@ -7,10 +7,6 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "prepublish": "tsd install && tsc && node build.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/NodeServices/tree/master/Microsoft.AspNet.AngularServices"
-  },
   "typings": "dist/Exports",
   "author": "Microsoft",
   "license": "Apache-2.0",
diff --git a/src/Microsoft.AspNetCore.AngularServices/project.json b/src/Microsoft.AspNetCore.AngularServices/project.json
index 137ef58..7cafda3 100644
--- a/src/Microsoft.AspNetCore.AngularServices/project.json
+++ b/src/Microsoft.AspNetCore.AngularServices/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "description": "Helpers for building Angular 2 applications on ASP.NET 5.",
+  "description": "Helpers for building Angular 2 applications on ASP.NET Core.",
   "compilationOptions": {
     "keyFile": "../../tools/Key.snk"
   },
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/nodeservices"
   },
   "tooling": {
-    "defaultNamespace": "Microsoft.AspNet.AngularServices"
+    "defaultNamespace": "Microsoft.AspNetCore.AngularServices"
   },
   "frameworks": {
     "dnx451": {},
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
-    "Microsoft.AspNet.NodeServices": "1.0.0-*",
-    "Microsoft.AspNet.SpaServices": "1.0.0-*"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*",
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
   }
 }
diff --git a/src/Microsoft.AspNetCore.NodeServices/Configuration.cs b/src/Microsoft.AspNetCore.NodeServices/Configuration.cs
index 415ca5d..5d85d07 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Configuration.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     public static class Configuration {
         private readonly static string[] defaultWatchFileExtensions = new[] { ".js", ".jsx", ".ts", ".tsx", ".json", ".html" };
         private readonly static NodeServicesOptions defaultOptions = new NodeServicesOptions {
diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
index d50e501..abd9540 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
+++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
@@ -52,10 +52,10 @@ var server = http.createServer(function(req, res) {
 
 server.listen(requestedPortOrZero, 'localhost', function () {
     // Signal to HttpNodeHost which port it should make its HTTP connections on
-    console.log('[Microsoft.AspNet.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');
+    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');
 
     // Signal to the NodeServices base class that we're ready to accept invocations
-    console.log('[Microsoft.AspNet.NodeServices:Listening]');
+    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
 });
 
 function readRequestBodyAsJson(request, callback) {
diff --git a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-stream.js b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-stream.js
index fc9869c..9d9e792 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-stream.js
+++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-stream.js
@@ -20,4 +20,4 @@ readline.createInterface({ input: process.stdin }).on('line', function (message)
   }
 });
 
-console.log('[Microsoft.AspNet.NodeServices:Listening]'); // The .NET app waits for this signal before sending any invocations
+console.log('[Microsoft.AspNetCore.NodeServices:Listening]'); // The .NET app waits for this signal before sending any invocations
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
index 811e7bf..4671740 100644
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
 	internal class HttpNodeInstance : OutOfProcessNodeInstance {
-        private readonly static Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNet.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
+        private readonly static Regex PortMessageRegex = new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");
 
 		private readonly static JsonSerializerSettings jsonSerializerSettings =  new JsonSerializerSettings {
             ContractResolver = new CamelCasePropertyNamesContractResolver()
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/InputOutputStreamNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/InputOutputStreamNodeInstance.cs
index a7fde79..3f27acd 100644
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/InputOutputStreamNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/InputOutputStreamNodeInstance.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     // This is just to demonstrate that other transports are possible. This implementation is extremely
     // dubious - if the Node-side code fails to conform to the expected protocol in any way (e.g., has an
     // error), then it will just hang forever. So don't use this.
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs
index 682877f..a4fde64 100644
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/NodeInvocationInfo.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     public class NodeInvocationInfo
     {
         public string ModuleName;
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
index 2e2559b..fe3386a 100644
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     /**
      * Class responsible for launching the Node child process, determining when it is ready to accept invocations,
      * and finally killing it when the parent process exits. Also it restarts the child process if it dies.
@@ -91,7 +91,7 @@ namespace Microsoft.AspNet.NodeServices {
             this._nodeProcessIsReadySource = new TaskCompletionSource<bool>();
 
             this._nodeProcess.OutputDataReceived += (sender, evt) => {
-                if (evt.Data == "[Microsoft.AspNet.NodeServices:Listening]" && !initializationIsCompleted) {
+                if (evt.Data == "[Microsoft.AspNetCore.NodeServices:Listening]" && !initializationIsCompleted) {
                     this._nodeProcessIsReadySource.SetResult(true);
                     initializationIsCompleted = true;
                 } else if (evt.Data != null) {
diff --git a/src/Microsoft.AspNetCore.NodeServices/INodeInstance.cs b/src/Microsoft.AspNetCore.NodeServices/INodeInstance.cs
index 3889808..fae73db 100644
--- a/src/Microsoft.AspNetCore.NodeServices/INodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/INodeInstance.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     public interface INodeServices : IDisposable {
         Task<T> Invoke<T>(string moduleName, params object[] args);
 
diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNet.NodeServices.xproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj
similarity index 94%
rename from src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNet.NodeServices.xproj
rename to src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj
index a6fbcbe..49e7ca7 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNet.NodeServices.xproj
+++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>b0fa4175-8b29-4904-9780-28b3c24b0567</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.NodeServices</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.NodeServices</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\NodeServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\NodeServices.sln\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.NodeServices/NodeHostingModel.cs b/src/Microsoft.AspNetCore.NodeServices/NodeHostingModel.cs
index 682c910..b363631 100644
--- a/src/Microsoft.AspNetCore.NodeServices/NodeHostingModel.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/NodeHostingModel.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     public enum NodeHostingModel {
         Http,
         InputOutputStream,
diff --git a/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs b/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs
index 6e40094..73fe29e 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Util/EmbeddedResourceReader.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Reflection;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     public static class EmbeddedResourceReader {
         public static string Read(Type assemblyContainingType, string path) {
             var asm = assemblyContainingType.GetTypeInfo().Assembly;
diff --git a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
index 34788a6..bfcb333 100644
--- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.AspNet.NodeServices {
+namespace Microsoft.AspNetCore.NodeServices {
     // Makes it easier to pass script files to Node in a way that's sure to clean up after the process exits
     public sealed class StringAsTempFile : IDisposable {
         public string FileName { get; private set; }
diff --git a/src/Microsoft.AspNetCore.NodeServices/project.json b/src/Microsoft.AspNetCore.NodeServices/project.json
index b9d590f..1ee10f0 100644
--- a/src/Microsoft.AspNetCore.NodeServices/project.json
+++ b/src/Microsoft.AspNetCore.NodeServices/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "description": "Invoke Node.js modules at runtime in ASP.NET 5 applications.",
+  "description": "Invoke Node.js modules at runtime in ASP.NET Core applications.",
   "compilationOptions": {
     "keyFile": "../../tools/Key.snk"
   },
diff --git a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNet.ReactServices.xproj b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj
similarity index 93%
rename from src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNet.ReactServices.xproj
rename to src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj
index 730b6cf..0f54276 100644
--- a/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNet.ReactServices.xproj
+++ b/src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>b04381de-991f-4831-a0b5-fe1bd3ef80c4</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.ReactServices</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.ReactServices</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.ReactServices/project.json b/src/Microsoft.AspNetCore.ReactServices/project.json
index fd3c7d6..1033e18 100644
--- a/src/Microsoft.AspNetCore.ReactServices/project.json
+++ b/src/Microsoft.AspNetCore.ReactServices/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "description": "Helpers for building React applications on ASP.NET 5.",
+  "description": "Helpers for building React applications on ASP.NET Core.",
   "compilationOptions": {
     "keyFile": "../../tools/Key.snk"
   },
@@ -10,12 +10,12 @@
     "url": "git://github.com/aspnet/nodeservices"
   },
   "tooling": {
-    "defaultNamespace": "Microsoft.AspNet.ReactServices"
+    "defaultNamespace": "Microsoft.AspNetCore.ReactServices"
   },
   "dependencies": {
     "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
-    "Microsoft.AspNet.NodeServices": "1.0.0-*",
-    "Microsoft.AspNet.SpaServices": "1.0.0-*"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*",
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": {},
diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNet.SpaServices.xproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj
similarity index 94%
rename from src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNet.SpaServices.xproj
rename to src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj
index cada1c1..99a66ba 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNet.SpaServices.xproj
+++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>4624f728-6dff-44b6-93b5-3c7d9c94bf3f</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.SpaServices</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.SpaServices</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
index d8b012e..ee07d6f 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
@@ -6,12 +6,12 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNet.NodeServices;
+using Microsoft.AspNetCore.NodeServices;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.PlatformAbstractions;
 using Newtonsoft.Json;
 
-namespace Microsoft.AspNet.SpaServices.Prerendering
+namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
     [HtmlTargetElement(Attributes = PrerenderModuleAttributeName)]
     public class PrerenderTagHelper : TagHelper
diff --git a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
index 0e2f974..287d547 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.NodeServices;
+using Microsoft.AspNetCore.NodeServices;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.AspNet.SpaServices.Prerendering
+namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
     public static class Prerenderer
     {
diff --git a/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs b/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs
index 4d4c6c3..00243d6 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteConstraint.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 
-namespace Microsoft.AspNet.SpaServices
+namespace Microsoft.AspNetCore.SpaServices
 {
     internal class SpaRouteConstraint : IRouteConstraint
     {
diff --git a/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs b/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs
index ac7c027..192c839 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Routing/SpaRouteExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNet.SpaServices;
+using Microsoft.AspNetCore.SpaServices;
 
 // Putting in this namespace so it's always available whenever MapRoute is
 namespace Microsoft.AspNetCore.Builder
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
index 6575409..8c82a8f 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.SpaServices.Webpack
+namespace Microsoft.AspNetCore.SpaServices.Webpack
 {
     // Based on https://github.com/aspnet/Proxy/blob/dev/src/Microsoft.AspNetCore.Proxy/ProxyMiddleware.cs
     // Differs in that, if the proxied request returns a 404, we pass through to the next middleware in the chain
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
index fe0b97c..dd8a188 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.NodeServices;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.NodeServices;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Builder
             appBuilder.UseMiddleware<ConditionalProxyMiddleware>(devServerInfo.PublicPath, proxyOptions);
 
             // While it would be nice to proxy the /__webpack_hmr requests too, these return an EventStream,
-            // and the Microsoft.Aspnet.Proxy code doesn't handle that entirely - it throws an exception after
+            // and the Microsoft.AspNetCore.Proxy code doesn't handle that entirely - it throws an exception after
             // a while. So, just serve a 302 for those.
             appBuilder.Map(WebpackHotMiddlewareEndpoint, builder => {
                 builder.Use(next => async ctx => {
diff --git a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
index b74f82d..020589a 100644
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.AspNet.SpaServices.Webpack {
+namespace Microsoft.AspNetCore.SpaServices.Webpack {
     public class WebpackDevMiddlewareOptions {
         public bool HotModuleReplacement { get; set; }
         public bool ReactHotModuleReplacement { get; set; }
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md
index e459de7..30cdc0c 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/README.md
@@ -1,6 +1,6 @@
 # Not for general use
 
-This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
+This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
 
 You should not use this package directly in your own applications, because it is not supported, and there are no
 guarantees about how its APIs will change in the future.
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
index 7edc0b3..186f11e 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
@@ -1,7 +1,7 @@
 {
   "name": "aspnet-prerendering",
   "version": "1.0.1",
-  "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
+  "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
     "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md
index e459de7..30cdc0c 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/README.md
@@ -1,6 +1,6 @@
 # Not for general use
 
-This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
+This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
 
 You should not use this package directly in your own applications, because it is not supported, and there are no
 guarantees about how its APIs will change in the future.
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
index 3c4c94e..419c058 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "aspnet-webpack-react",
   "version": "1.0.1",
-  "description": "Helpers for using Webpack with React in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
+  "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
     "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md
index e459de7..30cdc0c 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/README.md
@@ -1,6 +1,6 @@
 # Not for general use
 
-This NPM package is an internal implementation detail of the `Microsoft.AspNet.SpaServices` NuGet package.
+This NPM package is an internal implementation detail of the `Microsoft.AspNetCore.SpaServices` NuGet package.
 
 You should not use this package directly in your own applications, because it is not supported, and there are no
 guarantees about how its APIs will change in the future.
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
index 6a8a527..b919303 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "aspnet-webpack",
   "version": "1.0.3",
-  "description": "Helpers for using Webpack in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
+  "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
     "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack\"'",
diff --git a/src/Microsoft.AspNetCore.SpaServices/project.json b/src/Microsoft.AspNetCore.SpaServices/project.json
index 178d6cd..1b46454 100644
--- a/src/Microsoft.AspNetCore.SpaServices/project.json
+++ b/src/Microsoft.AspNetCore.SpaServices/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "description": "Microsoft.AspNet.SpaServices",
+  "description": "Helpers for building single-page applications on ASP.NET Core",
   "compilationOptions": {
     "keyFile": "../../tools/Key.snk"
   },
@@ -15,7 +15,7 @@
   "dependencies": {
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Routing": "1.0.0-*",
-    "Microsoft.AspNet.NodeServices": "1.0.0-*"
+    "Microsoft.AspNetCore.NodeServices": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": {},
diff --git a/templates/Angular2Spa/Startup.cs b/templates/Angular2Spa/Startup.cs
index ce8338c..fa50162 100755
--- a/templates/Angular2Spa/Startup.cs
+++ b/templates/Angular2Spa/Startup.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
diff --git a/templates/Angular2Spa/Views/_ViewImports.cshtml b/templates/Angular2Spa/Views/_ViewImports.cshtml
index 5ece85f..e7b4f83 100755
--- a/templates/Angular2Spa/Views/_ViewImports.cshtml
+++ b/templates/Angular2Spa/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using WebApplicationBasic
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/templates/Angular2Spa/project.json b/templates/Angular2Spa/project.json
index cfa9aa8..d6eb5a5 100755
--- a/templates/Angular2Spa/project.json
+++ b/templates/Angular2Spa/project.json
@@ -20,11 +20,11 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.AngularServices": "1.0.0-*"
+    "Microsoft.AspNetCore.AngularServices": "1.0.0-*"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/templates/KnockoutSpa/Startup.cs b/templates/KnockoutSpa/Startup.cs
index ce8338c..fa50162 100755
--- a/templates/KnockoutSpa/Startup.cs
+++ b/templates/KnockoutSpa/Startup.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
diff --git a/templates/KnockoutSpa/Views/_ViewImports.cshtml b/templates/KnockoutSpa/Views/_ViewImports.cshtml
index 5ece85f..e7b4f83 100755
--- a/templates/KnockoutSpa/Views/_ViewImports.cshtml
+++ b/templates/KnockoutSpa/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using WebApplicationBasic
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/templates/KnockoutSpa/project.json b/templates/KnockoutSpa/project.json
index b6e13ac..552843b 100755
--- a/templates/KnockoutSpa/project.json
+++ b/templates/KnockoutSpa/project.json
@@ -20,11 +20,11 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.SpaServices": "1.0.0-*"
+    "Microsoft.AspNetCore.SpaServices": "1.0.0-*"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/templates/ReactReduxSpa/Startup.cs b/templates/ReactReduxSpa/Startup.cs
index 8cd0bfc..77f13ba 100755
--- a/templates/ReactReduxSpa/Startup.cs
+++ b/templates/ReactReduxSpa/Startup.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
diff --git a/templates/ReactReduxSpa/Views/_ViewImports.cshtml b/templates/ReactReduxSpa/Views/_ViewImports.cshtml
index 5ece85f..e7b4f83 100755
--- a/templates/ReactReduxSpa/Views/_ViewImports.cshtml
+++ b/templates/ReactReduxSpa/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using WebApplicationBasic
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/templates/ReactReduxSpa/project.json b/templates/ReactReduxSpa/project.json
index 1397e76..90b8897 100755
--- a/templates/ReactReduxSpa/project.json
+++ b/templates/ReactReduxSpa/project.json
@@ -20,11 +20,11 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.ReactServices": "1.0.0-*"
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/templates/ReactSpa/Startup.cs b/templates/ReactSpa/Startup.cs
index 8cd0bfc..77f13ba 100755
--- a/templates/ReactSpa/Startup.cs
+++ b/templates/ReactSpa/Startup.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNet.SpaServices.Webpack;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Serialization;
diff --git a/templates/ReactSpa/Views/_ViewImports.cshtml b/templates/ReactSpa/Views/_ViewImports.cshtml
index 5ece85f..e7b4f83 100755
--- a/templates/ReactSpa/Views/_ViewImports.cshtml
+++ b/templates/ReactSpa/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
 @using WebApplicationBasic
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
-@addTagHelper "*, Microsoft.AspNet.SpaServices"
+@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
diff --git a/templates/ReactSpa/project.json b/templates/ReactSpa/project.json
index 1397e76..90b8897 100755
--- a/templates/ReactSpa/project.json
+++ b/templates/ReactSpa/project.json
@@ -20,11 +20,11 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
-    "Microsoft.AspNet.ReactServices": "1.0.0-*"
+    "Microsoft.AspNetCore.ReactServices": "1.0.0-*"
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {
diff --git a/templates/WebApplicationBasic/project.json b/templates/WebApplicationBasic/project.json
index c3c9614..793a0c0 100755
--- a/templates/WebApplicationBasic/project.json
+++ b/templates/WebApplicationBasic/project.json
@@ -23,7 +23,7 @@
   },
 
   "commands": {
-    "web": "Microsoft.AspNet.Server.Kestrel"
+    "web": "Microsoft.AspNetCore.Server.Kestrel"
   },
 
   "frameworks": {