diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 8ffeba6a52871439ed65091bf0e5d6dfed1cfd92..957fce33fcfd8da20c442c64d44ce856c6e94c8c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -28,6 +28,7 @@ signal.t.cpp
 time-dependency.h
 time-dependency.t.cpp
 signal-caster.h
+all-signals.h
 )
 
 # Recreate correct path for the headers
diff --git a/include/dynamic-graph/signal-base.h b/include/dynamic-graph/signal-base.h
index 583c27874c77e81dbee13b7605297e54e28848e4..dc7d8167c4f0572d895f399a7401bbf6ede85f4a 100644
--- a/include/dynamic-graph/signal-base.h
+++ b/include/dynamic-graph/signal-base.h
@@ -109,7 +109,7 @@ class SignalBase : public boost::noncopyable
       }
   /* --- SET ---------------------------------------------------------------- */
 
-  /* Generic set function. Should be reimplemented by the specific sotSignal.
+  /* Generic set function. Should be reimplemented by the specific Signal.
    */
   virtual void set( std::istringstream& value ) 
       { DG_THROW ExceptionSignal( ExceptionSignal::SET_IMPOSSIBLE,
diff --git a/include/dynamic-graph/signal-ptr.t.cpp b/include/dynamic-graph/signal-ptr.t.cpp
index 73da85fc278bc305cfff7c223ab4d6633fffbcab..4763128256425633cbe64c9387fa6c597466c1c4 100644
--- a/include/dynamic-graph/signal-ptr.t.cpp
+++ b/include/dynamic-graph/signal-ptr.t.cpp
@@ -46,7 +46,7 @@ getPtr ( void )
   dgTDEBUGIN(25);
   if(! isPluged() )
     DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
-				  "In sotSignalPtr: SIN ptr not set.",
+				  "In SignalPtr: SIN ptr not set.",
 				  " (in signal <%s>)",getName().c_str());
   dgTDEBUGOUT(25);
   return signalPtr; 
@@ -61,7 +61,7 @@ getPtr ( void ) const
   dgTDEBUGIN(25);
   if(! isPluged() )
     { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
-				    "In sotSignalPtr: SIN ptr not set.",
+				    "In SignalPtr: SIN ptr not set.",
 				    " (in signal <%s>)",getName().c_str()); }
   dgTDEBUGOUT(25);
   return signalPtr; 
@@ -73,7 +73,7 @@ getAbstractPtr ( void )
 {
   if(! isAbstractPluged() )
     { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
-				    "In sotSignalPtr: SIN ptr not set.",
+				    "In SignalPtr: SIN ptr not set.",
 				    " (in signal <%s>)",getName().c_str()); }
   if( NULL!=signalPtr ) return signalPtr;
   else return abstractTransmitter;
@@ -85,7 +85,7 @@ getAbstractPtr ( void ) const
 {
   if(! isAbstractPluged() )
     { DG_THROW ExceptionSignal( ExceptionSignal::NOT_INITIALIZED,
-				    "In sotSignalPtr: SIN ptr not set.",
+				    "In SignalPtr: SIN ptr not set.",
 				    " (in signal <%s>)",getName().c_str()); }
   if( NULL!=signalPtr ) return signalPtr;
   else return abstractTransmitter;
@@ -232,7 +232,7 @@ display( std::ostream& os ) const
     {
       // 	    dgTDEBUG(25) << "Display pointed."<<std::endl;
       // 	    getPtr()->display(os<<"PTR->"); 
-      os << " -->-- PLUGED";
+      os << " -->-- PLUGGED";
     }
   else 
     { 
diff --git a/include/dynamic-graph/signal.t.cpp b/include/dynamic-graph/signal.t.cpp
index 9286e40244c86bb8bc82cef485c3d1b702b4014b..f6859b97518b83a2200294f5185100dac2bf52e9 100644
--- a/include/dynamic-graph/signal.t.cpp
+++ b/include/dynamic-graph/signal.t.cpp
@@ -2,7 +2,7 @@
  * Copyright Projet JRL-Japan, 2007
  *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  *
- * File:      sotSignal.t.cpp
+ * File:      Signal.t.cpp
  * Project:   SOT
  * Author:    Nicolas Mansard
  *
diff --git a/src/signal/signal-array.cpp b/src/signal/signal-array.cpp
index bd7f5c524ae7d26753656381e5db2b9065d0ab4c..6b3604c1525ec6ea149cb605a67f7dab0af5c6ee 100644
--- a/src/signal/signal-array.cpp
+++ b/src/signal/signal-array.cpp
@@ -2,7 +2,7 @@
  * Copyright Projet JRL-Japan, 2007
  *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  *
- * File:      sotSignalArray.cpp
+ * File:      SignalArray.cpp
  * Project:   SOT
  * Author:    Nicolas Mansard
  *
diff --git a/unitTesting/test_depend.cpp b/unitTesting/test_depend.cpp
index f8b10f59a38bc6489bb77d04a9bb735b395ca5a0..6f0bb2853936d99ff4687a516d4c5c078718ee39 100644
--- a/unitTesting/test_depend.cpp
+++ b/unitTesting/test_depend.cpp
@@ -21,7 +21,7 @@
 /* -------------------------------------------------------------------------- */
 /* --- INCLUDES ------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
-// #include <sot/sotSignal.h>
+// #include <dynamic-graph/all-signals.h>
 #include <dynamic-graph/signal.h>
 #include <dynamic-graph/signal-time-dependant.h>
 //#include <sot/TimeDependancy.h>
@@ -111,7 +111,7 @@ int main( void )
 					   sig2<<sig3,"Sig1");
 
 //    cout << "--- Test Array ------ "<<endl;
-//    sotSignalArray<int> tarr(12);
+//    SignalArray<int> tarr(12);
 //    tarr<<sig3<<sig2;//+sig2+sig3;
 //    dispArray(sig4<<sig2<<sig3);
 //    dispArray(tarr);