diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp
index 709001ff85..851e65c96a 100644
--- a/assignment-client/src/AssignmentFactory.cpp
+++ b/assignment-client/src/AssignmentFactory.cpp
@@ -16,7 +16,7 @@
 #include "audio/AudioMixer.h"
 #include "avatars/AvatarMixer.h"
 #include "metavoxels/MetavoxelServer.h"
-#include "models/ModelServer.h"
+#include "models/EntityServer.h"
 #include "particles/ParticleServer.h"
 #include "voxels/VoxelServer.h"
 
diff --git a/assignment-client/src/models/EntityServer.cpp b/assignment-client/src/models/EntityServer.cpp
index ef80daa8a2..c40807cfe0 100644
--- a/assignment-client/src/models/EntityServer.cpp
+++ b/assignment-client/src/models/EntityServer.cpp
@@ -12,12 +12,12 @@
 #include <QTimer>
 #include <EntityTree.h>
 
-#include "ModelServer.h" // rename to "EntityServer.h"
-#include "ModelServerConsts.h" // rename to ""EntityServerConsts.h"
-#include "ModelNodeData.h" // rename to ""EntityNodeData.h"
+#include "EntityServer.h"
+#include "EntityServerConsts.h"
+#include "EntityNodeData.h"
 
 const char* MODEL_SERVER_NAME = "Entity";
-const char* MODEL_SERVER_LOGGING_TARGET_NAME = "model-server";
+const char* MODEL_SERVER_LOGGING_TARGET_NAME = "entity-server";
 const char* LOCAL_MODELS_PERSIST_FILE = "resources/models.svo";
 
 EntityServer::EntityServer(const QByteArray& packet) : OctreeServer(packet) {
diff --git a/assignment-client/src/models/EntityServer.h b/assignment-client/src/models/EntityServer.h
index 2c2e5d4ead..d7c8a6c827 100644
--- a/assignment-client/src/models/EntityServer.h
+++ b/assignment-client/src/models/EntityServer.h
@@ -15,7 +15,7 @@
 #include "../octree/OctreeServer.h"
 
 #include "EntityItem.h"
-#include "ModelServerConsts.h" // rename to ""EntityServerConsts.h"
+#include "EntityServerConsts.h"
 #include "EntityTree.h"
 
 /// Handles assignments of type EntityServer - sending models to various clients.