diff --git a/AzureIntegration.sln b/AzureIntegration.sln
index 7a2b00e4e3..f797b601f1 100644
--- a/AzureIntegration.sln
+++ b/AzureIntegration.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26329.2
+VisualStudioVersion = 15.0.26401.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}"
 EndProject
@@ -21,13 +21,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CD650B4B-8
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureLightup", "src\Microsoft.AspNetCore.AzureLightup\Microsoft.AspNetCore.AzureLightup.csproj", "{AC023B45-7995-4D4A-8108-E512AE8E5734}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{AC023B45-7995-4D4A-8108-E512AE8E5734}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesLightupSample", "sample\AzureAppServicesLightupSample\AzureAppServicesLightupSample.csproj", "{939EA897-CA31-4F2E-BA51-22B570B64671}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "sample\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{939EA897-CA31-4F2E-BA51-22B570B64671}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsightsLightup", "src\Microsoft.AspNetCore.ApplicationInsightsLightup\Microsoft.AspNetCore.ApplicationInsightsLightup.csproj", "{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsLightupSample", "sample\ApplicationInsightsLightupSample\ApplicationInsightsLightupSample.csproj", "{33E245F0-2566-4B5B-BA7C-8895B7A697AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingStartupSample", "sample\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{33E245F0-2566-4B5B-BA7C-8895B7A697AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/sample/ApplicationInsightsLightupSample/ApplicationInsightsLightupSample.csproj b/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj
similarity index 87%
rename from sample/ApplicationInsightsLightupSample/ApplicationInsightsLightupSample.csproj
rename to sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj
index 2d0664466c..a10829e07f 100644
--- a/sample/ApplicationInsightsLightupSample/ApplicationInsightsLightupSample.csproj
+++ b/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.ApplicationInsightsLightup\Microsoft.AspNetCore.ApplicationInsightsLightup.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/ApplicationInsightsLightupSample/Properties/launchSettings.json b/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json
similarity index 79%
rename from sample/ApplicationInsightsLightupSample/Properties/launchSettings.json
rename to sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json
index ef56b247ce..1c070ade88 100644
--- a/sample/ApplicationInsightsLightupSample/Properties/launchSettings.json
+++ b/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json
@@ -13,15 +13,15 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsightsLightup;Microsoft.AspNetCore.Server.IISIntegration"
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration"
       }
     },
-    "AzureAppServicesSample": {
+    "AzureAppServicesHostingStartupSample": {
       "commandName": "project",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsightsLightup"
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup"
       }
     }
   }
diff --git a/sample/ApplicationInsightsLightupSample/Startup.cs b/sample/ApplicationInsightsHostingStartupSample/Startup.cs
similarity index 100%
rename from sample/ApplicationInsightsLightupSample/Startup.cs
rename to sample/ApplicationInsightsHostingStartupSample/Startup.cs
diff --git a/sample/AzureAppServicesLightupSample/AzureAppServicesLightupSample.csproj b/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj
similarity index 88%
rename from sample/AzureAppServicesLightupSample/AzureAppServicesLightupSample.csproj
rename to sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj
index 1584e90ca4..112e78f14e 100644
--- a/sample/AzureAppServicesLightupSample/AzureAppServicesLightupSample.csproj
+++ b/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureLightup\Microsoft.AspNetCore.AzureLightup.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/AzureAppServicesLightupSample/Properties/launchSettings.json b/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json
similarity index 80%
rename from sample/AzureAppServicesLightupSample/Properties/launchSettings.json
rename to sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json
index ea16a500b7..731d8620e9 100644
--- a/sample/AzureAppServicesLightupSample/Properties/launchSettings.json
+++ b/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json
@@ -13,10 +13,10 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.AzureLightup;Microsoft.AspNetCore.Server.IISIntegration"
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.AzureAppServices.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration"
       }
     },
-    "AzureAppServicesSample": {
+    "AzureAppServicesHostingStartupSample": {
       "commandName": "IISExpress",
       "launchBrowser": true
     }
diff --git a/sample/AzureAppServicesLightupSample/Startup.cs b/sample/AzureAppServicesHostingStartupSample/Startup.cs
similarity index 100%
rename from sample/AzureAppServicesLightupSample/Startup.cs
rename to sample/AzureAppServicesHostingStartupSample/Startup.cs
diff --git a/src/Microsoft.AspNetCore.ApplicationInsightsLightup/ApplicationInsightsStartupLoader.cs b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs
similarity index 76%
rename from src/Microsoft.AspNetCore.ApplicationInsightsLightup/ApplicationInsightsStartupLoader.cs
rename to src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs
index 67852a50c2..6a1b5b413b 100644
--- a/src/Microsoft.AspNetCore.ApplicationInsightsLightup/ApplicationInsightsStartupLoader.cs
+++ b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs
@@ -3,14 +3,14 @@
 
 using Microsoft.AspNetCore.Hosting;
 
-[assembly: HostingStartup(typeof(Microsoft.AspNetCore.ApplicationInsightsLightup.ApplicationInsightsStartupLoader))]
+[assembly: HostingStartup(typeof(Microsoft.AspNetCore.ApplicationInsights.HostingStartup.ApplicationInsightsHostingStartup))]
 
-namespace Microsoft.AspNetCore.ApplicationInsightsLightup
+namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup
 {
     /// <summary>
     /// A dynamic Application Insights lightup experiance
     /// </summary>
-    public class ApplicationInsightsStartupLoader : IHostingStartup
+    public class ApplicationInsightsHostingStartup : IHostingStartup
     {
         /// <summary>
         /// Calls UseApplicationInsights
diff --git a/src/Microsoft.AspNetCore.ApplicationInsightsLightup/Microsoft.AspNetCore.ApplicationInsightsLightup.csproj b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.ApplicationInsightsLightup/Microsoft.AspNetCore.ApplicationInsightsLightup.csproj
rename to src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj
diff --git a/src/Microsoft.AspNetCore.AzureLightup/AzureStartupLoader.cs b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureStartupLoader.cs
similarity index 68%
rename from src/Microsoft.AspNetCore.AzureLightup/AzureStartupLoader.cs
rename to src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureStartupLoader.cs
index 0e6757e0fc..01990240eb 100644
--- a/src/Microsoft.AspNetCore.AzureLightup/AzureStartupLoader.cs
+++ b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureStartupLoader.cs
@@ -3,14 +3,14 @@
 
 using Microsoft.AspNetCore.Hosting;
 
-[assembly: HostingStartup(typeof(Microsoft.AspNetCore.AzureLightup.AzureStartupLoader))]
+[assembly: HostingStartup(typeof(Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup))]
 
-namespace Microsoft.AspNetCore.AzureLightup
+namespace Microsoft.AspNetCore.AzureAppServices.HostingStartup
 {
     /// <summary>
     /// A dynamic azure lightup experiance
     /// </summary>
-    public class AzureStartupLoader : IHostingStartup
+    public class AzureAppServicesHostingStartup : IHostingStartup
     {
         /// <summary>
         /// Calls UseAzureAppServices
diff --git a/src/Microsoft.AspNetCore.AzureLightup/Microsoft.AspNetCore.AzureLightup.csproj b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.AzureLightup/Microsoft.AspNetCore.AzureLightup.csproj
rename to src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj