diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5a68f5322a0092917124e0ab5ce49caba09cfcda..0ed3b94802fca65ba4312b0ba57852e75ce7dd61 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,17 +4,17 @@
 
 ### tools
 SET(tools
-	test_shell
+	sot-shell
 )
 
 ### Configure shell launch script
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/shell.sh.cmake
-			${${PROJECT_NAME}_BINARY_DIR}/tools/shell.sh)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sot-shell-plugin.sh.cmake
+	       ${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin.sh)
 INSTALL(
 	FILES
-		${${PROJECT_NAME}_BINARY_DIR}/tools/shell.sh
+		${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin.sh
 	DESTINATION
-		 bin/${PROJECT_NAME}
+		 bin
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                       GROUP_EXECUTE GROUP_READ )
 
@@ -39,6 +39,5 @@ FOREACH(tool_name ${tools})
 		TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl)
 	ENDIF(UNIX)
 	  
-	INSTALL(TARGETS ${tool_name}
-		DESTINATION bin/${PROJECT_NAME})
-ENDFOREACH(tool_name)
\ No newline at end of file
+	INSTALL(TARGETS ${tool_name} DESTINATION bin)
+ENDFOREACH(tool_name)
diff --git a/tools/shell.sh.cmake b/tools/sot-shell-plugin.sh.cmake
similarity index 77%
rename from tools/shell.sh.cmake
rename to tools/sot-shell-plugin.sh.cmake
index a01b0d6ac20197d1e0e3e2ea3a65e3ee037c0621..73ae865c4d2387a90f7bfc997680b986f6071a0b 100644
--- a/tools/shell.sh.cmake
+++ b/tools/sot-shell-plugin.sh.cmake
@@ -2,4 +2,4 @@
 echo "-- Launching dynamic-graph C shell with default plugins"
 echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-functions.so" > /tmp/default_script
 echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-procedure.so" >> /tmp/default_script
-${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}/test_shell /tmp/default_script
+${CMAKE_INSTALL_PREFIX}/bin/sot-shell /tmp/default_script
diff --git a/tools/test_shell.cpp b/tools/sot-shell.cpp
similarity index 100%
rename from tools/test_shell.cpp
rename to tools/sot-shell.cpp