diff --git a/CMakeLists.txt b/CMakeLists.txt
index 869974f..18d6605 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(PkgConfig REQUIRED)
 find_package(SDL3 REQUIRED)
 find_package(SDL3_image REQUIRED)
 find_package(SDL3_mixer REQUIRED)
-find_package(sdlerror REQUIRED)
+find_package(akerror REQUIRED)
 find_package(jansson REQUIRED)
 find_package(box2d REQUIRED)
 
@@ -16,7 +16,7 @@ pkg_check_modules(SDL3 REQUIRED sdl3)
 pkg_check_modules(SDL3_image REQUIRED sdl3-image)
 pkg_check_modules(SDL3_mixer REQUIRED sdl3-mixer)
 pkg_check_modules(jansson REQUIRED jansson)
-pkg_check_modules(sdlerror REQUIRED sdlerror)
+pkg_check_modules(akerror REQUIRED akerror)
 
 set(GAMECONTROLLERDB_H "include/sdl3game/SDL_GameControllerDB.h")
 
@@ -71,16 +71,16 @@ target_include_directories(sdl3game PUBLIC
     include/
   )
 
-target_link_libraries(test_actor PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_bitmasks PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_character PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_registry PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_sprite PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_staticstring PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_tilemap PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
-target_link_libraries(test_util PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_actor PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_bitmasks PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_character PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_registry PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_sprite PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_staticstring PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_tilemap PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(test_util PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
 
-target_link_libraries(charviewer PRIVATE sdlerror::sdlerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
+target_link_libraries(charviewer PRIVATE akerror::akerror sdl3game SDL3::SDL3 SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm)
 
 set(main_lib_dest "lib/sdl3game-${MY_LIBRARY_VERSION}")
 install(TARGETS sdl3game DESTINATION "lib/")
diff --git a/include/controller.h b/include/controller.h
index c26f905..408eb64 100644
--- a/include/controller.h
+++ b/include/controller.h
@@ -2,7 +2,7 @@
 #define _GAMEPAD_H_
 
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 ErrorContext ERROR_NOIGNORE *gamepad_handle_button_down(void *appstate, SDL_Event *event);
 ErrorContext ERROR_NOIGNORE *gamepad_handle_button_up(void *appstate, SDL_Event *event);
diff --git a/include/sdl3game/assets.h b/include/sdl3game/assets.h
index 1295ea9..8163033 100644
--- a/include/sdl3game/assets.h
+++ b/include/sdl3game/assets.h
@@ -1,7 +1,7 @@
 #ifndef _ASSETS_H_
 #define _ASSETS_H_
 
-#include <sdlerror.h>
+#include <akerror.h>
 
 ErrorContext ERROR_NOIGNORE *load_start_bgm(char *fname);
 
diff --git a/include/sdl3game/controller.h b/include/sdl3game/controller.h
index 1b9071d..237af23 100644
--- a/include/sdl3game/controller.h
+++ b/include/sdl3game/controller.h
@@ -2,7 +2,7 @@
 #define _CONTROLLER_H_
 
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #define MAX_CONTROL_MAPS 8
 #define MAX_CONTROLS     32
diff --git a/include/sdl3game/heap.h b/include/sdl3game/heap.h
index dbf00ec..347bd06 100644
--- a/include/sdl3game/heap.h
+++ b/include/sdl3game/heap.h
@@ -5,7 +5,7 @@
 #include "actor.h"
 #include "character.h"
 #include "staticstring.h"
-#include <sdlerror.h>
+#include <akerror.h>
 
 #define MAX_HEAP_ACTOR                    64
 #define MAX_HEAP_SPRITE                   (MAX_HEAP_ACTOR * 16)
diff --git a/include/sdl3game/json_helpers.h b/include/sdl3game/json_helpers.h
index d89a6f3..9a7944e 100644
--- a/include/sdl3game/json_helpers.h
+++ b/include/sdl3game/json_helpers.h
@@ -1,7 +1,7 @@
 #ifndef _JSON_HELPERS_H_
 #define _JSON_HELPERS_H_
 
-#include <sdlerror.h>
+#include <akerror.h>
 #include "staticstring.h"
 
 ErrorContext ERROR_NOIGNORE *get_json_object_value(json_t *obj, char *key, json_t **dest);
diff --git a/include/sdl3game/sprite.h b/include/sdl3game/sprite.h
index 5a0df84..423d99c 100644
--- a/include/sdl3game/sprite.h
+++ b/include/sdl3game/sprite.h
@@ -2,7 +2,7 @@
 #define _SPRITE_H_
 
 #include <SDL3/SDL_properties.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 
 #define SPRITE_MAX_FRAMES                 16
diff --git a/include/sdl3game/staticstring.h b/include/sdl3game/staticstring.h
index e6c7666..ddde5f4 100644
--- a/include/sdl3game/staticstring.h
+++ b/include/sdl3game/staticstring.h
@@ -2,7 +2,7 @@
 #define _STRING_H_
 
 #include "string.h"
-#include <sdlerror.h>
+#include <akerror.h>
 
 #define MAX_STRING_LENGTH            256
 
diff --git a/include/sdl3game/util.h b/include/sdl3game/util.h
index 4ef77d7..8213f66 100644
--- a/include/sdl3game/util.h
+++ b/include/sdl3game/util.h
@@ -1,7 +1,7 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_
 
-#include <sdlerror.h>
+#include <akerror.h>
 
 typedef struct point {
   int x;
diff --git a/src/actor.c b/src/actor.c
index cefa2fb..cd9163b 100644
--- a/src/actor.c
+++ b/src/actor.c
@@ -1,7 +1,7 @@
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
 #include <string.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/game.h>
 #include <sdl3game/sprite.h>
diff --git a/src/assets.c b/src/assets.c
index 91c3662..8d59f5b 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -1,7 +1,7 @@
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
 #include <SDL3_mixer/SDL_mixer.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/game.h>
 #include <sdl3game/staticstring.h>
 #include <sdl3game/heap.h>
diff --git a/src/character.c b/src/character.c
index fe0ab5a..2ffb013 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1,6 +1,6 @@
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <string.h>
 #include <jansson.h>
 
diff --git a/src/controller.c b/src/controller.c
index 2ef0695..ce93da6 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -1,5 +1,5 @@
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/heap.h>
 #include <sdl3game/registry.h>
 #include <sdl3game/game.h>
diff --git a/src/game.c b/src/game.c
index ca2f4d9..1c1f4e2 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2,7 +2,7 @@
 #include <SDL3_image/SDL_image.h>
 #include <SDL3_mixer/SDL_mixer.h>
 #include <stdio.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/game.h>
 #include <sdl3game/controller.h>
diff --git a/src/heap.c b/src/heap.c
index 4b07f41..8844c62 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/game.h>
 #include <sdl3game/sprite.h>
diff --git a/src/json_helpers.c b/src/json_helpers.c
index fc098d8..90365a5 100644
--- a/src/json_helpers.c
+++ b/src/json_helpers.c
@@ -1,6 +1,6 @@
 #include <jansson.h>
 #include <string.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/json_helpers.h>
 #include <sdl3game/game.h>
diff --git a/src/registry.c b/src/registry.c
index 34a9ae5..85cb65a 100644
--- a/src/registry.c
+++ b/src/registry.c
@@ -1,5 +1,5 @@
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/sprite.h>
 #include <sdl3game/registry.h>
diff --git a/src/sprite.c b/src/sprite.c
index d1d05ce..5bef602 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -2,7 +2,7 @@
 #include <SDL3_image/SDL_image.h>
 #include <string.h>
 #include <jansson.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <libgen.h>
 #include <sdl3game/game.h>
diff --git a/src/staticstring.c b/src/staticstring.c
index 8474179..314ad73 100644
--- a/src/staticstring.c
+++ b/src/staticstring.c
@@ -1,4 +1,4 @@
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/staticstring.h>
 
 ErrorContext *string_initialize(string *obj, char *init)
diff --git a/src/tilemap.c b/src/tilemap.c
index edd58cc..9748605 100644
--- a/src/tilemap.c
+++ b/src/tilemap.c
@@ -3,7 +3,7 @@
 #include <SDL3_mixer/SDL_mixer.h>
 #include <string.h>
 #include <jansson.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/tilemap.h>
 #include <sdl3game/actor.h>
diff --git a/src/util.c b/src/util.c
index 6c9cfd6..217fd8a 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,7 +3,7 @@
 
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/util.h>
 #include <sdl3game/heap.h>
diff --git a/tests/actor.c b/tests/actor.c
index 3592223..8ecfe31 100644
--- a/tests/actor.c
+++ b/tests/actor.c
@@ -1,7 +1,7 @@
 #define UNHANDLED_ERROR_TERMINATION_BEHAVIOR \
     handle_unhandled_error(errctx);
 
-#include <sdlerror.h>
+#include <akerror.h>
 
 #define UNHANDLED_ERROR_EXIT 0
 #define UNHANDLED_ERROR_SET  1
diff --git a/tests/character.c b/tests/character.c
index 60eaa02..d2f88e4 100644
--- a/tests/character.c
+++ b/tests/character.c
@@ -1,5 +1,5 @@
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/character.h>
 #include <sdl3game/actor.h>
diff --git a/tests/charviewer.c b/tests/charviewer.c
index 60fdf18..da99102 100644
--- a/tests/charviewer.c
+++ b/tests/charviewer.c
@@ -4,7 +4,7 @@
 #include <SDL3_image/SDL_image.h>
 #include <SDL3_mixer/SDL_mixer.h>
 
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/assets.h>
 #include <sdl3game/iterator.h>
 #include <sdl3game/tilemap.h>
diff --git a/tests/registry.c b/tests/registry.c
index 5dc8b8d..f141426 100644
--- a/tests/registry.c
+++ b/tests/registry.c
@@ -1,6 +1,6 @@
 #include <SDL3/SDL.h>
 #include <stdlib.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/registry.h>
 
 typedef ErrorContext *(*RegistryFuncPtr)(void);
diff --git a/tests/sprite.c b/tests/sprite.c
index 4ed13a4..5906249 100644
--- a/tests/sprite.c
+++ b/tests/sprite.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <sdlerror.h>
+#include <akerror.h>
 
 #include <sdl3game/registry.h>
 #include <sdl3game/sprite.h>
diff --git a/tests/staticstring.c b/tests/staticstring.c
index f7c990a..6eed253 100644
--- a/tests/staticstring.c
+++ b/tests/staticstring.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/heap.h>
 #include <sdl3game/staticstring.h>
 
diff --git a/tests/tilemap.c b/tests/tilemap.c
index 04c2938..bdb7e30 100644
--- a/tests/tilemap.c
+++ b/tests/tilemap.c
@@ -2,7 +2,7 @@
 #include <SDL3_image/SDL_image.h>
 #include <jansson.h>
 
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/util.h>
 #include <sdl3game/heap.h>
 #include <sdl3game/registry.h>
diff --git a/tests/util.c b/tests/util.c
index 8435b26..9dd7479 100644
--- a/tests/util.c
+++ b/tests/util.c
@@ -1,5 +1,5 @@
 #include <SDL3/SDL.h>
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/util.h>
 
 ErrorContext *test_rectangle_points_nullpointers(void)
diff --git a/util/charviewer.c b/util/charviewer.c
index a96d3b9..654bc9b 100644
--- a/util/charviewer.c
+++ b/util/charviewer.c
@@ -5,7 +5,7 @@
 #include <SDL3_image/SDL_image.h>
 #include <SDL3_mixer/SDL_mixer.h>
 
-#include <sdlerror.h>
+#include <akerror.h>
 #include <sdl3game/assets.h>
 #include <sdl3game/iterator.h>
 #include <sdl3game/tilemap.h>