diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 595acf9ac7..46efab8267 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -84,8 +84,8 @@ set(CUBOS_ENGINE_SOURCE
 
 	"src/cubos/engine/splitscreen/plugin.cpp"
 
-	"src/cubos/engine/screenpicker/plugin.cpp"
-	"src/cubos/engine/screenpicker/screenpicker.cpp"
+	"src/cubos/engine/screen_picker/plugin.cpp"
+	"src/cubos/engine/screen_picker/screen_picker.cpp"
 )
 
 # Create cubos engine
diff --git a/engine/include/cubos/engine/screenpicker/plugin.hpp b/engine/include/cubos/engine/screen_picker/plugin.hpp
similarity index 58%
rename from engine/include/cubos/engine/screenpicker/plugin.hpp
rename to engine/include/cubos/engine/screen_picker/plugin.hpp
index 84291e3eae..81ec7b37e8 100644
--- a/engine/include/cubos/engine/screenpicker/plugin.hpp
+++ b/engine/include/cubos/engine/screen_picker/plugin.hpp
@@ -1,18 +1,18 @@
 /// @dir
-/// @brief @ref screenpicker-plugin plugin directory.
+/// @brief @ref screen-picker-plugin plugin directory.
 
 /// @file
 /// @brief Plugin entry point.
-/// @ingroup screenpicker-plugin
+/// @ingroup screen-picker-plugin
 
 #pragma once
 
 #include <cubos/engine/cubos.hpp>
-#include <cubos/engine/screenpicker/screenpicker.hpp>
+#include <cubos/engine/screen_picker/screen_picker.hpp>
 
 namespace cubos::engine
 {
-    /// @defgroup screenpicker-plugin ScreenPicker
+    /// @defgroup screen-picker-plugin ScreenPicker
     /// @ingroup engine
     /// @brief Used to select entities and gizmos by clicking them.
     ///
@@ -20,18 +20,18 @@ namespace cubos::engine
     /// - @ref ScreenPicker - provides a texture to store entity and gizmo ids.
     ///
     /// ## Startup tags
-    /// - `cubos.screenpicker.init` - the ScreenPicker resource is initialized, after `cubos.window.init`
+    /// - `cubos.screenPicker.init` - the ScreenPicker resource is initialized, after `cubos.window.init`
     ///
     /// ## Tags
-    /// - `cubos.screenpicker.clear` - the picking texture is cleared
-    /// - `cubos.screenpicker.resize` - window resize events are handled and the ScreenPicker texture is resized, after
-    /// `cubos.window.poll` and before `cubos.screenpicker.clear`.
+    /// - `cubos.screenPicker.clear` - the picking texture is cleared
+    /// - `cubos.screenPicker.resize` - window resize events are handled and the ScreenPicker texture is resized, after
+    /// `cubos.window.poll` and before `cubos.screenPicker.clear`.
     ///
     /// ## Dependencies
     /// - @ref window-plugin
 
     /// @brief Plugin entry function.
     /// @param cubos @b CUBOS. main class.
-    /// @ingroup screenpicker-plugin
+    /// @ingroup screen-picker-plugin
     void screenPickerPlugin(Cubos& cubos);
 } // namespace cubos::engine
diff --git a/engine/include/cubos/engine/screenpicker/screenpicker.hpp b/engine/include/cubos/engine/screen_picker/screen_picker.hpp
similarity index 96%
rename from engine/include/cubos/engine/screenpicker/screenpicker.hpp
rename to engine/include/cubos/engine/screen_picker/screen_picker.hpp
index a72f9b1417..73823a34f1 100644
--- a/engine/include/cubos/engine/screenpicker/screenpicker.hpp
+++ b/engine/include/cubos/engine/screen_picker/screen_picker.hpp
@@ -1,6 +1,6 @@
 /// @file
 /// @brief Resource @ref cubos::engine::ScreenPicker.
-/// @ingroup screenpicker-plugin
+/// @ingroup screen-picker-plugin
 
 #pragma once
 
