diff --git a/trunk/paradiseo-peo/src/peo.h b/trunk/paradiseo-peo/src/peo.h
index 6f0e8656d..82db1685e 100644
--- a/trunk/paradiseo-peo/src/peo.h
+++ b/trunk/paradiseo-peo/src/peo.h
@@ -38,7 +38,7 @@
 #define __peo_h_
 
 #include <eo>
-#include <mo>
+#include <oldmo>
 #include <moeo>
 
 /** @mainpage Welcome to Paradiseo-PEO
diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index aea1b61d2..02670c43e 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -12,6 +12,7 @@
 
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${ParadisEO-PEO_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt
index f0ec4db08..05c8f13c9 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson1/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson1/Move.h b/trunk/paradiseo-peo/tutorial/Lesson1/Move.h
index e4bd93d4b..da6049a80 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson1/Move.h
+++ b/trunk/paradiseo-peo/tutorial/Lesson1/Move.h
@@ -37,7 +37,7 @@
 #ifndef MOVE_H
 #define MOVE_H
 
-#include <mo.h>
+#include <oldmo.h>
 
 
 class ProblemEval : public eoEvalFunc <Problem> {
diff --git a/trunk/paradiseo-peo/tutorial/Lesson1/main.cpp b/trunk/paradiseo-peo/tutorial/Lesson1/main.cpp
index ee7ca2963..f56aa6208 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson1/main.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson1/main.cpp
@@ -34,7 +34,7 @@
   Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <mo>
+#include <oldmo>
 #include <peo>
 #include <time.h>
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt
index 1400378af..122564c7b 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson2/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt
index 734ef0a4f..3cc47091b 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson3/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson3/Move.h b/trunk/paradiseo-peo/tutorial/Lesson3/Move.h
index 9cced6655..d1188a65b 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson3/Move.h
+++ b/trunk/paradiseo-peo/tutorial/Lesson3/Move.h
@@ -37,7 +37,7 @@
 #ifndef MOVE_H
 #define MOVE_H
 
-#include <mo.h>
+#include <oldmo.h>
 #include <eo>
 #include "QAP.h"
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson3/main.cpp b/trunk/paradiseo-peo/tutorial/Lesson3/main.cpp
index bd65f38b4..1cba7e282 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson3/main.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson3/main.cpp
@@ -40,7 +40,7 @@
  * 
  */ 
 
-#include <mo>
+#include <oldmo>
 #include <peo>
 #include <string>
 #include "QAP.h"
diff --git a/trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt
index 1a5eb4b57..b4ab76bce 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson4/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src  ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson4/Move.h b/trunk/paradiseo-peo/tutorial/Lesson4/Move.h
index 9cced6655..d1188a65b 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson4/Move.h
+++ b/trunk/paradiseo-peo/tutorial/Lesson4/Move.h
@@ -37,7 +37,7 @@
 #ifndef MOVE_H
 #define MOVE_H
 
-#include <mo.h>
+#include <oldmo.h>
 #include <eo>
 #include "QAP.h"
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson4/main.cpp b/trunk/paradiseo-peo/tutorial/Lesson4/main.cpp
index 7036bb683..ec3a8575b 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson4/main.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson4/main.cpp
@@ -40,7 +40,7 @@
  * 
  */ 
 #include <peo>
-#include <mo>
+#include <oldmo>
 #include <string>
 #include "QAP.h"
 #include "QAPGA.h"
diff --git a/trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt
index ae38df7a6..9164c63d6 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson5/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt
index 6fe110447..43cd09ef0 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Lesson6/CMakeLists.txt
@@ -38,7 +38,7 @@ EXECUTE_PROCESS(
 ### 1) Include the sources
 ######################################################################################
 
-INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MOEO_SRC_DIR}/src ${OLDMO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson6/Move.h b/trunk/paradiseo-peo/tutorial/Lesson6/Move.h
index e4bd93d4b..da6049a80 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson6/Move.h
+++ b/trunk/paradiseo-peo/tutorial/Lesson6/Move.h
@@ -37,7 +37,7 @@
 #ifndef MOVE_H
 #define MOVE_H
 
-#include <mo.h>
+#include <oldmo.h>
 
 
 class ProblemEval : public eoEvalFunc <Problem> {
diff --git a/trunk/paradiseo-peo/tutorial/Lesson6/main.cpp b/trunk/paradiseo-peo/tutorial/Lesson6/main.cpp
index f9f7401fb..f44c38b29 100755
--- a/trunk/paradiseo-peo/tutorial/Lesson6/main.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson6/main.cpp
@@ -34,7 +34,7 @@
   Contact: paradiseo-help@lists.gforge.inria.fr
 */
 
-#include <mo>
+#include <oldmo>
 #include <peo>
 #include <time.h>