diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
index c1bc279d04..f15163da0e 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DataStoreErrorLogger.cs
@@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
 
         public virtual void Log(LogLevel logLevel, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func<object, Exception, string> formatter)
         {
-            var errorState = state as DataStoreErrorLogState;
+            var errorState = state as DatabaseErrorLogState;
             if (errorState != null && exception != null && LastError != null)
             {
                 LastError.SetError(errorState.ContextType, exception);
diff --git a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
index 81d5271d9b..bfb955303f 100644
--- a/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Entity/DatabaseErrorPageMiddleware.cs
@@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity
                         }
                         else
                         {
-                            var creator = dbContext.GetService<IDataStoreCreator>() as IRelationalDataStoreCreator;
+                            var creator = dbContext.GetService<IDatabaseCreator>() as IRelationalDatabaseCreator;
                             if (creator == null)
                             {
                                 _logger.LogVerbose(Strings.DatabaseErrorPage_NotRelationalDatabase);
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index feae8031f4..52f93e9bbe 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -194,7 +194,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     }
                     else
                     {
-                        optionsBuilder.UseInMemoryStore();
+                        optionsBuilder.UseInMemoryDatabase();
                     }
                     services.AddInstance<DbContextOptions>(optionsBuilder.Options);
                 });
@@ -322,7 +322,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     }
                     else
                     {
-                        optionsBuilder.UseInMemoryStore();
+                        optionsBuilder.UseInMemoryDatabase();
                     }
                     services.AddInstance(optionsBuilder.Options);
                 });
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs
index 45bb71451d..e77b6a2837 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.Tests/TestHelperExtensions.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Data.Entity.Tests
     {
         public static EntityFrameworkServicesBuilder AddProviderServices(this EntityFrameworkServicesBuilder entityServicesBuilder)
         {
-            return entityServicesBuilder.AddInMemoryStore();
+            return entityServicesBuilder.AddInMemoryDatabase();
         }
 
         public static DbContextOptions UseProviderOptions(this DbContextOptions options)