diff --git a/Svelto.ECS/EnginesRoot.Engines.cs b/Svelto.ECS/EnginesRoot.Engines.cs
index eb89dcc..f29aadf 100644
--- a/Svelto.ECS/EnginesRoot.Engines.cs
+++ b/Svelto.ECS/EnginesRoot.Engines.cs
@@ -43,7 +43,7 @@ namespace Svelto.ECS
             
             _groupedEntityToAdd = new DoubleBufferedEntityViews<Dictionary<int, Dictionary<Type, ITypeSafeDictionary>>>();
 
-            _DB = new EntityDb(_groupEntityDB);
+            _DB = new entitiesDB(_groupEntityDB);
 
             _scheduler = entityViewScheduler;
             _scheduler.Schedule(new WeakAction(SubmitEntityViews));
diff --git a/Svelto.ECS/EnginesRoot.Entities.cs b/Svelto.ECS/EnginesRoot.Entities.cs
index bff4149..47401d9 100644
--- a/Svelto.ECS/EnginesRoot.Entities.cs
+++ b/Svelto.ECS/EnginesRoot.Entities.cs
@@ -195,7 +195,7 @@ namespace Svelto.ECS
             return new EGID(firstID, toGroupId);
         }
 
-        readonly EntityDb _DB;
+        readonly entitiesDB _DB;
         
         //grouped set of entity views, this is the standard way to handle entity views
         readonly Dictionary<int, Dictionary<Type, ITypeSafeDictionary>>         _groupEntityDB;
diff --git a/Svelto.ECS/EntityDb.cs b/Svelto.ECS/EntityDb.cs
index ba895c1..60d6c3a 100644
--- a/Svelto.ECS/EntityDb.cs
+++ b/Svelto.ECS/EntityDb.cs
@@ -5,9 +5,9 @@ using Svelto.Utilities;
 
 namespace Svelto.ECS.Internal
 {
-    class EntityDb : IEntityDB
+    class entitiesDB : IEntitiesDB
     {
-        internal EntityDb(Dictionary<int, Dictionary<Type, ITypeSafeDictionary>> groupEntityViewsDB)
+        internal entitiesDB(Dictionary<int, Dictionary<Type, ITypeSafeDictionary>> groupEntityViewsDB)
         {
             _groupEntityViewsDB = groupEntityViewsDB;
         }
diff --git a/Svelto.ECS/IEntityDB.cs b/Svelto.ECS/IEntitiesDB.cs
similarity index 98%
rename from Svelto.ECS/IEntityDB.cs
rename to Svelto.ECS/IEntitiesDB.cs
index 925a49a..0fe3395 100644
--- a/Svelto.ECS/IEntityDB.cs
+++ b/Svelto.ECS/IEntitiesDB.cs
@@ -3,7 +3,7 @@ using Svelto.Utilities;
 
 namespace Svelto.ECS
 {
-    public interface IEntityDB
+    public interface IEntitiesDB
     {
         /// <summary>
         /// All the EntityView related methods are left for back compatibility, but
diff --git a/Svelto.ECS/IQueryingEntitiesEngine.cs b/Svelto.ECS/IQueryingEntitiesEngine.cs
index 7cb95be..57eae65 100644
--- a/Svelto.ECS/IQueryingEntitiesEngine.cs
+++ b/Svelto.ECS/IQueryingEntitiesEngine.cs
@@ -2,7 +2,7 @@ namespace Svelto.ECS
 {
     public interface IQueryingEntitiesEngine : IEngine
     {
-        IEntityDB entitiesDB { set; }
+        IEntitiesDB entitiesDB { set; }
 
         void Ready();
     }