diff --git a/rwengine/CMakeLists.txt b/rwengine/CMakeLists.txt
index 557347fe..616d96f4 100644
--- a/rwengine/CMakeLists.txt
+++ b/rwengine/CMakeLists.txt
@@ -36,8 +36,8 @@ set(RWENGINE_SOURCES
 	src/data/GameTexts.cpp
 	src/data/GameTexts.hpp
 	src/data/InstanceData.hpp
-	src/data/ObjectData.cpp
-	src/data/ObjectData.hpp
+	src/data/ModelData.cpp
+	src/data/ModelData.hpp
 	src/data/PathData.hpp
 	src/data/Skeleton.cpp
 	src/data/Skeleton.hpp
diff --git a/rwengine/src/data/ObjectData.cpp b/rwengine/src/data/ModelData.cpp
similarity index 100%
rename from rwengine/src/data/ObjectData.cpp
rename to rwengine/src/data/ModelData.cpp
diff --git a/rwengine/src/data/ObjectData.hpp b/rwengine/src/data/ModelData.hpp
similarity index 100%
rename from rwengine/src/data/ObjectData.hpp
rename to rwengine/src/data/ModelData.hpp
diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp
index 9cf4b886..98bd12e2 100644
--- a/rwengine/src/engine/GameData.cpp
+++ b/rwengine/src/engine/GameData.cpp
@@ -1,5 +1,5 @@
 #include <data/Model.hpp>
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include <data/WeaponData.hpp>
 #include <engine/GameData.hpp>
 #include <engine/GameState.hpp>
diff --git a/rwengine/src/engine/GameWorld.hpp b/rwengine/src/engine/GameWorld.hpp
index 144ab020..808a1892 100644
--- a/rwengine/src/engine/GameWorld.hpp
+++ b/rwengine/src/engine/GameWorld.hpp
@@ -23,7 +23,7 @@ class VehicleObject;
 class PickupObject;
 
 class ViewCamera;
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include <render/VisualFX.hpp>
 
 struct BlipData;
diff --git a/rwengine/src/loaders/GenericDATLoader.cpp b/rwengine/src/loaders/GenericDATLoader.cpp
index 42de70aa..72f0dbdb 100644
--- a/rwengine/src/loaders/GenericDATLoader.cpp
+++ b/rwengine/src/loaders/GenericDATLoader.cpp
@@ -4,7 +4,7 @@
 #include <fstream>
 #include <sstream>
 
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include <data/WeaponData.hpp>
 #include <objects/VehicleInfo.hpp>
 
diff --git a/rwengine/src/loaders/LoaderIDE.hpp b/rwengine/src/loaders/LoaderIDE.hpp
index 4313913b..eda1d4af 100644
--- a/rwengine/src/loaders/LoaderIDE.hpp
+++ b/rwengine/src/loaders/LoaderIDE.hpp
@@ -2,7 +2,7 @@
 #ifndef _LOADERIDE_HPP_
 #define _LOADERIDE_HPP_
 
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include <data/PathData.hpp>
 #include <glm/glm.hpp>
 #include <iostream>
diff --git a/rwengine/src/render/GameRenderer.cpp b/rwengine/src/render/GameRenderer.cpp
index b0e1bf15..5ea5813f 100644
--- a/rwengine/src/render/GameRenderer.cpp
+++ b/rwengine/src/render/GameRenderer.cpp
@@ -11,7 +11,7 @@
 #include <objects/VehicleObject.hpp>
 
 #include <ai/CharacterController.hpp>
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include <items/InventoryItem.hpp>
 
 #include <data/CutsceneData.hpp>
diff --git a/tests/test_object_data.cpp b/tests/test_object_data.cpp
index 2d77c7b1..a70b2584 100644
--- a/tests/test_object_data.cpp
+++ b/tests/test_object_data.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include <data/ObjectData.hpp>
+#include <data/ModelData.hpp>
 #include "test_globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ObjectDataTests)