@@ -12,7 +12,7 @@ namespace cubos::engine
 {
     /// @brief Resource which provides a texture to store entity/gizmo ids, for selection with a mouse.
     ///
-    /// @ingroup screenpicker-plugin
+    /// @ingroup screen-picker-plugin
     class ScreenPicker final
     {
     public:
diff --git a/engine/src/cubos/engine/renderer/plugin.cpp b/engine/src/cubos/engine/renderer/plugin.cpp
index bb6551ffee..aa32c4a1f4 100644
--- a/engine/src/cubos/engine/renderer/plugin.cpp
+++ b/engine/src/cubos/engine/renderer/plugin.cpp
@@ -11,7 +11,7 @@
 #include <cubos/engine/renderer/pps/bloom.hpp>
 #include <cubos/engine/renderer/spot_light.hpp>
 #include <cubos/engine/renderer/viewport.hpp>
-#include <cubos/engine/screenpicker/plugin.hpp>
+#include <cubos/engine/screen_picker/plugin.hpp>
 #include <cubos/engine/settings/plugin.hpp>
 #include <cubos/engine/transform/plugin.hpp>
 #include <cubos/engine/window/plugin.hpp>
@@ -123,7 +123,7 @@ static void draw(Renderer& renderer, const ActiveCameras& activeCameras, Rendere
     glm::mat4 views[4]{};
     BaseRenderer::Viewport viewports[4]{};
 
-    bool screenPickingEnabled = settings.getBool("cubos.renderer.screenpicking.enabled", true);
+    bool screenPickingEnabled = settings.getBool("cubos.renderer.screenPicking.enabled", true);
 
     int cameraCount = 0;
 
@@ -200,6 +200,6 @@ void cubos::engine::rendererPlugin(Cubos& cubos)
     cubos.system(framePointLights).tagged("cubos.renderer.frame");
     cubos.system(frameEnvironment).tagged("cubos.renderer.frame");
     cubos.system(checkPaletteUpdateSystem).tagged("cubos.renderer.frame");
-    cubos.system(draw).tagged("cubos.renderer.draw").after("cubos.screenpicker.clear");
+    cubos.system(draw).tagged("cubos.renderer.draw").after("cubos.screenPicker.clear");
     cubos.system(resize).after("cubos.window.poll").before("cubos.renderer.draw");
 }
diff --git a/engine/src/cubos/engine/screenpicker/plugin.cpp b/engine/src/cubos/engine/screen_picker/plugin.cpp
similarity index 78%
rename from engine/src/cubos/engine/screenpicker/plugin.cpp
rename to engine/src/cubos/engine/screen_picker/plugin.cpp
index 514cbee036..dd987d0101 100644
--- a/engine/src/cubos/engine/screenpicker/plugin.cpp
+++ b/engine/src/cubos/engine/screen_picker/plugin.cpp
@@ -1,8 +1,8 @@
 #include <cubos/core/io/window.hpp>
 
 #include <cubos/engine/cubos.hpp>
-#include <cubos/engine/screenpicker/plugin.hpp>
-#include <cubos/engine/screenpicker/screenpicker.hpp>
+#include <cubos/engine/screen_picker/plugin.hpp>
+#include <cubos/engine/screen_picker/screen_picker.hpp>
 #include <cubos/engine/window/plugin.hpp>
 
 using cubos::core::io::ResizeEvent;
@@ -38,11 +38,11 @@ void cubos::engine::screenPickerPlugin(Cubos& cubos)
 
     cubos.addResource<ScreenPicker>();
 
-    cubos.startupSystem(initScreenPickerSystem).tagged("cubos.screenpicker.init").after("cubos.window.init");
+    cubos.startupSystem(initScreenPickerSystem).tagged("cubos.screenPicker.init").after("cubos.window.init");
 
-    cubos.system(clearTexture).tagged("cubos.screenpicker.clear");
+    cubos.system(clearTexture).tagged("cubos.screenPicker.clear");
     cubos.system(processResize)
-        .tagged("cubos.screenpicker.resize")
+        .tagged("cubos.screenPicker.resize")
         .after("cubos.window.poll")
-        .before("cubos.screenpicker.clear");
+        .before("cubos.screenPicker.clear");
 }
diff --git a/engine/src/cubos/engine/screenpicker/screenpicker.cpp b/engine/src/cubos/engine/screen_picker/screen_picker.cpp
similarity index 97%
rename from engine/src/cubos/engine/screenpicker/screenpicker.cpp
rename to engine/src/cubos/engine/screen_picker/screen_picker.cpp
index 4ec358f96b..4d58b4c117 100644
--- a/engine/src/cubos/engine/screenpicker/screenpicker.cpp
+++ b/engine/src/cubos/engine/screen_picker/screen_picker.cpp
@@ -1,6 +1,6 @@
 #include <cubos/core/gl/render_device.hpp>
 
-#include <cubos/engine/screenpicker/screenpicker.hpp>
+#include <cubos/engine/screen_picker/screen_picker.hpp>
 
 using cubos::engine::ScreenPicker;