diff --git a/cmake/FindAllegro5.cmake b/cmake/FindAllegro5.cmake
index 74e6d9e..e7062b9 100644
--- a/cmake/FindAllegro5.cmake
+++ b/cmake/FindAllegro5.cmake
@@ -1,24 +1,24 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_FOUND - system has allegro5
-#  ALLEGRO5_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_LIBRARIES - Link these to use allegro5
+#  Allegro5_FOUND - system has allegro5
+#  Allegro5_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_INCLUDE_DIR allegro5/allegro.h)
+FIND_PATH(Allegro5_INCLUDE_DIR allegro5/allegro.h)
 
-SET(ALLEGRO5_NAMES ${ALLEGRO5_NAMES} allegro liballegro Allegro-5.2 allegro-debug allegro-static liballegro_static allegro_static)
-FIND_LIBRARY(ALLEGRO5_LIBRARY NAMES ${ALLEGRO5_NAMES})
+SET(Allegro5_NAMES ${Allegro5_NAMES} allegro liballegro Allegro-5.2 allegro-debug allegro-static liballegro_static allegro_static)
+FIND_LIBRARY(Allegro5_LIBRARY NAMES ${Allegro5_NAMES})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5 DEFAULT_MSG ALLEGRO5_LIBRARY ALLEGRO5_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5 DEFAULT_MSG Allegro5_LIBRARY Allegro5_INCLUDE_DIR)
 
