diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index ed8676d992824e638ac3f9e3eb5274a5d9ea0b0b..6a7b7fe5ba8307b5469c7ecb8fe64ad3f62ce941 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -16,7 +16,7 @@ exception-factory.h
 exception-signal.h
 exception-traces.h
 
-shell-functions.h
+functions.h
 shell-procedure.h
 
 signal.h
diff --git a/include/dynamic-graph/shell-functions.h b/include/dynamic-graph/functions.h
similarity index 100%
rename from include/dynamic-graph/shell-functions.h
rename to include/dynamic-graph/functions.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9ad74a4cd73e96992de5ddfaec31876586172bcc..aaafded9c495b4521032b355329e4d04fff956c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,6 @@ INSTALL(TARGETS ${LIBRARY_NAME}
 ### Plugins
 ####################################
 SET(plugins_list
-	plugins/shell-functions
 	plugins/shell-procedure
 	debug/contiifstream
 	traces/tracer
diff --git a/src/plugins/shell-functions.cpp b/src/plugins/shell-functions.cpp
index 5c3453b47a174a588a4faf3349bf1f91ca47a5e6..0fe0943b6159665fb2b11bd9c74158003dc4aed8 100644
--- a/src/plugins/shell-functions.cpp
+++ b/src/plugins/shell-functions.cpp
@@ -17,7 +17,7 @@
  *
  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 
-#include <dynamic-graph/shell-functions.h>
+#include <dynamic-graph/functions.h>
 #include <dynamic-graph/plugin-loader.h>
 #include <dynamic-graph/factory.h>
 #include <dynamic-graph/debug.h>
diff --git a/src/shell/functions.cpp b/src/shell/functions.cpp
index c325e3806bf69b75dc2bb818d9ec55b2ca174855..c6ae2f79e33cb35556250bcc894b996959995993 100644
--- a/src/shell/functions.cpp
+++ b/src/shell/functions.cpp
@@ -17,7 +17,7 @@
  *
  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 
-#include <dynamic-graph/shell-functions.h>
+#include <dynamic-graph/functions.h>
 #include <dynamic-graph/plugin-loader.h>
 #include <dynamic-graph/factory.h>
 #include <dynamic-graph/debug.h>
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 04b73981ecf749671fcc1f5f4b6d061796565902..bf1bd7d28b8b77f64b3e3608682ac149a180afe4 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -21,7 +21,7 @@ FOREACH(test_name ${tests})
 	)
 
 	LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
-
+	
 	TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
 	  ${PROJECT_NAME})