--- a/libcommon/CMakeLists.txt	Sun Nov 27 20:50:38 2016 +0100
+++ b/libcommon/CMakeLists.txt	Tue Nov 29 21:21:36 2016 +0100
@@ -18,28 +18,26 @@
 
 set(
     HEADERS
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/duktape.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/game.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/id.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_loader.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_locator.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.hpp
 )
 
 set(
     SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/application.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources-locator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_loader.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/malikania/resources_locator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/malikania/util.cpp
 )
 
 if (WITH_BACKEND_SDL)
     find_package(SDL2 REQUIRED)
 
-    list(APPEND HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/common-sdl.hpp)
-    list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/common-sdl.cpp)
+    list(APPEND HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/sdl_util.hpp)
+    list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/backend/sdl/sdl_util.cpp)
     list(APPEND INCLUDES ${SDL2_INCLUDE_DIRS})
     list(APPEND LIBRARIES ${SDL2_LIBRARIES})
 endif ()