diff --git a/src/CameraLimit.cpp b/src/CameraLimit.cpp
index cdc4add..e981127 100644
--- a/src/CameraLimit.cpp
+++ b/src/CameraLimit.cpp
@@ -7,7 +7,7 @@
 
 void alai::CameraLimit::_register_methods()
 {
-    register_method("_ready", &CameraLimit::_ready);
+    godot::register_method("_ready", &CameraLimit::_ready);
 }
 
 alai::CameraLimit::CameraLimit()
diff --git a/src/coin/CoinCollected.cpp b/src/coin/CoinCollected.cpp
index 5c30b82..cc6155e 100644
--- a/src/coin/CoinCollected.cpp
+++ b/src/coin/CoinCollected.cpp
@@ -6,9 +6,9 @@
 
 void alai::CoinCollected::_register_methods()
 {
-    register_method("_state_enter", &CoinCollected::_state_enter);
-    register_method("_state_exit", &CoinCollected::_state_exit);
-    register_method("_on_animation_finished", &CoinCollected::_on_animation_finished);
+    godot::register_method("_state_enter", &CoinCollected::_state_enter);
+    godot::register_method("_state_exit", &CoinCollected::_state_exit);
+    godot::register_method("_on_animation_finished", &CoinCollected::_on_animation_finished);
 }
 
 alai::CoinCollected::CoinCollected()
@@ -37,7 +37,6 @@ void alai::CoinCollected::_state_enter()
 
 void alai::CoinCollected::_state_exit()
 {
-    
 }
 
 void alai::CoinCollected::_on_animation_finished(godot::String anim_name)
diff --git a/src/coin/CoinCounter.cpp b/src/coin/CoinCounter.cpp
index 667ea9e..c0f5cbe 100644
--- a/src/coin/CoinCounter.cpp
+++ b/src/coin/CoinCounter.cpp
@@ -6,8 +6,8 @@
 
 void alai::CoinCounter::_register_methods()
 {
-    register_method("_on_coin_collected", &CoinCounter::_on_coin_collected);
-    register_method("_ready", &CoinCounter::_ready);
+    godot::register_method("_on_coin_collected", &CoinCounter::_on_coin_collected);
+    godot::register_method("_ready", &CoinCounter::_ready);
 }
 
 alai::CoinCounter::CoinCounter()
diff --git a/src/coin/CoinNotCollected.cpp b/src/coin/CoinNotCollected.cpp
index c03aa0b..b1c84ee 100644
--- a/src/coin/CoinNotCollected.cpp
+++ b/src/coin/CoinNotCollected.cpp
@@ -4,9 +4,9 @@
 
 void alai::CoinNotCollected::_register_methods()
 {
-    register_method("_state_enter", &CoinNotCollected::_state_enter);
-    register_method("_state_exit", &CoinNotCollected::_state_exit);
-    register_method("_on_body_entered", &CoinNotCollected::_on_body_entered);
+    godot::register_method("_state_enter", &CoinNotCollected::_state_enter);
+    godot::register_method("_state_exit", &CoinNotCollected::_state_exit);
+    godot::register_method("_on_body_entered", &CoinNotCollected::_on_body_entered);
 }
 
 alai::CoinNotCollected::CoinNotCollected()
diff --git a/src/goal/GoalNotReached.cpp b/src/goal/GoalNotReached.cpp
index 08d55f3..8fbec1f 100644
--- a/src/goal/GoalNotReached.cpp
+++ b/src/goal/GoalNotReached.cpp
@@ -4,9 +4,9 @@
 
 void alai::GoalNotReached::_register_methods()
 {
-    register_method("_state_enter", &GoalNotReached::_state_enter);
-    register_method("_state_exit", &GoalNotReached::_state_exit);
-    register_method("_on_Goal_body_entered", &GoalNotReached::_on_Goal_body_entered);
+    godot::register_method("_state_enter", &GoalNotReached::_state_enter);
+    godot::register_method("_state_exit", &GoalNotReached::_state_exit);
+    godot::register_method("_on_Goal_body_entered", &GoalNotReached::_on_Goal_body_entered);
 }
 
 alai::GoalNotReached::GoalNotReached()
diff --git a/src/goal/GoalReached.cpp b/src/goal/GoalReached.cpp
index 06f882c..38fb8fa 100644
--- a/src/goal/GoalReached.cpp
+++ b/src/goal/GoalReached.cpp
@@ -4,8 +4,8 @@
 
 void alai::GoalReached::_register_methods()
 {
-    register_method("_state_enter", &GoalReached::_state_enter);
-    register_method("_state_exit", &GoalReached::_state_exit);
+    godot::register_method("_state_enter", &GoalReached::_state_enter);
+    godot::register_method("_state_exit", &GoalReached::_state_exit);
 }
 
 alai::GoalReached::GoalReached()
