diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d4f065..7ba6319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ include_directories(
 )
 
 set(SOURCES
-    ${CMAKE_CURRENT_LIST_DIR}/wakaama-client.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/object_security.c
-    ${CMAKE_CURRENT_LIST_DIR}/object_server.c
-    ${CMAKE_CURRENT_LIST_DIR}/object_device.c
-    ${CMAKE_CURRENT_LIST_DIR}/test_object.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/wakaama-client.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_security.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_server.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/object_device.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/test_object.c
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES})
diff --git a/src/wakaama-client.h b/src/wakaama-client.h
index 36c6e0d..90e463a 100644
--- a/src/wakaama-client.h
+++ b/src/wakaama-client.h
@@ -39,7 +39,7 @@ public:
 private:
     const char * uri;
     const uint16_t localPort = 56830;
-    const char * name = "arduino_wakaama_client";
+    const char * name = "wakaama_device";
     time_t step_delay = 60;
     int result;