diff --git a/Caching.sln b/Caching.sln
index 6632e0e1..7729af49 100644
--- a/Caching.sln
+++ b/Caching.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22604.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Memory", "src\Microsoft.Framework.Cache.Memory\Microsoft.Framework.Cache.Memory.xproj", "{966D16D8-5D4E-4433-9DA7-F53EE44B7EE7}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Memory", "src\Microsoft.Framework.Caching.Memory\Microsoft.Framework.Caching.Memory.xproj", "{966D16D8-5D4E-4433-9DA7-F53EE44B7EE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A04042D-438D-407B-B239-0CAD6A2BD8C2}"
 EndProject
@@ -13,28 +13,28 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MemoryCacheSample", "sample
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2E14F082-1A04-4E7C-9162-1675119F9A9E}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Memory.Tests", "test\Microsoft.Framework.Cache.Memory.Tests\Microsoft.Framework.Cache.Memory.Tests.xproj", "{1C24C0CE-84B6-4D6C-B484-32741D704FD8}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Memory.Tests", "test\Microsoft.Framework.Caching.Memory.Tests\Microsoft.Framework.Caching.Memory.Tests.xproj", "{1C24C0CE-84B6-4D6C-B484-32741D704FD8}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MemoryCacheConcurencySample", "samples\MemoryCacheConcurencySample\MemoryCacheConcurencySample.xproj", "{FF7C7587-BBCA-4574-95AE-101A6FF63B8F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Distributed", "src\Microsoft.Framework.Cache.Distributed\Microsoft.Framework.Cache.Distributed.xproj", "{74F4C074-93DD-4F7D-91CA-0F8DDC2BC6A1}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Distributed", "src\Microsoft.Framework.Caching.Distributed\Microsoft.Framework.Caching.Distributed.xproj", "{74F4C074-93DD-4F7D-91CA-0F8DDC2BC6A1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Distributed.Tests", "test\Microsoft.Framework.Cache.Distributed.Tests\Microsoft.Framework.Cache.Distributed.Tests.xproj", "{C5A8A2C1-588D-4A1A-BB1D-B33B6DD89797}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Distributed.Tests", "test\Microsoft.Framework.Caching.Distributed.Tests\Microsoft.Framework.Caching.Distributed.Tests.xproj", "{C5A8A2C1-588D-4A1A-BB1D-B33B6DD89797}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ProfilingSample", "samples\ProfilingSample\ProfilingSample.xproj", "{FD9FD44E-50D7-4121-9DAB-87A88191CE9F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Redis", "src\Microsoft.Framework.Cache.Redis\Microsoft.Framework.Cache.Redis.xproj", "{02E23070-947C-4438-8E50-CC2456D237BA}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Redis", "src\Microsoft.Framework.Caching.Redis\Microsoft.Framework.Caching.Redis.xproj", "{02E23070-947C-4438-8E50-CC2456D237BA}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RedisCacheSample", "samples\RedisCacheSample\RedisCacheSample.xproj", "{4109BDF4-BFF4-4AB6-8ED1-881DE410EA57}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Redis.Tests", "test\Microsoft.Framework.Cache.Redis.Tests\Microsoft.Framework.Cache.Redis.Tests.xproj", "{D1DCC5A4-3EC1-403B-B069-1F3FCB50E3A5}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Redis.Tests", "test\Microsoft.Framework.Caching.Redis.Tests\Microsoft.Framework.Caching.Redis.Tests.xproj", "{D1DCC5A4-3EC1-403B-B069-1F3FCB50E3A5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FB1086CF-F5C8-4B81-A685-C355F1BA9B97}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Cache.Interfaces", "src\Microsoft.Framework.Cache.Interfaces\Microsoft.Framework.Cache.Interfaces.xproj", "{60AAD8D1-33A3-4943-A4AF-C8A5BA418BC6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Caching.Interfaces", "src\Microsoft.Framework.Caching.Interfaces\Microsoft.Framework.Caching.Interfaces.xproj", "{60AAD8D1-33A3-4943-A4AF-C8A5BA418BC6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/samples/MemoryCacheConcurencySample/Program.cs b/samples/MemoryCacheConcurencySample/Program.cs
index ec4fad1b..6e748310 100644
--- a/samples/MemoryCacheConcurencySample/Program.cs
+++ b/samples/MemoryCacheConcurencySample/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace MemoryCacheSample
 {
diff --git a/samples/MemoryCacheConcurencySample/project.json b/samples/MemoryCacheConcurencySample/project.json
index eab0f94e..d204bec0 100644
--- a/samples/MemoryCacheConcurencySample/project.json
+++ b/samples/MemoryCacheConcurencySample/project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": { 
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },
diff --git a/samples/MemoryCacheSample/Program.cs b/samples/MemoryCacheSample/Program.cs
index 90e550c6..0d46a8f8 100644
--- a/samples/MemoryCacheSample/Program.cs
+++ b/samples/MemoryCacheSample/Program.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace MemoryCacheSample
 {
diff --git a/samples/MemoryCacheSample/project.json b/samples/MemoryCacheSample/project.json
index f61336cb..df7aac37 100644
--- a/samples/MemoryCacheSample/project.json
+++ b/samples/MemoryCacheSample/project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },
diff --git a/samples/ProfilingSample/Program.cs b/samples/ProfilingSample/Program.cs
index 3a351535..011c2dc7 100644
--- a/samples/ProfilingSample/Program.cs
+++ b/samples/ProfilingSample/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
 namespace ProfilingSample
 {
diff --git a/samples/ProfilingSample/project.json b/samples/ProfilingSample/project.json
index eab0f94e..d204bec0 100644
--- a/samples/ProfilingSample/project.json
+++ b/samples/ProfilingSample/project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": { 
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },
diff --git a/samples/RedisCacheSample/Program.cs b/samples/RedisCacheSample/Program.cs
index 3c6486a9..0e02c063 100644
--- a/samples/RedisCacheSample/Program.cs
+++ b/samples/RedisCacheSample/Program.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Redis;
+using Microsoft.Framework.Caching.Redis;
 
 namespace RedisCacheSample
 {
diff --git a/samples/RedisCacheSample/project.json b/samples/RedisCacheSample/project.json
index c2e25003..4c71e8d3 100644
--- a/samples/RedisCacheSample/project.json
+++ b/samples/RedisCacheSample/project.json
@@ -1,6 +1,6 @@
 {
     "dependencies": {
-        "Microsoft.Framework.Cache.Redis": "1.0.0-*"
+        "Microsoft.Framework.Caching.Redis": "1.0.0-*"
     },
     "frameworks" : {
         "dnx451" : { },
diff --git a/src/Microsoft.Framework.Cache.Distributed/CacheExtensions.cs b/src/Microsoft.Framework.Caching.Distributed/CacheExtensions.cs
similarity index 98%
rename from src/Microsoft.Framework.Cache.Distributed/CacheExtensions.cs
rename to src/Microsoft.Framework.Caching.Distributed/CacheExtensions.cs
index 0f53b994..289a6948 100644
--- a/src/Microsoft.Framework.Cache.Distributed/CacheExtensions.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/CacheExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public static class CacheExtensions
     {
diff --git a/src/Microsoft.Framework.Cache.Distributed/CachingServicesExtensions.cs b/src/Microsoft.Framework.Caching.Distributed/CachingServicesExtensions.cs
similarity index 86%
rename from src/Microsoft.Framework.Cache.Distributed/CachingServicesExtensions.cs
rename to src/Microsoft.Framework.Caching.Distributed/CachingServicesExtensions.cs
index d7815047..55172e96 100644
--- a/src/Microsoft.Framework.Cache.Distributed/CachingServicesExtensions.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/CachingServicesExtensions.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Framework.Cache.Distributed;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Distributed;
+using Microsoft.Framework.Caching.Memory;
 
 namespace Microsoft.Framework.DependencyInjection
 {
diff --git a/src/Microsoft.Framework.Cache.Distributed/ICacheContext.cs b/src/Microsoft.Framework.Caching.Distributed/ICacheContext.cs
similarity index 96%
rename from src/Microsoft.Framework.Cache.Distributed/ICacheContext.cs
rename to src/Microsoft.Framework.Caching.Distributed/ICacheContext.cs
index 12eb9b4e..57b58e01 100644
--- a/src/Microsoft.Framework.Cache.Distributed/ICacheContext.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/ICacheContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public interface ICacheContext
     {
diff --git a/src/Microsoft.Framework.Cache.Distributed/IDistributedCache.cs b/src/Microsoft.Framework.Caching.Distributed/IDistributedCache.cs
similarity index 90%
rename from src/Microsoft.Framework.Cache.Distributed/IDistributedCache.cs
rename to src/Microsoft.Framework.Caching.Distributed/IDistributedCache.cs
index 84047888..0ea4ef42 100644
--- a/src/Microsoft.Framework.Cache.Distributed/IDistributedCache.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/IDistributedCache.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public interface IDistributedCache
     {
diff --git a/src/Microsoft.Framework.Cache.Distributed/LocalCache.cs b/src/Microsoft.Framework.Caching.Distributed/LocalCache.cs
similarity index 94%
rename from src/Microsoft.Framework.Cache.Distributed/LocalCache.cs
rename to src/Microsoft.Framework.Caching.Distributed/LocalCache.cs
index 90612280..5e7aef38 100644
--- a/src/Microsoft.Framework.Cache.Distributed/LocalCache.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/LocalCache.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     public class LocalCache : IDistributedCache
     {
diff --git a/src/Microsoft.Framework.Cache.Distributed/LocalContextWrapper.cs b/src/Microsoft.Framework.Caching.Distributed/LocalContextWrapper.cs
similarity index 93%
rename from src/Microsoft.Framework.Cache.Distributed/LocalContextWrapper.cs
rename to src/Microsoft.Framework.Caching.Distributed/LocalContextWrapper.cs
index af8a4a70..022f15d4 100644
--- a/src/Microsoft.Framework.Cache.Distributed/LocalContextWrapper.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/LocalContextWrapper.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Memory;
+using Microsoft.Framework.Caching.Memory;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     internal class LocalContextWrapper : ICacheContext
     {
diff --git a/src/Microsoft.Framework.Cache.Distributed/Microsoft.Framework.Cache.Distributed.xproj b/src/Microsoft.Framework.Caching.Distributed/Microsoft.Framework.Caching.Distributed.xproj
similarity index 100%
rename from src/Microsoft.Framework.Cache.Distributed/Microsoft.Framework.Cache.Distributed.xproj
rename to src/Microsoft.Framework.Caching.Distributed/Microsoft.Framework.Caching.Distributed.xproj
diff --git a/src/Microsoft.Framework.Cache.Distributed/NotNullAttribute.cs b/src/Microsoft.Framework.Caching.Distributed/NotNullAttribute.cs
similarity index 87%
rename from src/Microsoft.Framework.Cache.Distributed/NotNullAttribute.cs
rename to src/Microsoft.Framework.Caching.Distributed/NotNullAttribute.cs
index b5a10324..11012b4c 100644
--- a/src/Microsoft.Framework.Cache.Distributed/NotNullAttribute.cs
+++ b/src/Microsoft.Framework.Caching.Distributed/NotNullAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Distributed
+namespace Microsoft.Framework.Caching.Distributed
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute
diff --git a/src/Microsoft.Framework.Cache.Distributed/project.json b/src/Microsoft.Framework.Caching.Distributed/project.json
similarity index 77%
rename from src/Microsoft.Framework.Cache.Distributed/project.json
rename to src/Microsoft.Framework.Caching.Distributed/project.json
index ba856c9f..1d1eb0ac 100644
--- a/src/Microsoft.Framework.Cache.Distributed/project.json
+++ b/src/Microsoft.Framework.Caching.Distributed/project.json
@@ -2,7 +2,7 @@
     "version": "1.0.0-*",
     "description": "ASP.NET 5 distributed cache abstractions.",
     "dependencies": {
-        "Microsoft.Framework.Cache.Memory": "1.0.0-*"
+        "Microsoft.Framework.Caching.Memory": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },
diff --git a/src/Microsoft.Framework.Cache.Interfaces/CachePreservationPriority.cs b/src/Microsoft.Framework.Caching.Interfaces/CachePreservationPriority.cs
similarity index 91%
rename from src/Microsoft.Framework.Cache.Interfaces/CachePreservationPriority.cs
rename to src/Microsoft.Framework.Caching.Interfaces/CachePreservationPriority.cs
index 13427b6c..0ee95e07 100644
--- a/src/Microsoft.Framework.Cache.Interfaces/CachePreservationPriority.cs
+++ b/src/Microsoft.Framework.Caching.Interfaces/CachePreservationPriority.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     // TODO: Granularity?
     /// <summary>
diff --git a/src/Microsoft.Framework.Cache.Interfaces/EvictionReason.cs b/src/Microsoft.Framework.Caching.Interfaces/EvictionReason.cs
similarity index 93%
rename from src/Microsoft.Framework.Cache.Interfaces/EvictionReason.cs
rename to src/Microsoft.Framework.Caching.Interfaces/EvictionReason.cs
index 5c379f15..ea0eef21 100644
--- a/src/Microsoft.Framework.Cache.Interfaces/EvictionReason.cs
+++ b/src/Microsoft.Framework.Caching.Interfaces/EvictionReason.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public enum EvictionReason
     {
diff --git a/src/Microsoft.Framework.Cache.Interfaces/ICacheSetContext.cs b/src/Microsoft.Framework.Caching.Interfaces/ICacheSetContext.cs
similarity index 97%
rename from src/Microsoft.Framework.Cache.Interfaces/ICacheSetContext.cs
rename to src/Microsoft.Framework.Caching.Interfaces/ICacheSetContext.cs
index ee082a46..0a83fb22 100644
--- a/src/Microsoft.Framework.Cache.Interfaces/ICacheSetContext.cs
+++ b/src/Microsoft.Framework.Caching.Interfaces/ICacheSetContext.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public interface ICacheSetContext
     {
diff --git a/src/Microsoft.Framework.Cache.Interfaces/IEntryLink.cs b/src/Microsoft.Framework.Caching.Interfaces/IEntryLink.cs
similarity index 97%
rename from src/Microsoft.Framework.Cache.Interfaces/IEntryLink.cs
rename to src/Microsoft.Framework.Caching.Interfaces/IEntryLink.cs
index 7480e3c9..0636edf5 100644
--- a/src/Microsoft.Framework.Cache.Interfaces/IEntryLink.cs
+++ b/src/Microsoft.Framework.Caching.Interfaces/IEntryLink.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     /// <summary>
     /// Used to flow expiration information from one entry to another. Triggers and minimum absolute expiration will
diff --git a/src/Microsoft.Framework.Cache.Interfaces/IExpirationTrigger.cs b/src/Microsoft.Framework.Caching.Interfaces/IExpirationTrigger.cs
similarity index 100%
rename from src/Microsoft.Framework.Cache.Interfaces/IExpirationTrigger.cs
rename to src/Microsoft.Framework.Caching.Interfaces/IExpirationTrigger.cs
diff --git a/src/Microsoft.Framework.Cache.Interfaces/IMemoryCache.cs b/src/Microsoft.Framework.Caching.Interfaces/IMemoryCache.cs
similarity index 97%
rename from src/Microsoft.Framework.Cache.Interfaces/IMemoryCache.cs
rename to src/Microsoft.Framework.Caching.Interfaces/IMemoryCache.cs
index 289e6433..6eb56ab6 100644
--- a/src/Microsoft.Framework.Cache.Interfaces/IMemoryCache.cs
+++ b/src/Microsoft.Framework.Caching.Interfaces/IMemoryCache.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public interface IMemoryCache : IDisposable
     {
diff --git a/src/Microsoft.Framework.Cache.Interfaces/Microsoft.Framework.Cache.Interfaces.xproj b/src/Microsoft.Framework.Caching.Interfaces/Microsoft.Framework.Caching.Interfaces.xproj
similarity index 100%
rename from src/Microsoft.Framework.Cache.Interfaces/Microsoft.Framework.Cache.Interfaces.xproj
rename to src/Microsoft.Framework.Caching.Interfaces/Microsoft.Framework.Caching.Interfaces.xproj
diff --git a/src/Microsoft.Framework.Cache.Interfaces/project.json b/src/Microsoft.Framework.Caching.Interfaces/project.json
similarity index 100%
rename from src/Microsoft.Framework.Cache.Interfaces/project.json
rename to src/Microsoft.Framework.Caching.Interfaces/project.json
diff --git a/src/Microsoft.Framework.Cache.Memory/CacheEntry.cs b/src/Microsoft.Framework.Caching.Memory/CacheEntry.cs
similarity index 99%
rename from src/Microsoft.Framework.Cache.Memory/CacheEntry.cs
rename to src/Microsoft.Framework.Caching.Memory/CacheEntry.cs
index bed9d4f7..df54730b 100644
--- a/src/Microsoft.Framework.Cache.Memory/CacheEntry.cs
+++ b/src/Microsoft.Framework.Caching.Memory/CacheEntry.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     using EvictionCallback = Action<string, object, EvictionReason, object>;
 
diff --git a/src/Microsoft.Framework.Cache.Memory/CacheExtensions.cs b/src/Microsoft.Framework.Caching.Memory/CacheExtensions.cs
similarity index 99%
rename from src/Microsoft.Framework.Cache.Memory/CacheExtensions.cs
rename to src/Microsoft.Framework.Caching.Memory/CacheExtensions.cs
index e7c5ec78..c51ce02b 100644
--- a/src/Microsoft.Framework.Cache.Memory/CacheExtensions.cs
+++ b/src/Microsoft.Framework.Caching.Memory/CacheExtensions.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public static class CacheExtensions
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/CacheSetContext.cs b/src/Microsoft.Framework.Caching.Memory/CacheSetContext.cs
similarity index 98%
rename from src/Microsoft.Framework.Cache.Memory/CacheSetContext.cs
rename to src/Microsoft.Framework.Caching.Memory/CacheSetContext.cs
index ed5a342b..960a92ff 100644
--- a/src/Microsoft.Framework.Cache.Memory/CacheSetContext.cs
+++ b/src/Microsoft.Framework.Caching.Memory/CacheSetContext.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     using EvictionCallback = Action<string, object, EvictionReason, object>;
 
diff --git a/src/Microsoft.Framework.Cache.Memory/CancellationTokenTrigger.cs b/src/Microsoft.Framework.Caching.Memory/CancellationTokenTrigger.cs
similarity index 95%
rename from src/Microsoft.Framework.Cache.Memory/CancellationTokenTrigger.cs
rename to src/Microsoft.Framework.Caching.Memory/CancellationTokenTrigger.cs
index d076b765..5b5a3c95 100644
--- a/src/Microsoft.Framework.Cache.Memory/CancellationTokenTrigger.cs
+++ b/src/Microsoft.Framework.Caching.Memory/CancellationTokenTrigger.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class CancellationTokenTrigger : IExpirationTrigger
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/EntryLink.cs b/src/Microsoft.Framework.Caching.Memory/EntryLink.cs
similarity index 96%
rename from src/Microsoft.Framework.Cache.Memory/EntryLink.cs
rename to src/Microsoft.Framework.Caching.Memory/EntryLink.cs
index e6662db3..b109d953 100644
--- a/src/Microsoft.Framework.Cache.Memory/EntryLink.cs
+++ b/src/Microsoft.Framework.Caching.Memory/EntryLink.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class EntryLink : IEntryLink
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/EntryLinkHelpers.cs b/src/Microsoft.Framework.Caching.Memory/EntryLinkHelpers.cs
similarity index 97%
rename from src/Microsoft.Framework.Cache.Memory/EntryLinkHelpers.cs
rename to src/Microsoft.Framework.Caching.Memory/EntryLinkHelpers.cs
index e32db0bb..9262853e 100644
--- a/src/Microsoft.Framework.Cache.Memory/EntryLinkHelpers.cs
+++ b/src/Microsoft.Framework.Caching.Memory/EntryLinkHelpers.cs
@@ -9,7 +9,7 @@
 using System.Runtime.Remoting.Messaging;
 #endif
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public static class EntryLinkHelpers
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/Infrastructure/GcNotification.cs b/src/Microsoft.Framework.Caching.Memory/Infrastructure/GcNotification.cs
similarity index 96%
rename from src/Microsoft.Framework.Cache.Memory/Infrastructure/GcNotification.cs
rename to src/Microsoft.Framework.Caching.Memory/Infrastructure/GcNotification.cs
index 98cb6087..832d9f4c 100644
--- a/src/Microsoft.Framework.Cache.Memory/Infrastructure/GcNotification.cs
+++ b/src/Microsoft.Framework.Caching.Memory/Infrastructure/GcNotification.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Registers a callback that fires each time a Gen2 garbage collection occurs,
diff --git a/src/Microsoft.Framework.Cache.Memory/Infrastructure/ISystemClock.cs b/src/Microsoft.Framework.Caching.Memory/Infrastructure/ISystemClock.cs
similarity index 88%
rename from src/Microsoft.Framework.Cache.Memory/Infrastructure/ISystemClock.cs
rename to src/Microsoft.Framework.Caching.Memory/Infrastructure/ISystemClock.cs
index 156749c1..c8ec6997 100644
--- a/src/Microsoft.Framework.Cache.Memory/Infrastructure/ISystemClock.cs
+++ b/src/Microsoft.Framework.Caching.Memory/Infrastructure/ISystemClock.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Abstracts the system clock to facilitate testing.
diff --git a/src/Microsoft.Framework.Cache.Memory/Infrastructure/SystemClock.cs b/src/Microsoft.Framework.Caching.Memory/Infrastructure/SystemClock.cs
similarity index 90%
rename from src/Microsoft.Framework.Cache.Memory/Infrastructure/SystemClock.cs
rename to src/Microsoft.Framework.Caching.Memory/Infrastructure/SystemClock.cs
index c4ef2a23..da9a5885 100644
--- a/src/Microsoft.Framework.Cache.Memory/Infrastructure/SystemClock.cs
+++ b/src/Microsoft.Framework.Caching.Memory/Infrastructure/SystemClock.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     /// <summary>
     /// Provides access to the normal system clock.
diff --git a/src/Microsoft.Framework.Cache.Memory/MemoryCache.cs b/src/Microsoft.Framework.Caching.Memory/MemoryCache.cs
similarity index 99%
rename from src/Microsoft.Framework.Cache.Memory/MemoryCache.cs
rename to src/Microsoft.Framework.Caching.Memory/MemoryCache.cs
index 4f7a65dd..5e2aff38 100644
--- a/src/Microsoft.Framework.Cache.Memory/MemoryCache.cs
+++ b/src/Microsoft.Framework.Caching.Memory/MemoryCache.cs
@@ -5,10 +5,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class MemoryCache : IMemoryCache
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/MemoryCacheOptions.cs b/src/Microsoft.Framework.Caching.Memory/MemoryCacheOptions.cs
similarity index 88%
rename from src/Microsoft.Framework.Cache.Memory/MemoryCacheOptions.cs
rename to src/Microsoft.Framework.Caching.Memory/MemoryCacheOptions.cs
index 4b7c7766..14c00104 100644
--- a/src/Microsoft.Framework.Cache.Memory/MemoryCacheOptions.cs
+++ b/src/Microsoft.Framework.Caching.Memory/MemoryCacheOptions.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class MemoryCacheOptions : IOptions<MemoryCacheOptions>
     {
diff --git a/src/Microsoft.Framework.Cache.Memory/Microsoft.Framework.Cache.Memory.xproj b/src/Microsoft.Framework.Caching.Memory/Microsoft.Framework.Caching.Memory.xproj
similarity index 100%
rename from src/Microsoft.Framework.Cache.Memory/Microsoft.Framework.Cache.Memory.xproj
rename to src/Microsoft.Framework.Caching.Memory/Microsoft.Framework.Caching.Memory.xproj
diff --git a/src/Microsoft.Framework.Cache.Redis/NotNullAttribute.cs b/src/Microsoft.Framework.Caching.Memory/NotNullAttribute.cs
similarity index 88%
rename from src/Microsoft.Framework.Cache.Redis/NotNullAttribute.cs
rename to src/Microsoft.Framework.Caching.Memory/NotNullAttribute.cs
index a227eef3..923c9ff7 100644
--- a/src/Microsoft.Framework.Cache.Redis/NotNullAttribute.cs
+++ b/src/Microsoft.Framework.Caching.Memory/NotNullAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Memory
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute
diff --git a/src/Microsoft.Framework.Cache.Memory/project.json b/src/Microsoft.Framework.Caching.Memory/project.json
similarity index 88%
rename from src/Microsoft.Framework.Cache.Memory/project.json
rename to src/Microsoft.Framework.Caching.Memory/project.json
index 7747aa53..b53bf5ee 100644
--- a/src/Microsoft.Framework.Cache.Memory/project.json
+++ b/src/Microsoft.Framework.Caching.Memory/project.json
@@ -3,7 +3,7 @@
     "description": "ASP.NET 5 in memory cache abstractions and implementation.",
     "dependencies": {
         "Microsoft.Framework.OptionsModel": "1.0.0-*",
-        "Microsoft.Framework.Cache.Interfaces": "1.0.0-*"
+        "Microsoft.Framework.Caching.Interfaces": "1.0.0-*"
     },
     "frameworks": {
         "net45": { },
diff --git a/src/Microsoft.Framework.Cache.Redis/CacheContext.cs b/src/Microsoft.Framework.Caching.Redis/CacheContext.cs
similarity index 96%
rename from src/Microsoft.Framework.Cache.Redis/CacheContext.cs
rename to src/Microsoft.Framework.Caching.Redis/CacheContext.cs
index 67d3b7d7..8ec351e6 100644
--- a/src/Microsoft.Framework.Cache.Redis/CacheContext.cs
+++ b/src/Microsoft.Framework.Caching.Redis/CacheContext.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using StackExchange.Redis;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     internal class CacheContext : ICacheContext
     {
diff --git a/src/Microsoft.Framework.Cache.Redis/Microsoft.Framework.Cache.Redis.xproj b/src/Microsoft.Framework.Caching.Redis/Microsoft.Framework.Caching.Redis.xproj
similarity index 100%
rename from src/Microsoft.Framework.Cache.Redis/Microsoft.Framework.Cache.Redis.xproj
rename to src/Microsoft.Framework.Caching.Redis/Microsoft.Framework.Caching.Redis.xproj
diff --git a/src/Microsoft.Framework.Cache.Memory/NotNullAttribute.cs b/src/Microsoft.Framework.Caching.Redis/NotNullAttribute.cs
similarity index 88%
rename from src/Microsoft.Framework.Cache.Memory/NotNullAttribute.cs
rename to src/Microsoft.Framework.Caching.Redis/NotNullAttribute.cs
index e386e197..1b2bafea 100644
--- a/src/Microsoft.Framework.Cache.Memory/NotNullAttribute.cs
+++ b/src/Microsoft.Framework.Caching.Redis/NotNullAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Redis
 {
     [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
     internal sealed class NotNullAttribute : Attribute
diff --git a/src/Microsoft.Framework.Cache.Redis/RedisCache.cs b/src/Microsoft.Framework.Caching.Redis/RedisCache.cs
similarity index 98%
rename from src/Microsoft.Framework.Cache.Redis/RedisCache.cs
rename to src/Microsoft.Framework.Caching.Redis/RedisCache.cs
index c8d00d7b..5fc61b63 100644
--- a/src/Microsoft.Framework.Cache.Redis/RedisCache.cs
+++ b/src/Microsoft.Framework.Caching.Redis/RedisCache.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.IO;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using Microsoft.Framework.OptionsModel;
 using StackExchange.Redis;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     public class RedisCache : IDistributedCache
     {
diff --git a/src/Microsoft.Framework.Cache.Redis/RedisCacheOptions.cs b/src/Microsoft.Framework.Caching.Redis/RedisCacheOptions.cs
similarity index 93%
rename from src/Microsoft.Framework.Cache.Redis/RedisCacheOptions.cs
rename to src/Microsoft.Framework.Caching.Redis/RedisCacheOptions.cs
index a8ddfda5..720f1b53 100644
--- a/src/Microsoft.Framework.Cache.Redis/RedisCacheOptions.cs
+++ b/src/Microsoft.Framework.Caching.Redis/RedisCacheOptions.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     public class RedisCacheOptions : IOptions<RedisCacheOptions>
     {
diff --git a/src/Microsoft.Framework.Cache.Redis/RedisExtensions.cs b/src/Microsoft.Framework.Caching.Redis/RedisExtensions.cs
similarity index 95%
rename from src/Microsoft.Framework.Cache.Redis/RedisExtensions.cs
rename to src/Microsoft.Framework.Caching.Redis/RedisExtensions.cs
index 9e87e4ce..91c2ca32 100644
--- a/src/Microsoft.Framework.Cache.Redis/RedisExtensions.cs
+++ b/src/Microsoft.Framework.Caching.Redis/RedisExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using StackExchange.Redis;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     internal static class RedisExtensions
     {
diff --git a/src/Microsoft.Framework.Cache.Redis/project.json b/src/Microsoft.Framework.Caching.Redis/project.json
similarity index 77%
rename from src/Microsoft.Framework.Cache.Redis/project.json
rename to src/Microsoft.Framework.Caching.Redis/project.json
index 655a3a69..4c396de3 100644
--- a/src/Microsoft.Framework.Cache.Redis/project.json
+++ b/src/Microsoft.Framework.Caching.Redis/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
   "description": "ASP.NET 5 distributed cache implementation on Redis.",
   "dependencies": {
-    "Microsoft.Framework.Cache.Distributed": "1.0.0-*",
+    "Microsoft.Framework.Caching.Distributed": "1.0.0-*",
     "StackExchange.Redis": "1.0.333"
   },
   "frameworks": {
diff --git a/test/Microsoft.Framework.Cache.Distributed.Tests/Microsoft.Framework.Cache.Distributed.Tests.xproj b/test/Microsoft.Framework.Caching.Distributed.Tests/Microsoft.Framework.Caching.Distributed.Tests.xproj
similarity index 100%
rename from test/Microsoft.Framework.Cache.Distributed.Tests/Microsoft.Framework.Cache.Distributed.Tests.xproj
rename to test/Microsoft.Framework.Caching.Distributed.Tests/Microsoft.Framework.Caching.Distributed.Tests.xproj
diff --git a/test/Microsoft.Framework.Cache.Distributed.Tests/project.json b/test/Microsoft.Framework.Caching.Distributed.Tests/project.json
similarity index 72%
rename from test/Microsoft.Framework.Cache.Distributed.Tests/project.json
rename to test/Microsoft.Framework.Caching.Distributed.Tests/project.json
index 1d06ef88..afa2719d 100644
--- a/test/Microsoft.Framework.Cache.Distributed.Tests/project.json
+++ b/test/Microsoft.Framework.Caching.Distributed.Tests/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.Framework.Cache.Distributed": "1.0.0-*",
+    "Microsoft.Framework.Caching.Distributed": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/CompactTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/CompactTests.cs
similarity index 96%
rename from test/Microsoft.Framework.Cache.Memory.Tests/CompactTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/CompactTests.cs
index ddd21cd9..6c445a52 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/CompactTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/CompactTests.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class CompactTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/EntryLinkExpirationTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/EntryLinkExpirationTests.cs
similarity index 98%
rename from test/Microsoft.Framework.Cache.Memory.Tests/EntryLinkExpirationTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/EntryLinkExpirationTests.cs
index 41b35498..bd4c9d08 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/EntryLinkExpirationTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/EntryLinkExpirationTests.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Linq;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory.Tests
+namespace Microsoft.Framework.Caching.Memory.Tests
 {
     public class EntryLinkExpirationTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/GcNotificationTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/GcNotificationTests.cs
similarity index 96%
rename from test/Microsoft.Framework.Cache.Memory.Tests/GcNotificationTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/GcNotificationTests.cs
index 659b64de..5c2ece39 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/GcNotificationTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/GcNotificationTests.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     public class GcNotificationTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestClock.cs b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestClock.cs
similarity index 89%
rename from test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestClock.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestClock.cs
index 3c632a6c..faa301ea 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestClock.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestClock.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     public class TestClock : ISystemClock
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestTrigger.cs b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestTrigger.cs
similarity index 96%
rename from test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestTrigger.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestTrigger.cs
index bbca7d5f..cecb0ac5 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TestTrigger.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TestTrigger.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Expiration.Interfaces;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     internal class TestTrigger : IExpirationTrigger
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs
similarity index 89%
rename from test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs
index 873172fe..ec6ab808 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/Infrastructure/TriggerCallbackRegistration.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.Cache.Memory.Infrastructure
+namespace Microsoft.Framework.Caching.Memory.Infrastructure
 {
     public class TriggerCallbackRegistration : IDisposable
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/MemoryCacheSetAndRemoveTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/MemoryCacheSetAndRemoveTests.cs
similarity index 99%
rename from test/Microsoft.Framework.Cache.Memory.Tests/MemoryCacheSetAndRemoveTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/MemoryCacheSetAndRemoveTests.cs
index efc7052b..63bf2073 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/MemoryCacheSetAndRemoveTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/MemoryCacheSetAndRemoveTests.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class MemoryCacheSetAndRemoveTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/Microsoft.Framework.Cache.Memory.Tests.xproj b/test/Microsoft.Framework.Caching.Memory.Tests/Microsoft.Framework.Caching.Memory.Tests.xproj
similarity index 100%
rename from test/Microsoft.Framework.Cache.Memory.Tests/Microsoft.Framework.Cache.Memory.Tests.xproj
rename to test/Microsoft.Framework.Caching.Memory.Tests/Microsoft.Framework.Caching.Memory.Tests.xproj
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/TimeExpirationTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/TimeExpirationTests.cs
similarity index 98%
rename from test/Microsoft.Framework.Cache.Memory.Tests/TimeExpirationTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/TimeExpirationTests.cs
index 0a6d0eb7..62e2dca0 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/TimeExpirationTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/TimeExpirationTests.cs
@@ -5,10 +5,10 @@
 using System.Globalization;
 using System.Threading;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class TimeExpirationTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/TriggeredExpirationTests.cs b/test/Microsoft.Framework.Caching.Memory.Tests/TriggeredExpirationTests.cs
similarity index 98%
rename from test/Microsoft.Framework.Cache.Memory.Tests/TriggeredExpirationTests.cs
rename to test/Microsoft.Framework.Caching.Memory.Tests/TriggeredExpirationTests.cs
index fa54a208..2915ae83 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/TriggeredExpirationTests.cs
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/TriggeredExpirationTests.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Threading;
-using Microsoft.Framework.Cache.Memory.Infrastructure;
+using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.OptionsModel;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Memory
+namespace Microsoft.Framework.Caching.Memory
 {
     public class TriggeredExpirationTests
     {
diff --git a/test/Microsoft.Framework.Cache.Memory.Tests/project.json b/test/Microsoft.Framework.Caching.Memory.Tests/project.json
similarity index 78%
rename from test/Microsoft.Framework.Cache.Memory.Tests/project.json
rename to test/Microsoft.Framework.Caching.Memory.Tests/project.json
index 61703f4b..f3b08346 100644
--- a/test/Microsoft.Framework.Cache.Memory.Tests/project.json
+++ b/test/Microsoft.Framework.Caching.Memory.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Framework.Cache.Memory": "1.0.0-*",
+    "Microsoft.Framework.Caching.Memory": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisTestConfig.cs b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisTestConfig.cs
similarity index 99%
rename from test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisTestConfig.cs
rename to test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisTestConfig.cs
index 4bd3ad8a..f22cc5e5 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisTestConfig.cs
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisTestConfig.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Threading;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     public static class RedisTestConfig
     {
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs
similarity index 97%
rename from test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs
rename to test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs
index 13001e9c..5df5c05c 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestExecutor.cs
@@ -6,7 +6,7 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     // TODO - should replace this whole approach with a CollectionFixture when
     // Xunit CollectionFixtures are working correctly.
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs
similarity index 94%
rename from test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs
rename to test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs
index a9c4c296..43c70bdf 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/Infrastructure/RedisXunitTestFramework.cs
@@ -8,7 +8,7 @@
 
 // TODO: Disabled due to CI failures. [assembly: TestFramework("Microsoft.Framework.Cache.Redis.RedisXunitTestFramework", "Microsoft.Framework.Cache.Redis.Tests")]
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     public class RedisXunitTestFramework : XunitTestFramework
     {
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/Microsoft.Framework.Cache.Redis.Tests.xproj b/test/Microsoft.Framework.Caching.Redis.Tests/Microsoft.Framework.Caching.Redis.Tests.xproj
similarity index 100%
rename from test/Microsoft.Framework.Cache.Redis.Tests/Microsoft.Framework.Cache.Redis.Tests.xproj
rename to test/Microsoft.Framework.Caching.Redis.Tests/Microsoft.Framework.Caching.Redis.Tests.xproj
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/RedisCacheSetAndRemoveTests.cs b/test/Microsoft.Framework.Caching.Redis.Tests/RedisCacheSetAndRemoveTests.cs
similarity index 97%
rename from test/Microsoft.Framework.Cache.Redis.Tests/RedisCacheSetAndRemoveTests.cs
rename to test/Microsoft.Framework.Caching.Redis.Tests/RedisCacheSetAndRemoveTests.cs
index 9a4fc843..6fc6d2fc 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/RedisCacheSetAndRemoveTests.cs
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/RedisCacheSetAndRemoveTests.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     // TODO: Disabled due to CI failure
     // public
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/TimeExpirationTests.cs b/test/Microsoft.Framework.Caching.Redis.Tests/TimeExpirationTests.cs
similarity index 99%
rename from test/Microsoft.Framework.Cache.Redis.Tests/TimeExpirationTests.cs
rename to test/Microsoft.Framework.Caching.Redis.Tests/TimeExpirationTests.cs
index de6e4d63..af3232a3 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/TimeExpirationTests.cs
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/TimeExpirationTests.cs
@@ -5,10 +5,10 @@
 using System.Globalization;
 using System.Threading;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.Cache.Distributed;
+using Microsoft.Framework.Caching.Distributed;
 using Xunit;
 
-namespace Microsoft.Framework.Cache.Redis
+namespace Microsoft.Framework.Caching.Redis
 {
     // TODO: Disabled due to CI failure
     // public
diff --git a/test/Microsoft.Framework.Cache.Redis.Tests/project.json b/test/Microsoft.Framework.Caching.Redis.Tests/project.json
similarity index 79%
rename from test/Microsoft.Framework.Cache.Redis.Tests/project.json
rename to test/Microsoft.Framework.Caching.Redis.Tests/project.json
index 9f81a45f..f7f6680e 100644
--- a/test/Microsoft.Framework.Cache.Redis.Tests/project.json
+++ b/test/Microsoft.Framework.Caching.Redis.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.Framework.Cache.Redis": "1.0.0-*",
+    "Microsoft.Framework.Caching.Redis": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {