diff --git a/openVulkanoCpp/Scene/SimpleAnimationController.cpp b/openVulkanoCpp/Scene/SimpleAnimationController.cpp
index 3f616d3..82594bd 100644
--- a/openVulkanoCpp/Scene/SimpleAnimationController.cpp
+++ b/openVulkanoCpp/Scene/SimpleAnimationController.cpp
@@ -22,10 +22,10 @@ namespace OpenVulkano::Scene
 		if(!m_node || m_duration <= 0 || m_elapsed > m_duration)
 			return;
 
-		m_elapsed += OpenVulkano::CURRENT_FRAME.frameTime;
+		m_elapsed += CURRENT_FRAME.frameTime;
 
 		double progress = GetProgress();
-		OpenVulkano::Math::Pose<float> currentPose = m_initialPose.Interpolate(m_targetPose, progress);
+		Math::Pose<float> currentPose = m_initialPose.Interpolate(m_targetPose, progress);
 		m_node->SetMatrix(currentPose.ToMatrix());
 
 		if(m_elapsed > m_duration)
diff --git a/openVulkanoCpp/Scene/SimpleAnimationController.hpp b/openVulkanoCpp/Scene/SimpleAnimationController.hpp
index c6b2760..a369f4c 100644
--- a/openVulkanoCpp/Scene/SimpleAnimationController.hpp
+++ b/openVulkanoCpp/Scene/SimpleAnimationController.hpp
@@ -18,26 +18,26 @@ namespace OpenVulkano::Scene
 {
 	class SimpleAnimationController : public ITickable
 	{
-		OpenVulkano::Scene::Node *m_node = nullptr;
-		OpenVulkano::Math::PoseF m_targetPose;
-		OpenVulkano::Math::PoseF m_initialPose;
+		Node *m_node = nullptr;
+		Math::PoseF m_targetPose;
+		Math::PoseF m_initialPose;
 		double m_duration = 0;
 		double m_elapsed = 0;
 
 	public:
-		OpenVulkano::Event<SimpleAnimationController *> m_completionEvent;
+		Event<SimpleAnimationController *> m_completionEvent;
 
 		SimpleAnimationController() = default;
 
 		void Reset() { m_elapsed = 0; }
 		void SwapPoses() { std::swap(m_initialPose, m_targetPose); }
 
-		OpenVulkano::Scene::Node* GetNode() { return m_node; }
-		void SetNode(OpenVulkano::Scene::Node *node) { m_node = node; }
+		Node* GetNode() { return m_node; }
+		void SetNode(Node *node) { m_node = node; }
 		
-		const OpenVulkano::Math::PoseF GetInitialPose() { return m_initialPose; }
-		const OpenVulkano::Math::PoseF GetTargetPose() { return m_targetPose; }
-		void SetPoses(const OpenVulkano::Math::PoseF &initialPose, const OpenVulkano::Math::PoseF &targetPose) { m_initialPose = initialPose; m_targetPose = targetPose; }
+		const Math::PoseF& GetInitialPose() { return m_initialPose; }
+		const Math::PoseF& GetTargetPose() { return m_targetPose; }
+		void SetPoses(const Math::PoseF &initialPose, const Math::PoseF &targetPose) { m_initialPose = initialPose; m_targetPose = targetPose; }
 		
 		double GetDuration() { return m_duration; }
 		void SetDuration(double duration) { m_duration = duration; }