2 files changed, 4 insertions, 4 deletions
diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp
index c374ed0..80757c4 100644
--- a/src/graphics/engine/camera.cpp
+++ b/src/graphics/engine/camera.cpp
@@ -202,12 +202,12 @@ void Gfx::CCamera::Init(Math::Vector eye, Math::Vector lookat, float delay)
 }
 
 
-void Gfx::CCamera::SetObject(CObject* object)
+void Gfx::CCamera::SetControllingObject(CObject* object)
 {
     m_cameraObj = object;
 }
 
-CObject* Gfx::CCamera::GetObject()
+CObject* Gfx::CCamera::GetControllingObject()
 {
     return m_cameraObj;
 }
diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h
index 1a82f9f..f2022f7 100644
--- a/src/graphics/engine/camera.h
+++ b/src/graphics/engine/camera.h
@@ -136,8 +136,8 @@ class CCamera {
     void        Init(Math::Vector eye, Math::Vector lookat, float delay);
 
     //! Sets the object controlling the camera
-    void        SetObject(CObject* object);
-    CObject*    GetObject();
+    void        SetControllingObject(CObject* object);
+    CObject*    GetControllingObject();
 
     //! Change the type of camera
     void            SetType(Gfx::CameraType type);