diff --git a/src/gui/game_over/GameOverScreen.cpp b/src/gui/game_over/GameOverScreen.cpp
index a379fbb..f6f604f 100644
--- a/src/gui/game_over/GameOverScreen.cpp
+++ b/src/gui/game_over/GameOverScreen.cpp
@@ -9,10 +9,10 @@
 
 void alai::GameOverScreen::_register_methods()
 {  
-    register_method("_on_restart_button_pressed", &GameOverScreen::_on_restart_button_pressed);
-    register_method("_ready", &GameOverScreen::_ready);
-    register_method("connect_signal", &GameOverScreen::connect_signal);
-    register_method("_on_player_died", &GameOverScreen::_on_player_died);
+    godot::register_method("_on_restart_button_pressed", &GameOverScreen::_on_restart_button_pressed);
+    godot::register_method("_ready", &GameOverScreen::_ready);
+    godot::register_method("connect_signal", &GameOverScreen::connect_signal);
+    godot::register_method("_on_player_died", &GameOverScreen::_on_player_died);
 }
 
 alai::GameOverScreen::GameOverScreen()
diff --git a/src/player/states/PlayerFall.cpp b/src/player/states/PlayerFall.cpp
index cd6775e..adc9671 100644
--- a/src/player/states/PlayerFall.cpp
+++ b/src/player/states/PlayerFall.cpp
@@ -4,9 +4,9 @@
 
 void alai::player::PlayerFall::_register_methods()
 {
-    register_method("_state_enter", &PlayerFall::_state_enter);
-    register_method("_state_exit", &PlayerFall::_state_exit);
-    register_method("_physics_process", &PlayerFall::_physics_process);
+    godot::register_method("_state_enter", &PlayerFall::_state_enter);
+    godot::register_method("_state_exit", &PlayerFall::_state_exit);
+    godot::register_method("_physics_process", &PlayerFall::_physics_process);
 }
 
 alai::player::PlayerFall::PlayerFall()
diff --git a/src/player/states/PlayerIdle.cpp b/src/player/states/PlayerIdle.cpp
index bc8a5ed..1043f52 100644
--- a/src/player/states/PlayerIdle.cpp
+++ b/src/player/states/PlayerIdle.cpp
@@ -4,9 +4,9 @@
 
 void alai::player::PlayerIdle::_register_methods()
 {
-    register_method("_state_enter", &PlayerIdle::_state_enter);
-    register_method("_state_exit", &PlayerIdle::_state_exit);
-    register_method("_physics_process", &PlayerIdle::_physics_process);
+    godot::register_method("_state_enter", &PlayerIdle::_state_enter);
+    godot::register_method("_state_exit", &PlayerIdle::_state_exit);
+    godot::register_method("_physics_process", &PlayerIdle::_physics_process);
 }
 
 alai::player::PlayerIdle::PlayerIdle()
diff --git a/src/player/states/PlayerJump.cpp b/src/player/states/PlayerJump.cpp
index 28e5e24..b5417ac 100644
--- a/src/player/states/PlayerJump.cpp
+++ b/src/player/states/PlayerJump.cpp
@@ -6,9 +6,9 @@
 
 void alai::player::PlayerJump::_register_methods()
 {
-    register_method("_state_enter", &PlayerJump::_state_enter);
-    register_method("_state_exit", &PlayerJump::_state_exit);
-    register_method("_physics_process", &PlayerJump::_physics_process);
+    godot::register_method("_state_enter", &PlayerJump::_state_enter);
+    godot::register_method("_state_exit", &PlayerJump::_state_exit);
+    godot::register_method("_physics_process", &PlayerJump::_physics_process);
 }
 
 alai::player::PlayerJump::PlayerJump()
diff --git a/src/player/states/PlayerMove.cpp b/src/player/states/PlayerMove.cpp
index 720ce91..23014db 100644
--- a/src/player/states/PlayerMove.cpp
+++ b/src/player/states/PlayerMove.cpp
@@ -4,9 +4,9 @@
 
 void alai::player::PlayerMove::_register_methods()
 {
-    register_method("_state_enter", &PlayerMove::_state_enter);
-    register_method("_state_exit", &PlayerMove::_state_exit);
-    register_method("_physics_process", &PlayerMove::_physics_process);
+    godot::register_method("_state_enter", &PlayerMove::_state_enter);
+    godot::register_method("_state_exit", &PlayerMove::_state_exit);
+    godot::register_method("_physics_process", &PlayerMove::_physics_process);
 }
 
 alai::player::PlayerMove::PlayerMove()
diff --git a/src/state_machine/State.cpp b/src/state_machine/State.cpp
index 1c66968..eff2576 100644
--- a/src/state_machine/State.cpp
+++ b/src/state_machine/State.cpp
@@ -2,11 +2,11 @@
 
 void alai::State::_register_methods()
 {
-    register_method("set_parent", &State::set_parent);
-    register_method("get_parent", &State::get_parent);
-    register_method("set_state_machine", &State::set_state_machine);
-    register_method("_state_enter", &State::_state_enter);
-    register_method("_state_exit", &State::_state_exit);
+    godot::register_method("set_parent", &State::set_parent);
+    godot::register_method("get_parent", &State::get_parent);
+    godot::register_method("set_state_machine", &State::set_state_machine);
+    godot::register_method("_state_enter", &State::_state_enter);
+    godot::register_method("_state_exit", &State::_state_exit);
 }
 
 alai::State::State()