diff --git a/DataProtection.sln b/DataProtection.sln
index 6d0da99c3c..b98012a3b3 100644
--- a/DataProtection.sln
+++ b/DataProtection.sln
@@ -34,7 +34,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataPr
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Redis", "src\Microsoft.AspNetCore.DataProtection.Redis\Microsoft.AspNetCore.DataProtection.Redis.xproj", "{0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Storage", "src\Microsoft.AspNetCore.DataProtection.Azure.Storage\Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.AzureStorage", "src\Microsoft.AspNetCore.DataProtection.AzureStorage\Microsoft.AspNetCore.DataProtection.AzureStorage.xproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5A3A5DE3-49AD-431C-971D-B01B62D94AE2}"
 EndProject
@@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Storage.Test", "test\Microsoft.AspNetCore.DataProtection.Azure.Storage.Test\Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.AzureStorage.Test", "test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test.xproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Redis", "samples\Redis\Redis.xproj", "{24AAEC96-DF46-4F61-B2FF-3D5E056685D9}"
 EndProject
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 6d2fed16b0..0ab081c48f 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -8,7 +8,7 @@
             "Microsoft.AspNetCore.Cryptography.KeyDerivation": { },
             "Microsoft.AspNetCore.DataProtection": { },
             "Microsoft.AspNetCore.DataProtection.Abstractions": { },
-            "Microsoft.AspNetCore.DataProtection.Azure.Storage": { },
+            "Microsoft.AspNetCore.DataProtection.AzureStorage": { },
             "Microsoft.AspNetCore.DataProtection.Extensions": { },
             "Microsoft.AspNetCore.DataProtection.Redis": { },
             "Microsoft.AspNetCore.DataProtection.SystemWeb": { }
diff --git a/samples/AzureBlob/project.json b/samples/AzureBlob/project.json
index 430d34beaa..da1839acc1 100644
--- a/samples/AzureBlob/project.json
+++ b/samples/AzureBlob/project.json
@@ -5,7 +5,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.DataProtection": "1.1.0-*",
-    "Microsoft.AspNetCore.DataProtection.Azure.Storage": "1.0.0-*",
+    "Microsoft.AspNetCore.DataProtection.AzureStorage": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.Logging": "1.1.0-*",
     "Microsoft.Extensions.Logging.Console": "1.1.0-*",
diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureBlobXmlRepository.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs
rename to src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureBlobXmlRepository.cs
index f24f5c7669..2b7594e679 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs
+++ b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureBlobXmlRepository.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 
-namespace Microsoft.AspNetCore.DataProtection.Azure.Storage
+namespace Microsoft.AspNetCore.DataProtection.AzureStorage
 {
     /// <summary>
     /// An <see cref="IXmlRepository"/> which is backed by Azure Blob Storage.
diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureDataProtectionBuilderExtensions.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureDataProtectionBuilderExtensions.cs
index ebf54579f1..90f403bfe3 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureDataProtectionBuilderExtensions.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.DataProtection.Azure.Storage;
+using Microsoft.AspNetCore.DataProtection.AzureStorage;
 using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.WindowsAzure.Storage;
diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.xproj
similarity index 91%
rename from src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj
rename to src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.xproj
index 0645a6ffb2..1c10acb1a4 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj
+++ b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>cc799b57-81e2-4f45-8a32-0d5f49753c3f</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.DataProtection.Azure.Storage</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.DataProtection.AzureStorage</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.DataProtection.AzureStorage/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/project.json b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/project.json
similarity index 100%
rename from src/Microsoft.AspNetCore.DataProtection.Azure.Storage/project.json
rename to src/Microsoft.AspNetCore.DataProtection.AzureStorage/project.json
diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureBlobXmlRepositoryTests.cs
similarity index 97%
rename from test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs
rename to test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureBlobXmlRepositoryTests.cs
index 520b273d29..61d5d0ae78 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs
+++ b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureBlobXmlRepositoryTests.cs
@@ -6,13 +6,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.DataProtection.Azure.Storage;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Blob;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.DataProtection.Azure.Storage.Test
+namespace Microsoft.AspNetCore.DataProtection.AzureStorage.Test
 {
     public class AzureBlobXmlRepositoryTests
     {
diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.xproj
similarity index 91%
rename from test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj
rename to test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.xproj
index efc577930b..0de3804484 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj
+++ b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>8c41240e-48f8-402f-9388-74cfe27f4d76</ProjectGuid>
-    <RootNamespace>Microsoft.AspNetCore.DataProtection.Azure.Storage.Test</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.DataProtection.AzureStorage.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/project.json
similarity index 92%
rename from test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json
rename to test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/project.json
index 485b81038b..ec77150f8f 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.DataProtection": "1.1.0-*",
-    "Microsoft.AspNetCore.DataProtection.Azure.Storage": "1.0.0-*",
+    "Microsoft.AspNetCore.DataProtection.AzureStorage": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Moq": "4.6.36-*",