diff --git a/dECS/Core.h b/dECS/Core.h
index 1b3127a8..200cb2ad 100644
--- a/dECS/Core.h
+++ b/dECS/Core.h
@@ -41,7 +41,7 @@ namespace dECS {
         using StorageConstructor = std::function<std::unique_ptr<IStorage>()>;
 
         [[nodiscard]]
-        constexpr LWOOBJID Id() const noexcept {
+        constexpr LWOOBJID GetObjectID() const noexcept {
             return m_Id;
         }
 
diff --git a/tests/dECSTests/TestECS.cpp b/tests/dECSTests/TestECS.cpp
index 0bceacbd..33041dc4 100644
--- a/tests/dECSTests/TestECS.cpp
+++ b/tests/dECSTests/TestECS.cpp
@@ -17,20 +17,20 @@ TEST(ECSTest, IncrementEntityIdsSingleThread) {
     auto w = World{};
 
     auto ea = w.MakeEntity();
-    ASSERT_EQ(ea.Id(), 1);
+    ASSERT_EQ(ea.GetObjectID(), 1);
 
     auto eb = w.MakeEntity();
-    ASSERT_EQ(eb.Id(), 2);
+    ASSERT_EQ(eb.GetObjectID(), 2);
 
     auto ec = w.MakeEntity();
-    ASSERT_EQ(ec.Id(), 3);
+    ASSERT_EQ(ec.GetObjectID(), 3);
 }
 
 // Test adding and getting components
 TEST(ECSTest, MakeOneEntityAndAddComponents) {
     auto w = World{};
     auto e = w.MakeEntity();
-    ASSERT_EQ(e.Id(), 1);
+    ASSERT_EQ(e.GetObjectID(), 1);
 
     // add component
     auto* const testCompPtr = e.AddComponent<TestComponent>();
@@ -54,7 +54,7 @@ TEST(ECSTest, WorldScope) {
     {
         auto w = World{};
         e.emplace(w.MakeEntity());
-        ASSERT_EQ(e->Id(), 1);
+        ASSERT_EQ(e->GetObjectID(), 1);
 
         // add component within scope
         auto* const cPtr = e->AddComponent<TestComponent>();