diff --git a/MongoDbGenericRepository/Abstractions/IBaseMongoRepository.cs b/MongoDbGenericRepository/Abstractions/IBaseMongoRepository.cs
index 9f7b39f..adfe39e 100644
--- a/MongoDbGenericRepository/Abstractions/IBaseMongoRepository.cs
+++ b/MongoDbGenericRepository/Abstractions/IBaseMongoRepository.cs
@@ -11,10 +11,13 @@ namespace MongoDbGenericRepository
     /// <summary>
     /// The IBaseMongoRepository exposes the CRUD functionality of the BaseMongoRepository.
     /// </summary>
-    public interface IBaseMongoRepository : IReadOnlyMongoRepository, IBaseMongoRepository_Create, IBaseMongoRepository_Update, IBaseMongoRepository_Delete, IBaseMongoRepository_Index
+    public interface IBaseMongoRepository : 
+        IReadOnlyMongoRepository, 
+        IBaseMongoRepository_Create, 
+        IBaseMongoRepository_Update, 
+        IBaseMongoRepository_Delete, 
+        IBaseMongoRepository_Index
     {
-
-
         /// <summary>
         /// Asynchronously returns a paginated list of the documents matching the filter condition.
         /// </summary>
diff --git a/MongoDbGenericRepository/Abstractions/IKeyTypedReadOnlyMongoRepository.cs b/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.TKey.cs
similarity index 99%
rename from MongoDbGenericRepository/Abstractions/IKeyTypedReadOnlyMongoRepository.cs
rename to MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.TKey.cs
index 847a2a4..7790fc8 100644
--- a/MongoDbGenericRepository/Abstractions/IKeyTypedReadOnlyMongoRepository.cs
+++ b/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.TKey.cs
@@ -8,7 +8,7 @@ using MongoDbGenericRepository.Models;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedReadOnlyMongoRepository<TKey> where TKey : IEquatable<TKey>
+    public interface IReadOnlyMongoRepository<TKey> where TKey : IEquatable<TKey>
     {
         #region Read
 
diff --git a/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.cs b/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.cs
index 61d6a44..e36e8bd 100644
--- a/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.cs
+++ b/MongoDbGenericRepository/Abstractions/IReadOnlyMongoRepository.cs
@@ -9,7 +9,7 @@ namespace MongoDbGenericRepository
     /// <summary>
     /// The IReadOnlyMongoRepository exposes the readonly functionality of the BaseMongoRepository.
     /// </summary>
-    public interface IReadOnlyMongoRepository : IBaseReadOnlyRepository, IKeyTypedReadOnlyMongoRepository<Guid>
+    public interface IReadOnlyMongoRepository : IBaseReadOnlyRepository, IReadOnlyMongoRepository<Guid>
     {
 
     }
diff --git a/MongoDbGenericRepository/BaseMongoRepository.Create.cs b/MongoDbGenericRepository/BaseMongoRepository.Create.cs
index 5e772de..5d9db5a 100644
--- a/MongoDbGenericRepository/BaseMongoRepository.Create.cs
+++ b/MongoDbGenericRepository/BaseMongoRepository.Create.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IBaseMongoRepository_Create : IKeyTypedBaseMongoDbRepository_Create<Guid>
+    public interface IBaseMongoRepository_Create : IBaseMongoRepository_Create<Guid>
     {
         /// <summary>
         /// Asynchronously adds a document to the collection.
diff --git a/MongoDbGenericRepository/BaseMongoRepository.Delete.cs b/MongoDbGenericRepository/BaseMongoRepository.Delete.cs
index 5c74794..0c0491a 100644
--- a/MongoDbGenericRepository/BaseMongoRepository.Delete.cs
+++ b/MongoDbGenericRepository/BaseMongoRepository.Delete.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IBaseMongoRepository_Delete : IKeyTypedBaseMongoDbRepository_Delete<Guid>
+    public interface IBaseMongoRepository_Delete : IBaseMongoRepository_Delete<Guid>
     {
         /// <summary>
         /// Deletes a document.
diff --git a/MongoDbGenericRepository/BaseMongoRepository.Index.cs b/MongoDbGenericRepository/BaseMongoRepository.Index.cs
index 2596224..9cdb64b 100644
--- a/MongoDbGenericRepository/BaseMongoRepository.Index.cs
+++ b/MongoDbGenericRepository/BaseMongoRepository.Index.cs
@@ -7,7 +7,7 @@ using MongoDbGenericRepository.Models;
 
 namespace MongoDbGenericRepository
 {
-    public interface IBaseMongoRepository_Index : IKeyTypedBaseMongoDbRepository_Index<Guid>
+    public interface IBaseMongoRepository_Index : IBaseMongoRepository_Index<Guid>
     {
         /// <summary>
         /// Returns the names of the indexes present on a collection.
diff --git a/MongoDbGenericRepository/BaseMongoRepository.Update.cs b/MongoDbGenericRepository/BaseMongoRepository.Update.cs
index beea2e1..4a89323 100644
--- a/MongoDbGenericRepository/BaseMongoRepository.Update.cs
+++ b/MongoDbGenericRepository/BaseMongoRepository.Update.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IBaseMongoRepository_Update : IKeyTypedBaseMongoDbRepository_Update<Guid>
+    public interface IBaseMongoRepository_Update : IBaseMongoRepository_Update<Guid>
     {
         /// <summary>
         /// Asynchronously Updates a document.
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Create.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Create.cs
similarity index 95%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Create.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Create.cs
index 7d3271b..216f47f 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Create.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Create.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedBaseMongoDbRepository_Create<TKey> where TKey : IEquatable<TKey>
+    public interface IBaseMongoRepository_Create<TKey> where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Asynchronously adds a document to the collection.
@@ -46,7 +46,7 @@ namespace MongoDbGenericRepository
     /// Its constructor must be given a connection string and a database name.
     /// </summary>
     /// <typeparam name="TKey"></typeparam>
-    public abstract partial class KeyTypedBaseMongoDbRepository<TKey> : IKeyTypedBaseMongoDbRepository_Create<TKey> where TKey : IEquatable<TKey>
+    public abstract partial class BaseMongoRepository<TKey> : IBaseMongoRepository_Create<TKey> where TKey : IEquatable<TKey>
     {
         protected MongoDbCreator _mongoDbCreator;
         protected MongoDbCreator MongoDbCreator
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Delete.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Delete.cs
similarity index 98%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Delete.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Delete.cs
index c1d4d43..d6d3097 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Delete.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Delete.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedBaseMongoDbRepository_Delete<TKey> where TKey : IEquatable<TKey>
+    public interface IBaseMongoRepository_Delete<TKey> where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Deletes a document.
@@ -94,7 +94,7 @@ namespace MongoDbGenericRepository
             where TDocument : IDocument<TKey>;
     }
 
-    public abstract partial class KeyTypedBaseMongoDbRepository<TKey>: IKeyTypedBaseMongoDbRepository_Delete<TKey> 
+    public abstract partial class BaseMongoRepository<TKey>: IBaseMongoRepository_Delete<TKey> 
         where TKey : IEquatable<TKey>
     {
         private MongoDbEraser _mongoDbEraser;
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Index.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Index.cs
similarity index 98%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Index.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Index.cs
index 8dc9850..1807ab2 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Index.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Index.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedBaseMongoDbRepository_Index<TKey> where TKey : IEquatable<TKey>
+    public interface IBaseMongoRepository_Index<TKey> where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Returns the names of the indexes present on a collection.
@@ -98,7 +98,7 @@ namespace MongoDbGenericRepository
     /// Its constructor must be given a connection string and a database name.
     /// </summary>
     /// <typeparam name="TKey"></typeparam>
-    public abstract partial class KeyTypedBaseMongoDbRepository<TKey> : IKeyTypedBaseMongoDbRepository_Index<TKey>
+    public abstract partial class BaseMongoRepository<TKey> : IBaseMongoRepository_Index<TKey>
         where TKey : IEquatable<TKey>
     {
         private MongoDbIndexHandler _mongoDbIndexHandler;
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Main.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Main.cs
similarity index 75%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Main.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Main.cs
index 265b7c7..ef79b46 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Main.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Main.cs
@@ -4,12 +4,12 @@ using System;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedBaseMongoDbRepository<TKey> :
-        IKeyTypedReadOnlyMongoRepository<TKey>,
-        IKeyTypedBaseMongoDbRepository_Create<TKey>,
-        IKeyTypedBaseMongoDbRepository_Delete<TKey>,
-        IKeyTypedBaseMongoDbRepository_Index<TKey>,
-        IKeyTypedBaseMongoDbRepository_Update<TKey>
+    public interface IBaseMongoDbRepository<TKey> :
+        IReadOnlyMongoRepository<TKey>,
+        IBaseMongoRepository_Create<TKey>,
+        IBaseMongoRepository_Delete<TKey>,
+        IBaseMongoRepository_Index<TKey>,
+        IBaseMongoRepository_Update<TKey>
         where TKey : IEquatable<TKey>
     {
     }
@@ -19,9 +19,9 @@ namespace MongoDbGenericRepository
     /// Its constructor must be given a connection string and a database name.
     /// </summary>
     /// <typeparam name="TKey"></typeparam>
-    public abstract partial class KeyTypedBaseMongoDbRepository<TKey> : 
-        KeyTypedReadOnlyMongoRepository<TKey>, 
-        IKeyTypedBaseMongoDbRepository<TKey>
+    public abstract partial class BaseMongoRepository<TKey> : 
+        ReadOnlyMongoRepository<TKey>, 
+        IBaseMongoDbRepository<TKey>
         where TKey : IEquatable<TKey>
     {
         protected readonly object _initLock = new object();
@@ -31,7 +31,7 @@ namespace MongoDbGenericRepository
         /// </summary>
         /// <param name="connectionString">The connection string of the MongoDb server.</param>
         /// <param name="databaseName">The name of the database against which you want to perform operations.</param>
-        protected KeyTypedBaseMongoDbRepository(string connectionString, string databaseName = null) : base(connectionString, databaseName)
+        protected BaseMongoRepository(string connectionString, string databaseName = null) : base(connectionString, databaseName)
         {
         }
 
@@ -39,7 +39,7 @@ namespace MongoDbGenericRepository
         /// The contructor taking a <see cref="IMongoDbContext"/>.
         /// </summary>
         /// <param name="mongoDbContext">A mongodb context implementing <see cref="IMongoDbContext"/></param>
-        protected KeyTypedBaseMongoDbRepository(IMongoDbContext mongoDbContext) : base(mongoDbContext)
+        protected BaseMongoRepository(IMongoDbContext mongoDbContext) : base(mongoDbContext)
         {
         }
 
@@ -47,7 +47,7 @@ namespace MongoDbGenericRepository
         /// The contructor taking a <see cref="IMongoDatabase"/>.
         /// </summary>
         /// <param name="mongoDatabase">A mongodb context implementing <see cref="IMongoDatabase"/></param>
-        protected KeyTypedBaseMongoDbRepository(IMongoDatabase mongoDatabase) : base(mongoDatabase)
+        protected BaseMongoRepository(IMongoDatabase mongoDatabase) : base(mongoDatabase)
         {
         }
 
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedReadOnlyMongoRepository.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.ReadOnly.cs
similarity index 98%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedReadOnlyMongoRepository.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.ReadOnly.cs
index 44a1af4..a103005 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedReadOnlyMongoRepository.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.ReadOnly.cs
@@ -13,7 +13,7 @@ namespace MongoDbGenericRepository
     /// The base Repository, it is meant to be inherited from by your custom custom MongoRepository implementation.
     /// Its constructor must be given a connection string and a database name.
     /// </summary>
-    public abstract partial class KeyTypedReadOnlyMongoRepository<TKey> : IKeyTypedReadOnlyMongoRepository<TKey> where TKey : IEquatable<TKey>
+    public abstract partial class ReadOnlyMongoRepository<TKey> : IReadOnlyMongoRepository<TKey> where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// The connection string.
@@ -40,7 +40,7 @@ namespace MongoDbGenericRepository
         /// </summary>
         /// <param name="connectionString">The connection string of the MongoDb server.</param>
         /// <param name="databaseName">The name of the database against which you want to perform operations.</param>
-        protected KeyTypedReadOnlyMongoRepository(string connectionString, string databaseName = null)
+        protected ReadOnlyMongoRepository(string connectionString, string databaseName = null)
         {
             SetupMongoDbContext(connectionString, databaseName);
         }
@@ -49,7 +49,7 @@ namespace MongoDbGenericRepository
         /// The contructor taking a <see cref="IMongoDatabase"/>.
         /// </summary>
         /// <param name="mongoDatabase">A mongodb context implementing <see cref="IMongoDatabase"/></param>
-        protected KeyTypedReadOnlyMongoRepository(IMongoDatabase mongoDatabase) : this(new MongoDbContext(mongoDatabase))
+        protected ReadOnlyMongoRepository(IMongoDatabase mongoDatabase) : this(new MongoDbContext(mongoDatabase))
         {
         }
 
@@ -57,7 +57,7 @@ namespace MongoDbGenericRepository
         /// The contructor taking a <see cref="IMongoDbContext"/>.
         /// </summary>
         /// <param name="mongoDbContext">A mongodb context implementing <see cref="IMongoDbContext"/></param>
-        protected KeyTypedReadOnlyMongoRepository(IMongoDbContext mongoDbContext)
+        protected ReadOnlyMongoRepository(IMongoDbContext mongoDbContext)
         {
             SetupMongoDbContext(mongoDbContext);
         }
diff --git a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Update.cs b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Update.cs
similarity index 98%
rename from MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Update.cs
rename to MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Update.cs
index 1be2d34..8e22067 100644
--- a/MongoDbGenericRepository/KeyTypedRepository/KeyTypedBaseMongoDbRepository.Update.cs
+++ b/MongoDbGenericRepository/KeyTypedRepository/BaseMongoRepository.TKey.Update.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MongoDbGenericRepository
 {
-    public interface IKeyTypedBaseMongoDbRepository_Update<TKey> where TKey : IEquatable<TKey>
+    public interface IBaseMongoRepository_Update<TKey> where TKey : IEquatable<TKey>
     {
         /// <summary>
         /// Asynchronously Updates a document.
@@ -112,7 +112,7 @@ namespace MongoDbGenericRepository
             where TDocument : IDocument<TKey>;
     }
 
-    public abstract partial class KeyTypedBaseMongoDbRepository<TKey> : IKeyTypedBaseMongoDbRepository_Update<TKey>
+    public abstract partial class BaseMongoRepository<TKey> : IBaseMongoRepository_Update<TKey>
         where TKey : IEquatable<TKey>
     {
         private MongoDbUpdater _mongoDbUpdater;
diff --git a/MongoDbGenericRepository/ReadOnlyMongoRepository.cs b/MongoDbGenericRepository/ReadOnlyMongoRepository.cs
index 02484e2..c8bcb99 100644
--- a/MongoDbGenericRepository/ReadOnlyMongoRepository.cs
+++ b/MongoDbGenericRepository/ReadOnlyMongoRepository.cs
@@ -13,7 +13,7 @@ namespace MongoDbGenericRepository
     /// The base Repository, it is meant to be inherited from by your custom custom MongoRepository implementation.
     /// Its constructor must be given a connection string and a database name.
     /// </summary>
-    public abstract class ReadOnlyMongoRepository : KeyTypedReadOnlyMongoRepository<Guid>, IReadOnlyMongoRepository
+    public abstract class ReadOnlyMongoRepository : ReadOnlyMongoRepository<Guid>, IReadOnlyMongoRepository
     {
         /// <summary>
         /// The constructor taking a connection string and a database name.