diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java
index 5b247df07..cbacbfb96 100644
--- a/src/services/chat/ChatService.java
+++ b/src/services/chat/ChatService.java
@@ -26,13 +26,13 @@ import resources.encodables.player.Mail;
 import resources.objects.SWGObject;
 import resources.player.Player;
 import resources.server_info.CachedObjectDatabase;
-import resources.server_info.IObjectDatabase;
-import resources.server_info.IObjectDatabase.Traverser;
+import resources.server_info.ObjectDatabase;
+import resources.server_info.ObjectDatabase.Traverser;
 import services.player.PlayerManager;
 
 public class ChatService extends Service {
 	
-	private IObjectDatabase<Mail> mails;
+	private ObjectDatabase<Mail> mails;
 	private int maxMailId;
 	
 	public ChatService() {
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 5cfaab0a1..353ab2bcc 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -35,8 +35,8 @@ import resources.objects.quadtree.QuadTree;
 import resources.player.Player;
 import resources.player.PlayerEvent;
 import resources.server_info.CachedObjectDatabase;
-import resources.server_info.IObjectDatabase;
-import resources.server_info.IObjectDatabase.Traverser;
+import resources.server_info.ObjectDatabase;
+import resources.server_info.ObjectDatabase.Traverser;
 import services.player.PlayerManager;
 
 public class ObjectManager extends Manager {
@@ -45,7 +45,7 @@ public class ObjectManager extends Manager {
 	
 	private ClientFactory clientFac;
 	
-	private IObjectDatabase<SWGObject> objects;
+	private ObjectDatabase<SWGObject> objects;
 	private Map <Terrain, QuadTree <SWGObject>> quadTree;
 	private long maxObjectId;