diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
index 71616449d4..13a2e4e373 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
@@ -8,12 +8,16 @@
     ],
     "xmlDoc": true
   },
-  "description": "ASP.NET 5 Hosting abstractions.",
+  "description": "ASP.NET Core hosting and startup abstractions for web applications.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "hosting"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
index 5add03c85b..12fc62bac2 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
@@ -8,12 +8,16 @@
     ],
     "xmlDoc": true
   },
-  "description": "ASP.NET 5 Hosting server abstractions.",
+  "description": "ASP.NET Core hosting server abstractions for web applications.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "hosting"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Features": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
index 5e15137ebf..f8121e5dce 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
@@ -7,7 +7,7 @@ using Microsoft.Extensions.DependencyInjection;
 namespace Microsoft.AspNetCore.Hosting.WindowsServices
 {
     /// <summary>
-    ///     Provides an implementation of a Windows service that hosts ASP.NET.
+    ///     Provides an implementation of a Windows service that hosts ASP.NET Core.
     /// </summary>
     public class WebHostService : ServiceBase
     {
@@ -53,23 +53,23 @@ namespace Microsoft.AspNetCore.Hosting.WindowsServices
         }
 
         /// <summary>
-        /// Executes before ASP.NET starts.
+        /// Executes before ASP.NET Core starts.
         /// </summary>
         /// <param name="args">The command line arguments passed to the service.</param>
         protected virtual void OnStarting(string[] args) { }
 
         /// <summary>
-        /// Executes after ASP.NET starts.
+        /// Executes after ASP.NET Core starts.
         /// </summary>
         protected virtual void OnStarted() { }
 
         /// <summary>
-        /// Executes before ASP.NET shuts down.
+        /// Executes before ASP.NET Core shuts down.
         /// </summary>
         protected virtual void OnStopping() { }
 
         /// <summary>
-        /// Executes after ASP.NET shuts down.
+        /// Executes after ASP.NET Core shuts down.
         /// </summary>
         protected virtual void OnStopped() { }
     }
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
index e3a996cfd5..41518946c8 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
@@ -1,11 +1,15 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.",
+  "description": "ASP.NET Core hosting infrastructure and startup logic for web applications running within a Windows service.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "hosting"
+    ]
   },
   "buildOptions": {
     "warningsAsErrors": true,
diff --git a/src/Microsoft.AspNetCore.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json
index 4926dddc22..853d70bbf1 100644
--- a/src/Microsoft.AspNetCore.Hosting/project.json
+++ b/src/Microsoft.AspNetCore.Hosting/project.json
@@ -1,11 +1,15 @@
 {
   "version": "1.0.0-*",
-  "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
+  "description": "ASP.NET Core hosting infrastructure and startup logic for web applications.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "hosting"
+    ]
   },
   "buildOptions": {
     "warningsAsErrors": true,
diff --git a/src/Microsoft.AspNetCore.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.Testing/project.json
index 29b066d96b..16f93e464c 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/project.json
+++ b/src/Microsoft.AspNetCore.Server.Testing/project.json
@@ -13,12 +13,16 @@
       "Deployers/RemoteWindowsDeployer/StopServer.ps1"
     ],
   },
-  "description": "ASP.NET 5 helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.",
+  "description": "ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "testing"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs b/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
index fe6c6e38e9..af01a88619 100644
--- a/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
+++ b/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
@@ -18,7 +18,7 @@ using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context
 namespace Microsoft.AspNetCore.TestHost
 {
     /// <summary>
-    /// This adapts HttpRequestMessages to ASP.NET requests, dispatches them through the pipeline, and returns the
+    /// This adapts HttpRequestMessages to ASP.NET Core requests, dispatches them through the pipeline, and returns the
     /// associated HttpResponseMessage.
     /// </summary>
     public class ClientHandler : HttpMessageHandler
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.TestHost
         }
 
         /// <summary>
-        /// This adapts HttpRequestMessages to ASP.NET requests, dispatches them through the pipeline, and returns the
+        /// This adapts HttpRequestMessages to ASP.NET Core requests, dispatches them through the pipeline, and returns the
         /// associated HttpResponseMessage.
         /// </summary>
         /// <param name="request"></param>
diff --git a/src/Microsoft.AspNetCore.TestHost/project.json b/src/Microsoft.AspNetCore.TestHost/project.json
index 89d2378f48..06783eaff5 100644
--- a/src/Microsoft.AspNetCore.TestHost/project.json
+++ b/src/Microsoft.AspNetCore.TestHost/project.json
@@ -8,12 +8,17 @@
     ],
     "xmlDoc": true
   },
-  "description": "ASP.NET 5 web server for writing and running tests.",
+  "description": "ASP.NET Core web server for writing and running tests.",
   "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/hosting"
-    }
+    },
+    "tags": [
+      "aspnetcore",
+      "hosting",
+      "testing"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Hosting": "1.0.0-*"