diff --git a/libraries/models/src/ModelEditPacketSender.cpp b/libraries/models/src/EntityEditPacketSender.cpp
similarity index 100%
rename from libraries/models/src/ModelEditPacketSender.cpp
rename to libraries/models/src/EntityEditPacketSender.cpp
diff --git a/libraries/models/src/ModelEditPacketSender.h b/libraries/models/src/EntityEditPacketSender.h
similarity index 100%
rename from libraries/models/src/ModelEditPacketSender.h
rename to libraries/models/src/EntityEditPacketSender.h
diff --git a/libraries/models/src/ModelItem.cpp b/libraries/models/src/EntityItem.cpp
similarity index 100%
rename from libraries/models/src/ModelItem.cpp
rename to libraries/models/src/EntityItem.cpp
diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/EntityItem.h
similarity index 100%
rename from libraries/models/src/ModelItem.h
rename to libraries/models/src/EntityItem.h
diff --git a/libraries/models/src/ModelsScriptingInterface.cpp b/libraries/models/src/EntityScriptingInterface.cpp
similarity index 100%
rename from libraries/models/src/ModelsScriptingInterface.cpp
rename to libraries/models/src/EntityScriptingInterface.cpp
diff --git a/libraries/models/src/ModelsScriptingInterface.h b/libraries/models/src/EntityScriptingInterface.h
similarity index 100%
rename from libraries/models/src/ModelsScriptingInterface.h
rename to libraries/models/src/EntityScriptingInterface.h
diff --git a/libraries/models/src/ModelTree.cpp b/libraries/models/src/EntityTree.cpp
similarity index 100%
rename from libraries/models/src/ModelTree.cpp
rename to libraries/models/src/EntityTree.cpp
diff --git a/libraries/models/src/ModelTree.h b/libraries/models/src/EntityTree.h
similarity index 100%
rename from libraries/models/src/ModelTree.h
rename to libraries/models/src/EntityTree.h
diff --git a/libraries/models/src/ModelTreeElement.cpp b/libraries/models/src/EntityTreeElement.cpp
similarity index 100%
rename from libraries/models/src/ModelTreeElement.cpp
rename to libraries/models/src/EntityTreeElement.cpp
diff --git a/libraries/models/src/ModelTreeElement.h b/libraries/models/src/EntityTreeElement.h
similarity index 100%
rename from libraries/models/src/ModelTreeElement.h
rename to libraries/models/src/EntityTreeElement.h
diff --git a/libraries/models/src/ModelTreeHeadlessViewer.cpp b/libraries/models/src/EntityTreeHeadlessViewer.cpp
similarity index 100%
rename from libraries/models/src/ModelTreeHeadlessViewer.cpp
rename to libraries/models/src/EntityTreeHeadlessViewer.cpp
diff --git a/libraries/models/src/ModelTreeHeadlessViewer.h b/libraries/models/src/EntityTreeHeadlessViewer.h
similarity index 100%
rename from libraries/models/src/ModelTreeHeadlessViewer.h
rename to libraries/models/src/EntityTreeHeadlessViewer.h