--- a/libclient/CMakeLists.txt	Fri Dec 16 16:26:31 2016 +0100
+++ b/libclient/CMakeLists.txt	Fri Dec 16 16:37:08 2016 +0100
@@ -16,53 +16,53 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-project(libclient)
+project(libmlk-client)
 
 set(
     HEADERS
-    ${libclient_SOURCE_DIR}/malikania/animation.hpp
-    ${libclient_SOURCE_DIR}/malikania/animator.hpp
-    ${libclient_SOURCE_DIR}/malikania/button.hpp
-    ${libclient_SOURCE_DIR}/malikania/color.hpp
-    ${libclient_SOURCE_DIR}/malikania/font.hpp
-    ${libclient_SOURCE_DIR}/malikania/frame.hpp
-#    ${libclient_SOURCE_DIR}/malikania/grid_layout.hpp
-    ${libclient_SOURCE_DIR}/malikania/image.hpp
-    ${libclient_SOURCE_DIR}/malikania/key.hpp
-    ${libclient_SOURCE_DIR}/malikania/layout.hpp
-    ${libclient_SOURCE_DIR}/malikania/line.hpp
-    ${libclient_SOURCE_DIR}/malikania/mouse.hpp
-    ${libclient_SOURCE_DIR}/malikania/point.hpp
-    ${libclient_SOURCE_DIR}/malikania/rectangle.hpp
-    ${libclient_SOURCE_DIR}/malikania/size.hpp
-    ${libclient_SOURCE_DIR}/malikania/sprite.hpp
-    ${libclient_SOURCE_DIR}/malikania/theme.hpp
-    ${libclient_SOURCE_DIR}/malikania/unique_layout.hpp
-    ${libclient_SOURCE_DIR}/malikania/widget.hpp
-    ${libclient_SOURCE_DIR}/malikania/window.hpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/font_backend.hpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/image_backend.hpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/window_backend.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/animation.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/animator.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/button.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/color.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/font.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/frame.hpp
+#    ${libmlk-client_SOURCE_DIR}/malikania/grid_layout.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/image.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/key.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/layout.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/line.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/mouse.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/point.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/rectangle.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/size.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/sprite.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/theme.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/unique_layout.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/widget.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/window.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/font_backend.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/image_backend.hpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/window_backend.hpp
 )
 
 set(
     SOURCES
-    ${libclient_SOURCE_DIR}/malikania/animator.cpp
-    ${libclient_SOURCE_DIR}/malikania/button.cpp
-    ${libclient_SOURCE_DIR}/malikania/client_resources_loader.cpp
-    ${libclient_SOURCE_DIR}/malikania/color.cpp
-    ${libclient_SOURCE_DIR}/malikania/font.cpp
-    ${libclient_SOURCE_DIR}/malikania/frame.cpp
-#    ${libclient_SOURCE_DIR}/malikania/grid_layout.cpp
-    ${libclient_SOURCE_DIR}/malikania/image.cpp
-    ${libclient_SOURCE_DIR}/malikania/sprite.cpp
-    ${libclient_SOURCE_DIR}/malikania/theme.cpp
-    ${libclient_SOURCE_DIR}/malikania/unique_layout.cpp
-    ${libclient_SOURCE_DIR}/malikania/widget.cpp
-    ${libclient_SOURCE_DIR}/malikania/window.cpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/font_backend.cpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/image_backend.cpp
-    ${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/window_backend.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/animator.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/button.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/client_resources_loader.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/color.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/font.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/frame.cpp
+#    ${libmlk-client_SOURCE_DIR}/malikania/grid_layout.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/image.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/sprite.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/theme.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/unique_layout.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/widget.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/window.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/font_backend.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/image_backend.cpp
+    ${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}/window_backend.cpp
 )
 
 if (WITH_BACKEND MATCHES "SDL")
@@ -87,13 +87,13 @@
 endif ()
 
 malikania_define_library(
-    PROJECT libclient
-    TARGET libclient
+    PROJECT libmlk-client
+    TARGET libmlk-client
     SOURCES ${HEADERS} ${SOURCES}
-    ASSETS ${libclient_SOURCE_DIR}/assets/dejavu_sans.ttf
+    ASSETS ${libmlk-client_SOURCE_DIR}/assets/dejavu_sans.ttf
     PUBLIC_INCLUDES
-        $<BUILD_INTERFACE:${libclient_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}>
-        $<BUILD_INTERFACE:${libclient_SOURCE_DIR}/malikania>
+        $<BUILD_INTERFACE:${libmlk-client_SOURCE_DIR}/malikania/${WITH_BACKEND_DIR}>
+        $<BUILD_INTERFACE:${libmlk-client_SOURCE_DIR}/malikania>
         ${INCLUDES}
-    LIBRARIES libcommon ${LIBRARIES}
+    LIBRARIES libmlk-common ${LIBRARIES}
 )