diff --git a/src/Robware.Api.Blog.sln b/src/Robware.Api.Blog.sln
index bf7799b..fd91824 100644
--- a/src/Robware.Api.Blog.sln
+++ b/src/Robware.Api.Blog.sln
@@ -18,9 +18,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Api.Blog.Tests", "R
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{9F55FA01-FEC9-4326-8338-4EF014E127A4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data.MongoDB", "Robware.Data.MongoDB\Robware.Data.MongoDB.csproj", "{D48723D5-053A-4654-B37D-CC2FA62625C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data", "Robware.Data\Robware.Data.csproj", "{D48723D5-053A-4654-B37D-CC2FA62625C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data.MongoDB.Tests", "Robware.Data.MongoDB.Tests\Robware.Data.MongoDB.Tests.csproj", "{E4361445-DD13-4DB3-A278-4198F4DEE00A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robware.Data.Tests", "Robware.Data.Tests\Robware.Data.Tests.csproj", "{E4361445-DD13-4DB3-A278-4198F4DEE00A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Robware.Api.Blog/Robware.Api.Blog.csproj b/src/Robware.Api.Blog/Robware.Api.Blog.csproj
index 5660f36..023cda1 100644
--- a/src/Robware.Api.Blog/Robware.Api.Blog.csproj
+++ b/src/Robware.Api.Blog/Robware.Api.Blog.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Robware.Blog\Robware.Blog.csproj" />
-    <ProjectReference Include="..\Robware.Data.MongoDB\Robware.Data.MongoDB.csproj" />
+    <ProjectReference Include="..\Robware.Data\Robware.Data.csproj" />
   </ItemGroup>
 
 
diff --git a/src/Robware.Api.Blog/Startup.cs b/src/Robware.Api.Blog/Startup.cs
index 503453c..b93329e 100644
--- a/src/Robware.Api.Blog/Startup.cs
+++ b/src/Robware.Api.Blog/Startup.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MongoDB.Driver;
 using Robware.Blog;
-using Robware.Data.MongoDB;
+using Robware.Data;
 
 namespace Robware.Api.Blog {
 	public class Startup {
diff --git a/src/Robware.Data.MongoDB.Tests/BlogRepositoryTests.cs b/src/Robware.Data.Tests/BlogRepositoryTests.cs
similarity index 93%
rename from src/Robware.Data.MongoDB.Tests/BlogRepositoryTests.cs
rename to src/Robware.Data.Tests/BlogRepositoryTests.cs
index 4a8529f..01d6798 100644
--- a/src/Robware.Data.MongoDB.Tests/BlogRepositoryTests.cs
+++ b/src/Robware.Data.Tests/BlogRepositoryTests.cs
@@ -2,12 +2,12 @@
 using MongoDB.Driver;
 using NSubstitute;
 using Robware.Blog;
-using Robware.Blog.Data.MongoDB.State;
+using Robware.Blog.Data.State;
 using System;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Robware.Data.MongoDB.Tests {
+namespace Robware.Data.Tests {
 	public class BlogRepositoryTests {
 		[Fact]
 		public async Task SavePost_WithNewPost_GetsNewIdAndSetsTimestampAndSavesAsync() {
diff --git a/src/Robware.Data.MongoDB.Tests/Robware.Data.MongoDB.Tests.csproj b/src/Robware.Data.Tests/Robware.Data.Tests.csproj
similarity index 87%
rename from src/Robware.Data.MongoDB.Tests/Robware.Data.MongoDB.Tests.csproj
rename to src/Robware.Data.Tests/Robware.Data.Tests.csproj
index ff7b67b..8367ee6 100644
--- a/src/Robware.Data.MongoDB.Tests/Robware.Data.MongoDB.Tests.csproj
+++ b/src/Robware.Data.Tests/Robware.Data.Tests.csproj
@@ -16,9 +16,9 @@
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Robware.Data.MongoDB\Robware.Data.MongoDB.csproj" />
-    <ProjectReference Include="..\Robware.Blog\Robware.Blog.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\Robware.Data\Robware.Data.csproj" />
+    <ProjectReference Include="..\Robware.Blog\Robware.Blog.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Robware.Data.MongoDB/BlogRepository.cs b/src/Robware.Data/BlogRepository.cs
similarity index 94%
rename from src/Robware.Data.MongoDB/BlogRepository.cs
rename to src/Robware.Data/BlogRepository.cs
index d8faa77..24191b6 100644
--- a/src/Robware.Data.MongoDB/BlogRepository.cs
+++ b/src/Robware.Data/BlogRepository.cs
@@ -5,9 +5,9 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using MongoDB.Driver;
 using Robware.Blog;
-using Robware.Blog.Data.MongoDB.State;
+using Robware.Blog.Data.State;
 
-namespace Robware.Data.MongoDB {
+namespace Robware.Data {
 	public class BlogRepository : IBlogRepository {
 		private readonly IMongoCollection<BlogPostState> _collection;
 
diff --git a/src/Robware.Data.MongoDB/Robware.Data.MongoDB.csproj b/src/Robware.Data/Robware.Data.csproj
similarity index 100%
rename from src/Robware.Data.MongoDB/Robware.Data.MongoDB.csproj
rename to src/Robware.Data/Robware.Data.csproj
diff --git a/src/Robware.Data.MongoDB/State/BlogPostState.cs b/src/Robware.Data/State/BlogPostState.cs
similarity index 94%
rename from src/Robware.Data.MongoDB/State/BlogPostState.cs
rename to src/Robware.Data/State/BlogPostState.cs
index 4ecfd41..6590d2d 100644
--- a/src/Robware.Data.MongoDB/State/BlogPostState.cs
+++ b/src/Robware.Data/State/BlogPostState.cs
@@ -2,7 +2,7 @@
 using MongoDB.Bson.Serialization.Attributes;
 using System;
 
-namespace Robware.Blog.Data.MongoDB.State {
+namespace Robware.Blog.Data.State {
 	public class BlogPostState {
 		public BlogPostState()
 		{