diff --git a/src/character_actor.cpp b/src/character_actor.cpp
index e1520ca..fd922a4 100644
--- a/src/character_actor.cpp
+++ b/src/character_actor.cpp
@@ -32,7 +32,7 @@ void CharacterActor::_enter_tree() { GDGAMEONLY();
     this->health = this->get_node<Health>("Health");
     this->primary_weapon_pool = this->get_node<ProjectilePool>("ProjectilePool");
     this->planner = this->get_node<goap::Planner>("Planner");
-    Ref<TunnelsGameMode>(GameRoot::get_singleton()->get_game_mode())->register_player_character(this);
+    Ref<TunnelsGameMode>(GameRoot3D::get_singleton()->get_game_mode())->register_player_character(this);
 }
 
 void CharacterActor::_process(double delta_time) { GDGAMEONLY();
@@ -145,7 +145,7 @@ Vector3 CharacterActor::get_velocity_target() const {
 }
 
 bool CharacterActor::get_is_near_player() const {
-    return Ref<TunnelsGameMode>(GameRoot::get_singleton()->get_game_mode())
+    return Ref<TunnelsGameMode>(GameRoot3D::get_singleton()->get_game_mode())
         ->get_player_instance()
         ->get_character()
         ->get_global_position().distance_to(this->get_global_position()) < 5.f;
diff --git a/src/global_world_state.cpp b/src/global_world_state.cpp
index 4eb6cf6..1f5f8f3 100644
--- a/src/global_world_state.cpp
+++ b/src/global_world_state.cpp
@@ -38,7 +38,7 @@ Vector3 GlobalWorldState::get_player_position() const {
 }
 
 CharacterActor *GlobalWorldState::get_player_character() const {
-    return Ref<TunnelsGameMode>(GameRoot::get_singleton()->get_game_mode())->get_player_instance()->get_character();
+    return Ref<TunnelsGameMode>(GameRoot3D::get_singleton()->get_game_mode())->get_player_instance()->get_character();
 }
 
 Variant GlobalWorldState::get_world_property(StringName prop_key) {
diff --git a/src/register_types.cpp b/src/register_types.cpp
index 2d4636a..cae7898 100644
--- a/src/register_types.cpp
+++ b/src/register_types.cpp
@@ -33,7 +33,6 @@ void initialize_gdextension_types(ModuleInitializationLevel p_level)
     if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
         return;
     }
-    ClassDB::register_abstract_class<GameRoot>();
     ClassDB::register_class<GameMode>();
     ClassDB::register_class<GameRoot3D>();
     ClassDB::register_class<GameState>();
diff --git a/src/tunnels_game_mode.cpp b/src/tunnels_game_mode.cpp
index 0d279c0..a21b5dc 100644
--- a/src/tunnels_game_mode.cpp
+++ b/src/tunnels_game_mode.cpp
@@ -15,7 +15,7 @@ void TunnelsGameMode::_bind_methods() {
 }
 
 void TunnelsGameMode::_begin() {
-    GameRoot::get_singleton()->connect("player_spawned", Callable(this, "on_player_spawned"));
+    GameRoot3D::get_singleton()->connect("player_spawned", Callable(this, "on_player_spawned"));
 }
 
 void TunnelsGameMode::on_player_spawned(Node *player) {
diff --git a/src/tunnels_player.cpp b/src/tunnels_player.cpp
index abfb306..95d4536 100644
--- a/src/tunnels_player.cpp
+++ b/src/tunnels_player.cpp
@@ -38,7 +38,7 @@ void TunnelsPlayer::_ready() {
 }
 
 void TunnelsPlayer::_exit_tree() { GDGAMEONLY();
-    GameRoot::get_singleton()->remove_player(this->get_player_id());
+    GameRoot3D::get_singleton()->remove_player(this->get_player_id());
 }
 
 void TunnelsPlayer::_process(double delta_time) { GDGAMEONLY();
@@ -161,7 +161,7 @@ void TunnelsPlayer::try_select_marker() {
     UtilityFunctions::print("Hit: ", marker->get_path());
     // select a character to send orders to
     CharacterActor *target_character{nullptr};
-    for(CharacterActor *loop_character : Ref<TunnelsGameMode>(GameRoot::get_singleton()->get_game_mode())->get_player_characters()) {
+    for(CharacterActor *loop_character : Ref<TunnelsGameMode>(GameRoot3D::get_singleton()->get_game_mode())->get_player_characters()) {
         if(loop_character != this->character) {
             target_character = loop_character;
             break;
@@ -200,12 +200,12 @@ void TunnelsPlayer::initialize_character() {
     this->character = Object::cast_to<CharacterActor>(player_scene->instantiate());
     this->get_parent()->add_child(this->character);
     this->character->set_global_transform(this->get_global_transform());
-    Ref<TunnelsGameState> game_state = GameRoot::get_singleton()->get_game_state();
+    Ref<TunnelsGameState> game_state = GameRoot3D::get_singleton()->get_game_state();
     Ref<CharacterData> character = game_state->get_characters()[0];
     this->character->set_character_data(game_state->get_characters()[0]);
     // disable navmesh navigation and start using player input
     this->character->set_manual_mode(true);
-    Ref<TunnelsGameMode>(GameRoot::get_singleton()->get_game_mode())->set_manual_character(this->character);
+    Ref<TunnelsGameMode>(GameRoot3D::get_singleton()->get_game_mode())->set_manual_character(this->character);
 }
 
 Vector3 TunnelsPlayer::get_world_move_input() const {
diff --git a/src/utils b/src/utils
index d81ad91..2344f3f 160000
--- a/src/utils
+++ b/src/utils
@@ -1 +1 @@
-Subproject commit d81ad91a885a74338c02edf1d52a2fa5aa8746b6
+Subproject commit 2344f3f2b653dbf6a6c57c2e18c43a1f2c813024