diff --git a/src/rutile/app.cppm b/src/rutile/app.cppm
index a3059d5..2eea271 100644
--- a/src/rutile/app.cppm
+++ b/src/rutile/app.cppm
@@ -25,16 +25,16 @@ export namespace rutile
             {
                 try {
                     // Set SDL application metadata
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING, config::app_name);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_VERSION_STRING, config::app_version);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_IDENTIFIER_STRING, config::app_identifier);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_CREATOR_STRING, config::app_creator);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_COPYRIGHT_STRING, config::app_copyright);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_URL_STRING, config::app_url);
-                    sdl::SetAppMetadataProperty(SDL_PROP_APP_METADATA_TYPE_STRING, "game");
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_NAME_STRING, config::app_name);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_VERSION_STRING, config::app_version);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_IDENTIFIER_STRING, config::app_identifier);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_CREATOR_STRING, config::app_creator);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_COPYRIGHT_STRING, config::app_copyright);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_URL_STRING, config::app_url);
+                    sdl::set_app_metadata_property(SDL_PROP_APP_METADATA_TYPE_STRING, "game");
 
                     // Initialize SDL subsystems
-                    sdl::Init(sdl::InitFlags::Video | sdl::InitFlags::Events);
+                    sdl::initialize_sdl(sdl::InitFlags::Video | sdl::InitFlags::Events);
 
                     // Create engine (includes window and renderer) and game state
                     engine_ = Engine::create();
diff --git a/src/rutile/core/engine.cppm b/src/rutile/core/engine.cppm
index 7fec209..680d382 100644
--- a/src/rutile/core/engine.cppm
+++ b/src/rutile/core/engine.cppm
@@ -52,7 +52,7 @@ export namespace rutile
                 // Prevent the class from being instantiated multiple times
                 assert(!instantiated_);
 
-                auto [sdl_window, sdl_renderer] = sdl::CreateWindowAndRenderer(
+                auto [sdl_window, sdl_renderer] = sdl::create_window_and_renderer(
                     config::get_window_title(),
                     config::window_width,
                     config::window_height,
diff --git a/src/wrappers/sdl/error.cppm b/src/wrappers/sdl/error.cppm
index ceaedf0..c4f23df 100644
--- a/src/wrappers/sdl/error.cppm
+++ b/src/wrappers/sdl/error.cppm
@@ -2,7 +2,7 @@ module;
 
 #include <format>
 #include <stdexcept>
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_error.h>
 
 export module wrappers.sdl.error;
 
diff --git a/src/wrappers/sdl/init.cppm b/src/wrappers/sdl/init.cppm
index 9044776..9e3653a 100644
--- a/src/wrappers/sdl/init.cppm
+++ b/src/wrappers/sdl/init.cppm
@@ -1,7 +1,7 @@
 module;
 
 #include <type_traits>
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_init.h>
 
 export module wrappers.sdl.init;
 
@@ -31,7 +31,7 @@ export namespace sdl
     }
 
     /**
-     * Wrapper around the SDL_AppResult enum.
+     * Wrapper for the SDL_AppResult enum.
      */
     enum class AppResult : std::underlying_type_t<SDL_AppResult>
     {
@@ -41,9 +41,9 @@ export namespace sdl
     };
 
     /**
-     * Wrapper around SDL_Init().
+     * Wrapper for SDL_Init().
      */
-    constexpr void Init(const InitFlags_t flags)
+    constexpr void initialize_sdl(const InitFlags_t flags)
     {
         if (!SDL_Init(flags)) {
             throw SDLException("SDL_Init");
@@ -51,9 +51,9 @@ export namespace sdl
     }
 
     /**
-     * Wrapper around SDL_SetAppMetadataProperty().
+     * Wrapper for SDL_SetAppMetadataProperty().
      */
-    constexpr void SetAppMetadataProperty(const char* property_name, const char* value)
+    constexpr void set_app_metadata_property(const char* property_name, const char* value)
     {
         if (!SDL_SetAppMetadataProperty(property_name, value)) {
             throw SDLException("SDL_SetAppMetadataProperty");
diff --git a/src/wrappers/sdl/render.cppm b/src/wrappers/sdl/render.cppm
index a7582dd..0ea45a9 100644
--- a/src/wrappers/sdl/render.cppm
+++ b/src/wrappers/sdl/render.cppm
@@ -173,7 +173,7 @@ export namespace sdl
      * Returns a pair of a Window and a Renderer object.
      * Throws an SDLException on failure.
      */
-    std::pair<Window, Renderer> CreateWindowAndRenderer(
+    std::pair<Window, Renderer> create_window_and_renderer(
         const std::string& title,
         const int width,
         const int height,