-IF(ALLEGRO5_FOUND)
-	SET(ALLEGRO5_LIBRARIES ${ALLEGRO5_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_LIBRARIES})
-	get_filename_component(ALLEGRO5_DIRECTORY ${ALLEGRO5_LIBRARY} PATH)
-ENDIF(ALLEGRO5_FOUND)
+IF(Allegro5_FOUND)
+	SET(Allegro5_LIBRARIES ${Allegro5_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5_LIBRARIES})
+	get_filename_component(Allegro5_DIRECTORY ${Allegro5_LIBRARY} PATH)
+ENDIF(Allegro5_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_LIBRARY ALLEGRO5_INCLUDE_DIR ALLEGRO5_DIRECTORY)
+MARK_AS_ADVANCED(Allegro5_LIBRARY Allegro5_INCLUDE_DIR Allegro5_DIRECTORY)
diff --git a/cmake/FindAllegro5ACodec.cmake b/cmake/FindAllegro5ACodec.cmake
index 3125c5c..9661daf 100644
--- a/cmake/FindAllegro5ACodec.cmake
+++ b/cmake/FindAllegro5ACodec.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_ACODEC_FOUND - system has allegro5
-#  ALLEGRO5_ACODEC_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_ACODEC_LIBRARIES - Link these to use allegro5
+#  Allegro5ACodec_FOUND - system has allegro5
+#  Allegro5ACodec_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5ACodec_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_ACODEC_INCLUDE_DIR allegro5/allegro_acodec.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5ACodec_INCLUDE_DIR allegro5/allegro_acodec.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_ACODEC_NAMES ${ALLEGRO5_ACODEC_NAMES} allegro_acodec liballegro_acodec AllegroAcodec-5.2 allegro_acodec-debug allegro_acodec_static liballegro_acodec_static allegro_acodec-static)
-FIND_LIBRARY(ALLEGRO5_ACODEC_LIBRARY NAMES ${ALLEGRO5_ACODEC_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5ACodec_NAMES ${Allegro5ACodec_NAMES} allegro_acodec liballegro_acodec AllegroAcodec-5.2 allegro_acodec-debug allegro_acodec_static liballegro_acodec_static allegro_acodec-static)
+FIND_LIBRARY(Allegro5ACodec_LIBRARY NAMES ${Allegro5ACodec_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_ACODEC_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5ACodec_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_ACODEC DEFAULT_MSG ALLEGRO5_ACODEC_LIBRARY ALLEGRO5_ACODEC_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5ACodec DEFAULT_MSG Allegro5ACodec_LIBRARY Allegro5ACodec_INCLUDE_DIR)
 
-IF(ALLEGRO5_ACODEC_FOUND)
-	SET(ALLEGRO5_ACODEC_LIBRARIES ${ALLEGRO5_ACODEC_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_ACODEC_LIBRARIES})
-ENDIF(ALLEGRO5_ACODEC_FOUND)
+IF(Allegro5ACodec_FOUND)
+	SET(Allegro5ACodec_LIBRARIES ${Allegro5ACodec_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5ACodec_LIBRARIES})
+ENDIF(Allegro5ACodec_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_ACODEC_LIBRARY ALLEGRO5_ACODEC_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5ACodec_LIBRARY Allegro5ACodec_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Audio.cmake b/cmake/FindAllegro5Audio.cmake
index 244b864..d1a1c5d 100644
--- a/cmake/FindAllegro5Audio.cmake
+++ b/cmake/FindAllegro5Audio.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_AUDIO_FOUND - system has allegro5
-#  ALLEGRO5_AUDIO_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_AUDIO_LIBRARIES - Link these to use allegro5
+#  Allegro5Audio_FOUND - system has allegro5
+#  Allegro5Audio_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Audio_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_AUDIO_INCLUDE_DIR allegro5/allegro_audio.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Audio_INCLUDE_DIR allegro5/allegro_audio.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_AUDIO_NAMES ${ALLEGRO5_AUDIO_NAMES} allegro_audio liballegro_audio AllegroAudio-5.2 allegro_audio-debug allegro_audio-static liballegro_audio_static allegro_audio_static)
-FIND_LIBRARY(ALLEGRO5_AUDIO_LIBRARY NAMES ${ALLEGRO5_AUDIO_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Audio_NAMES ${Allegro5Audio_NAMES} allegro_audio liballegro_audio AllegroAudio-5.2 allegro_audio-debug allegro_audio-static liballegro_audio_static allegro_audio_static)
+FIND_LIBRARY(Allegro5Audio_LIBRARY NAMES ${Allegro5Audio_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_AUDIO_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Audio_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_AUDIO DEFAULT_MSG ALLEGRO5_AUDIO_LIBRARY ALLEGRO5_AUDIO_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Audio DEFAULT_MSG Allegro5Audio_LIBRARY Allegro5Audio_INCLUDE_DIR)
 
-IF(ALLEGRO5_AUDIO_FOUND)
-	SET(ALLEGRO5_AUDIO_LIBRARIES ${ALLEGRO5_AUDIO_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_AUDIO_LIBRARIES})
-ENDIF(ALLEGRO5_AUDIO_FOUND)
+IF(Allegro5Audio_FOUND)
+	SET(Allegro5Audio_LIBRARIES ${Allegro5Audio_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Audio_LIBRARIES})
+ENDIF(Allegro5Audio_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_AUDIO_LIBRARY ALLEGRO5_AUDIO_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Audio_LIBRARY Allegro5Audio_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Color.cmake b/cmake/FindAllegro5Color.cmake
index de555a4..e919ebe 100644
--- a/cmake/FindAllegro5Color.cmake
+++ b/cmake/FindAllegro5Color.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_COLOR_FOUND - system has allegro5
-#  ALLEGRO5_COLOR_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_COLOR_LIBRARIES - Link these to use allegro5
+#  Allegro5Color_FOUND - system has allegro5
+#  Allegro5Color_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Color_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_COLOR_INCLUDE_DIR allegro5/allegro_color.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Color_INCLUDE_DIR allegro5/allegro_color.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_COLOR_NAMES ${ALLEGRO5_COLOR_NAMES} allegro_color liballegro_color AllegroColor-5.2 allegro_color-debug allegro_color-static allegro_color_static liballegro_color_static)
-FIND_LIBRARY(ALLEGRO5_COLOR_LIBRARY NAMES ${ALLEGRO5_COLOR_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Color_NAMES ${Allegro5Color_NAMES} allegro_color liballegro_color AllegroColor-5.2 allegro_color-debug allegro_color-static allegro_color_static liballegro_color_static)
+FIND_LIBRARY(Allegro5Color_LIBRARY NAMES ${Allegro5Color_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_COLOR_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Color_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_COLOR DEFAULT_MSG ALLEGRO5_COLOR_LIBRARY ALLEGRO5_COLOR_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Color DEFAULT_MSG Allegro5Color_LIBRARY Allegro5Color_INCLUDE_DIR)
 
-IF(ALLEGRO5_COLOR_FOUND)
-	SET(ALLEGRO5_COLOR_LIBRARIES ${ALLEGRO5_COLOR_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_COLOR_LIBRARIES})
-ENDIF(ALLEGRO5_COLOR_FOUND)
+IF(Allegro5Color_FOUND)
+	SET(Allegro5Color_LIBRARIES ${Allegro5Color_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Color_LIBRARIES})
+ENDIF(Allegro5Color_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_COLOR_LIBRARY ALLEGRO5_COLOR_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Color_LIBRARY Allegro5Color_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Font.cmake b/cmake/FindAllegro5Font.cmake
index 11b55a7..3f2ea82 100644
--- a/cmake/FindAllegro5Font.cmake
+++ b/cmake/FindAllegro5Font.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_FONT_FOUND - system has allegro5
-#  ALLEGRO5_FONT_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_FONT_LIBRARIES - Link these to use allegro5
+#  Allegro5Font_FOUND - system has allegro5
+#  Allegro5Font_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Font_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_FONT_INCLUDE_DIR allegro5/allegro_font.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Font_INCLUDE_DIR allegro5/allegro_font.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_FONT_NAMES ${ALLEGRO5_FONT_NAMES} allegro_font liballegro_font AllegroFont-5.2 allegro_font-debug allegro_font_static liballegro_font_static allegro_font-static)
-FIND_LIBRARY(ALLEGRO5_FONT_LIBRARY NAMES ${ALLEGRO5_FONT_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Font_NAMES ${Allegro5Font_NAMES} allegro_font liballegro_font AllegroFont-5.2 allegro_font-debug allegro_font_static liballegro_font_static allegro_font-static)
+FIND_LIBRARY(Allegro5Font_LIBRARY NAMES ${Allegro5Font_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_FONT_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Font_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_FONT DEFAULT_MSG ALLEGRO5_FONT_LIBRARY ALLEGRO5_FONT_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Font DEFAULT_MSG Allegro5Font_LIBRARY Allegro5Font_INCLUDE_DIR)
 
-IF(ALLEGRO5_FONT_FOUND)
-	SET(ALLEGRO5_FONT_LIBRARIES ${ALLEGRO5_FONT_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_FONT_LIBRARIES})
-ENDIF(ALLEGRO5_FONT_FOUND)
+IF(Allegro5Font_FOUND)
+	SET(Allegro5Font_LIBRARIES ${Allegro5Font_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Font_LIBRARIES})
+ENDIF(Allegro5Font_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_FONT_LIBRARY ALLEGRO5_FONT_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Font_LIBRARY Allegro5Font_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Image.cmake b/cmake/FindAllegro5Image.cmake
index fc814cd..edaa023 100644
--- a/cmake/FindAllegro5Image.cmake
+++ b/cmake/FindAllegro5Image.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_IMAGE_FOUND - system has allegro5
-#  ALLEGRO5_IMAGE_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_IMAGE_LIBRARIES - Link these to use allegro5
+#  Allegro5Image_FOUND - system has allegro5
+#  Allegro5Image_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Image_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_IMAGE_INCLUDE_DIR allegro5/allegro_image.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Image_INCLUDE_DIR allegro5/allegro_image.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_IMAGE_NAMES ${ALLEGRO5_IMAGE_NAMES} allegro_image liballegro_image AllegroImage-5.2 allegro_image-debug allegro_image-static liballegro_image_static allegro_image_static)
-FIND_LIBRARY(ALLEGRO5_IMAGE_LIBRARY NAMES ${ALLEGRO5_IMAGE_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Image_NAMES ${Allegro5Image_NAMES} allegro_image liballegro_image AllegroImage-5.2 allegro_image-debug allegro_image-static liballegro_image_static allegro_image_static)
+FIND_LIBRARY(Allegro5Image_LIBRARY NAMES ${Allegro5Image_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_IMAGE_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Image_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_IMAGE DEFAULT_MSG ALLEGRO5_IMAGE_LIBRARY ALLEGRO5_IMAGE_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Image DEFAULT_MSG Allegro5Image_LIBRARY Allegro5Image_INCLUDE_DIR)
 
-IF(ALLEGRO5_IMAGE_FOUND)
-	SET(ALLEGRO5_IMAGE_LIBRARIES ${ALLEGRO5_IMAGE_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_IMAGE_LIBRARIES})
-ENDIF(ALLEGRO5_IMAGE_FOUND)
+IF(Allegro5Image_FOUND)
+	SET(Allegro5Image_LIBRARIES ${Allegro5Image_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Image_LIBRARIES})
+ENDIF(Allegro5Image_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_IMAGE_LIBRARY ALLEGRO5_IMAGE_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Image_LIBRARY Allegro5Image_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Main.cmake b/cmake/FindAllegro5Main.cmake
index 727c5ab..162cb39 100644
--- a/cmake/FindAllegro5Main.cmake
+++ b/cmake/FindAllegro5Main.cmake
@@ -1,20 +1,20 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_MAIN_FOUND - system has allegro5
-#  ALLEGRO5_MAIN_LIBRARIES - Link these to use allegro5
+#  Allegro5Main_FOUND - system has allegro5
+#  Allegro5Main_LIBRARIES - Link these to use allegro5
 #
 
-SET(ALLEGRO5_MAIN_NAMES ${ALLEGRO5_MAIN_NAMES} allegro_main allegro_main_static liballegro_main liballegro_main_static allegro_main-debug)
-FIND_LIBRARY(ALLEGRO5_MAIN_LIBRARY NAMES ${ALLEGRO5_MAIN_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Main_NAMES ${Allegro5Main_NAMES} allegro_main allegro_main_static liballegro_main liballegro_main_static allegro_main-debug)
+FIND_LIBRARY(Allegro5Main_LIBRARY NAMES ${Allegro5Main_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_MAIN_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Main_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_MAIN DEFAULT_MSG ALLEGRO5_MAIN_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Main DEFAULT_MSG Allegro5Main_LIBRARY)
 
-IF(ALLEGRO5_MAIN_FOUND)
-	SET(ALLEGRO5_MAIN_LIBRARIES ${ALLEGRO5_MAIN_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_MAIN_LIBRARIES})
-ENDIF(ALLEGRO5_MAIN_FOUND)
+IF(Allegro5Main_FOUND)
+	SET(Allegro5Main_LIBRARIES ${Allegro5Main_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Main_LIBRARIES})
+ENDIF(Allegro5Main_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_MAIN_LIBRARY )
+MARK_AS_ADVANCED(Allegro5Main_LIBRARY )
diff --git a/cmake/FindAllegro5Primitives.cmake b/cmake/FindAllegro5Primitives.cmake
index 0a36bf4..fd28d66 100644
--- a/cmake/FindAllegro5Primitives.cmake
+++ b/cmake/FindAllegro5Primitives.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_PRIMITIVES_FOUND - system has allegro5
-#  ALLEGRO5_PRIMITIVES_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_PRIMITIVES_LIBRARIES - Link these to use allegro5
+#  Allegro5Primitives_FOUND - system has allegro5
+#  Allegro5Primitives_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Primitives_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_PRIMITIVES_INCLUDE_DIR allegro5/allegro_primitives.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Primitives_INCLUDE_DIR allegro5/allegro_primitives.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_PRIMITIVES_NAMES ${ALLEGRO5_PRIMITIVES_NAMES} allegro_primitives liballegro_primitives AllegroPrimitives-5.2 allegro_primitives-debug allegro_primitives-static allegro_primitives_static liballegro_primitives_static)
-FIND_LIBRARY(ALLEGRO5_PRIMITIVES_LIBRARY NAMES ${ALLEGRO5_PRIMITIVES_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Primitives_NAMES ${Allegro5Primitives_NAMES} allegro_primitives liballegro_primitives AllegroPrimitives-5.2 allegro_primitives-debug allegro_primitives-static allegro_primitives_static liballegro_primitives_static)
+FIND_LIBRARY(Allegro5Primitives_LIBRARY NAMES ${Allegro5Primitives_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_PRIMITIVES_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Primitives_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_PRIMITIVES DEFAULT_MSG ALLEGRO5_PRIMITIVES_LIBRARY ALLEGRO5_PRIMITIVES_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Primitives DEFAULT_MSG Allegro5Primitives_LIBRARY Allegro5Primitives_INCLUDE_DIR)
 
-IF(ALLEGRO5_PRIMITIVES_FOUND)
-	SET(ALLEGRO5_PRIMITIVES_LIBRARIES ${ALLEGRO5_PRIMITIVES_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_PRIMITIVES_LIBRARIES})
-ENDIF(ALLEGRO5_PRIMITIVES_FOUND)
+IF(Allegro5Primitives_FOUND)
+	SET(Allegro5Primitives_LIBRARIES ${Allegro5Primitives_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Primitives_LIBRARIES})
+ENDIF(Allegro5Primitives_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_PRIMITIVES_LIBRARY ALLEGRO5_PRIMITIVES_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Primitives_LIBRARY Allegro5Primitives_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5TTF.cmake b/cmake/FindAllegro5TTF.cmake
index 53a64ff..89c14ca 100644
--- a/cmake/FindAllegro5TTF.cmake
+++ b/cmake/FindAllegro5TTF.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_TTF_FOUND - system has allegro5
-#  ALLEGRO5_TTF_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_TTF_LIBRARIES - Link these to use allegro5
+#  Allegro5TTF_FOUND - system has allegro5
+#  Allegro5TTF_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5TTF_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_TTF_INCLUDE_DIR allegro5/allegro_ttf.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5TTF_INCLUDE_DIR allegro5/allegro_ttf.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_TTF_NAMES ${ALLEGRO5_TTF_NAMES} allegro_ttf  liballegro_ttf AllegroTTF-5.2 allegro_ttf-debug allegro_ttf-static allegro_ttf_static liballegro_ttf_static)
-FIND_LIBRARY(ALLEGRO5_TTF_LIBRARY NAMES ${ALLEGRO5_TTF_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5TTF_NAMES ${Allegro5TTF_NAMES} allegro_ttf  liballegro_ttf AllegroTTF-5.2 allegro_ttf-debug allegro_ttf-static allegro_ttf_static liballegro_ttf_static)
+FIND_LIBRARY(Allegro5TTF_LIBRARY NAMES ${Allegro5TTF_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_TTF_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5TTF_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_TTF DEFAULT_MSG ALLEGRO5_TTF_LIBRARY ALLEGRO5_TTF_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5TTF DEFAULT_MSG Allegro5TTF_LIBRARY Allegro5TTF_INCLUDE_DIR)
 
-IF(ALLEGRO5_TTF_FOUND)
-	SET(ALLEGRO5_TTF_LIBRARIES ${ALLEGRO5_TTF_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_TTF_LIBRARIES})
-ENDIF(ALLEGRO5_TTF_FOUND)
+IF(Allegro5TTF_FOUND)
+	SET(Allegro5TTF_LIBRARIES ${Allegro5TTF_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5TTF_LIBRARIES})
+ENDIF(Allegro5TTF_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_TTF_LIBRARY ALLEGRO5_TTF_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5TTF_LIBRARY Allegro5TTF_INCLUDE_DIR )
diff --git a/cmake/FindAllegro5Video.cmake b/cmake/FindAllegro5Video.cmake
index 937a746..2186bce 100644
--- a/cmake/FindAllegro5Video.cmake
+++ b/cmake/FindAllegro5Video.cmake
@@ -1,23 +1,23 @@
 # Try to find allegro 5
 #
-#  ALLEGRO5_VIDEO_FOUND - system has allegro5
-#  ALLEGRO5_VIDEO_INCLUDE_DIR - the allrgo5 include directory
-#  ALLEGRO5_VIDEO_LIBRARIES - Link these to use allegro5
+#  Allegro5Video_FOUND - system has allegro5
+#  Allegro5Video_INCLUDE_DIR - the allrgo5 include directory
+#  Allegro5Video_LIBRARIES - Link these to use allegro5
 #
 
-FIND_PATH(ALLEGRO5_VIDEO_INCLUDE_DIR allegro5/allegro_video.h HINTS ${ALLEGRO5_INCLUDE_DIR})
+FIND_PATH(Allegro5Video_INCLUDE_DIR allegro5/allegro_video.h HINTS ${Allegro5_INCLUDE_DIR})
 
-SET(ALLEGRO5_VIDEO_NAMES ${ALLEGRO5_VIDEO_NAMES} allegro_video liballegro_video AllegroVideo-5.2 allegro_video-debug allegro_video-static allegro_video_static liballegro_video_static)
-FIND_LIBRARY(ALLEGRO5_VIDEO_LIBRARY NAMES ${ALLEGRO5_VIDEO_NAMES} HINTS ${ALLEGRO5_DIRECTORY})
+SET(Allegro5Video_NAMES ${Allegro5Video_NAMES} allegro_video liballegro_video AllegroVideo-5.2 allegro_video-debug allegro_video-static allegro_video_static liballegro_video_static)
+FIND_LIBRARY(Allegro5Video_LIBRARY NAMES ${Allegro5Video_NAMES} HINTS ${Allegro5_DIRECTORY})
 
-# handle the QUIETLY and REQUIRED arguments and set ALLEGRO5_VIDEO_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set Allegro5Video_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALLEGRO5_VIDEO DEFAULT_MSG ALLEGRO5_VIDEO_LIBRARY ALLEGRO5_VIDEO_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Allegro5Video DEFAULT_MSG Allegro5Video_LIBRARY Allegro5Video_INCLUDE_DIR)
 
-IF(ALLEGRO5_VIDEO_FOUND)
-	SET(ALLEGRO5_VIDEO_LIBRARIES ${ALLEGRO5_VIDEO_LIBRARY})
-	SET(ALLEGRO5_LIBS ${ALLEGRO5_LIBS} ${ALLEGRO5_VIDEO_LIBRARIES})
-ENDIF(ALLEGRO5_VIDEO_FOUND)
+IF(Allegro5Video_FOUND)
+	SET(Allegro5Video_LIBRARIES ${Allegro5Video_LIBRARY})
+	SET(Allegro5_LIBS ${Allegro5_LIBS} ${Allegro5Video_LIBRARIES})
+ENDIF(Allegro5Video_FOUND)
 
-MARK_AS_ADVANCED(ALLEGRO5_VIDEO_LIBRARY ALLEGRO5_VIDEO_INCLUDE_DIR )
+MARK_AS_ADVANCED(Allegro5Video_LIBRARY Allegro5Video_INCLUDE_DIR )
diff --git a/cmake/libsuperderpy-src.cmake b/cmake/libsuperderpy-src.cmake
index fae9048..aa79a1b 100644
--- a/cmake/libsuperderpy-src.cmake
+++ b/cmake/libsuperderpy-src.cmake
@@ -19,7 +19,7 @@ endif(APPLE)
 add_libsuperderpy_target("${EXECUTABLE_SRC_LIST}")
 target_link_libraries(${EXECUTABLE} "lib${LIBSUPERDERPY_GAMENAME}")
 if (APPLE)
-	target_link_libraries(${EXECUTABLE} ${ALLEGRO5_MAIN_LIBRARIES})
+	target_link_libraries(${EXECUTABLE} ${Allegro5Main_LIBRARIES})
 endif(APPLE)
 install(TARGETS ${EXECUTABLE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${BIN_DIR})
 
diff --git a/cmake/libsuperderpy.cmake b/cmake/libsuperderpy.cmake
index 2769a14..dafecbe 100644
--- a/cmake/libsuperderpy.cmake
+++ b/cmake/libsuperderpy.cmake
@@ -311,16 +311,16 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
 	endif()
 
 	if (LIBSUPERDERPY_EMBEDDED_ALLEGRO)
-		set(ALLEGRO5_LIBRARIES "allegro")
-		set(ALLEGRO5_FONT_LIBRARIES "allegro_font")
-		set(ALLEGRO5_TTF_LIBRARIES "allegro_ttf")
-		set(ALLEGRO5_PRIMITIVES_LIBRARIES "allegro_primitives")
-		set(ALLEGRO5_AUDIO_LIBRARIES "allegro_audio")
-		set(ALLEGRO5_ACODEC_LIBRARIES "allegro_acodec")
-		set(ALLEGRO5_IMAGE_LIBRARIES "allegro_image")
-		set(ALLEGRO5_COLOR_LIBRARIES "allegro_color")
-		set(ALLEGRO5_VIDEO_LIBRARIES "allegro_video")
-		set(ALLEGRO5_MAIN_LIBRARIES "allegro_main")
+		set(Allegro5_LIBRARIES "allegro")
+		set(Allegro5Font_LIBRARIES "allegro_font")
+		set(Allegro5TTF_LIBRARIES "allegro_ttf")
+		set(Allegro5Primitives_LIBRARIES "allegro_primitives")
+		set(Allegro5Audio_LIBRARIES "allegro_audio")
+		set(Allegro5ACodec_LIBRARIES "allegro_acodec")
+		set(Allegro5Image_LIBRARIES "allegro_image")
+		set(Allegro5Color_LIBRARIES "allegro_color")
+		set(Allegro5Video_LIBRARIES "allegro_video")
+		set(Allegro5Main_LIBRARIES "allegro_main")
 		include_directories("${LIBSUPERDERPY_DIR}/src/3rdparty/allegro5/include")
 		include_directories("${LIBSUPERDERPY_DIR}/src/3rdparty/allegro5/addons/font")
 		include_directories("${LIBSUPERDERPY_DIR}/src/3rdparty/allegro5/addons/ttf")
@@ -346,7 +346,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
 		endif(APPLE)
 	endif()
 
-	include_directories(${ALLEGRO5_INCLUDE_DIR} ${ALLEGRO5_FONT_INCLUDE_DIR} ${ALLEGRO5_TTF_INCLUDE_DIR} ${ALLEGRO5_PRIMITIVES_INCLUDE_DIR} ${ALLEGRO5_AUDIO_INCLUDE_DIR} ${ALLEGRO5_ACODEC_INCLUDE_DIR} ${ALLEGRO5_VIDEO_INCLUDE_DIR} ${ALLEGRO5_IMAGE_INCLUDE_DIR} ${ALLEGRO5_COLOR_INCLUDE_DIR})
+	include_directories(${Allegro5_INCLUDE_DIR} ${Allegro5Font_INCLUDE_DIR} ${Allegro5TTF_INCLUDE_DIR} ${Allegro5Primitives_INCLUDE_DIR} ${Allegro5Audio_INCLUDE_DIR} ${Allegro5Acodec_INCLUDE_DIR} ${Allegro5Video_INCLUDE_DIR} ${Allegro5Image_INCLUDE_DIR} ${Allegro5Color_INCLUDE_DIR})
 
 	MACRO(register_gamestate name sources)
 
@@ -547,7 +547,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
 			add_custom_target(${LIBSUPERDERPY_GAMENAME}_js
 				DEPENDS ${LIBSUPERDERPY_GAMENAME}_install ${LIBSUPERDERPY_GAMENAME}_flac_to_lossy ${LIBSUPERDERPY_GAMENAME}_img_to_webp ${CMAKE_BINARY_DIR}/emscripten-imports.json
 				WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}"
-				COMMAND "${CMAKE_C_COMPILER}" ${CFLAGS_LIST} ../${BIN_DIR}/${LIBSUPERDERPY_GAMENAME}${CMAKE_EXECUTABLE_SUFFIX} ../lib/libsuperderpy${CMAKE_SHARED_LIBRARY_SUFFIX} ../lib/lib${LIBSUPERDERPY_GAMENAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${ALLEGRO5_LIBS} ${EMSCRIPTEN_FLAGS} -o ${LIBSUPERDERPY_GAMENAME}.html --pre-js ${LIBSUPERDERPY_DIR}/src/emscripten-pre-js.js --preload-file ../${SHARE_DIR}/${LIBSUPERDERPY_GAMENAME}/data@/data --preload-file gamestates@/
+				COMMAND "${CMAKE_C_COMPILER}" ${CFLAGS_LIST} ../${BIN_DIR}/${LIBSUPERDERPY_GAMENAME}${CMAKE_EXECUTABLE_SUFFIX} ../lib/libsuperderpy${CMAKE_SHARED_LIBRARY_SUFFIX} ../lib/lib${LIBSUPERDERPY_GAMENAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${Allegro5_LIBS} ${EMSCRIPTEN_FLAGS} -o ${LIBSUPERDERPY_GAMENAME}.html --pre-js ${LIBSUPERDERPY_DIR}/src/emscripten-pre-js.js --preload-file ../${SHARE_DIR}/${LIBSUPERDERPY_GAMENAME}/data@/data --preload-file gamestates@/
 				USES_TERMINAL
 				VERBATIM
 				)
@@ -583,12 +583,12 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
 		configure_android_file("local.properties")
 		configure_android_file("app/build.gradle")
 		configure_android_file("app/src/main/res/values/strings.xml")
-		if (ALLEGRO5_LIBRARIES MATCHES "^.*-debug.*$")
+		if (Allegro5_LIBRARIES MATCHES "^.*-debug.*$")
 			set(ALLEGRO_DEBUG_SUFFIX "-debug")
 		endif()
 		configure_android_file("app/src/main/java/net/dosowisko/libsuperderpy/Activity.java")
 
-		file(COPY ${ALLEGRO5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
+		file(COPY ${Allegro5_LIBS} DESTINATION ${LIBRARY_OUTPUT_PATH})
 		configure_file("${ANDROID_ALLEGRO_ROOT}/lib/allegro-release.aar" ${CMAKE_BINARY_DIR}/android/app/libs/allegro.aar COPYONLY)
 
 		file(COPY "${CMAKE_SOURCE_DIR}/data" DESTINATION "${CMAKE_BINARY_DIR}/android/app/src/main/assets/" PATTERN "stuff" EXCLUDE
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cac8dcb..7ced5a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,7 @@ if (NOT LIBSUPERDERPY_STATIC_GAMESTATES)
 	target_link_libraries("libsuperderpy" dl)
 endif()
 
-target_link_libraries("libsuperderpy" ${ALLEGRO5_TTF_LIBRARIES} ${ALLEGRO5_FONT_LIBRARIES} ${ALLEGRO5_PRIMITIVES_LIBRARIES} ${ALLEGRO5_ACODEC_LIBRARIES} ${ALLEGRO5_AUDIO_LIBRARIES} ${ALLEGRO5_VIDEO_LIBRARIES} ${ALLEGRO5_COLOR_LIBRARIES} ${ALLEGRO5_IMAGE_LIBRARIES} ${ALLEGRO5_LIBRARIES} m)
+target_link_libraries("libsuperderpy" ${Allegro5TTF_LIBRARIES} ${Allegro5Font_LIBRARIES} ${Allegro5Primitives_LIBRARIES} ${Allegro5ACodec_LIBRARIES} ${Allegro5Audio_LIBRARIES} ${Allegro5Video_LIBRARIES} ${Allegro5Color_LIBRARIES} ${Allegro5Image_LIBRARIES} ${Allegro5_LIBRARIES} m)
 
 if (LIBSUPERDERPY_IMGUI)
 	target_link_libraries("libsuperderpy" cimgui)