diff --git a/trunk/paradiseo-peo/tutorial/Lesson1/Lesson1.pdf b/trunk/paradiseo-peo/tutorial/Lesson1/Lesson1.pdf
index 959f64869..5f6b05a6d 100644
Binary files a/trunk/paradiseo-peo/tutorial/Lesson1/Lesson1.pdf and b/trunk/paradiseo-peo/tutorial/Lesson1/Lesson1.pdf differ
diff --git a/trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp b/trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp
index 75d9a1abc..ac53c2970 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson1/mainPSO.cpp
@@ -98,7 +98,7 @@ int main (int __argc, char *__argv[])
    */
 
 // For a parallel evaluation
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
   peoParaPopEval< Indi > eval(plainEval);
 
 
diff --git a/trunk/paradiseo-peo/tutorial/Lesson3/Lesson3.pdf b/trunk/paradiseo-peo/tutorial/Lesson3/Lesson3.pdf
index 5b1d9d443..1f5d54e07 100644
Binary files a/trunk/paradiseo-peo/tutorial/Lesson3/Lesson3.pdf and b/trunk/paradiseo-peo/tutorial/Lesson3/Lesson3.pdf differ
diff --git a/trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp b/trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp
index 0d751ab71..0635a90f8 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson3/mainPSO.cpp
@@ -78,7 +78,7 @@ int main (int __argc, char *__argv[])
 
 // First algorithm
   /*****************************************************************************************/
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
   peoSeqPopEval< Indi > eval(plainEval);   	// Here, the evaluation is sequential !
   eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
@@ -106,7 +106,7 @@ int main (int __argc, char *__argv[])
 
 // Second algorithm (on the same model but with others names)
   /*****************************************************************************************/
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval2(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
   peoSeqPopEval< Indi > eval2(plainEval2);
   eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);
diff --git a/trunk/paradiseo-peo/tutorial/Lesson4/Lesson4.pdf b/trunk/paradiseo-peo/tutorial/Lesson4/Lesson4.pdf
index f2a601a71..95abc2da9 100644
Binary files a/trunk/paradiseo-peo/tutorial/Lesson4/Lesson4.pdf and b/trunk/paradiseo-peo/tutorial/Lesson4/Lesson4.pdf differ
diff --git a/trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp b/trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp
index 033889e5c..3cfe8ed98 100644
--- a/trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp
+++ b/trunk/paradiseo-peo/tutorial/Lesson4/mainPSO.cpp
@@ -69,7 +69,7 @@ int main (int __argc, char *__argv[])
   const unsigned int  MIG_FREQ = 10;
   rng.reseed (time(0));
   RingTopology topologyMig;
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval(f);
   peoParaPopEval< Indi > eval(plainEval);
   eoUniformGenerator < double >uGen (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random (VEC_SIZE, uGen);
@@ -90,7 +90,7 @@ int main (int __argc, char *__argv[])
   peoPSOSelect<Indi> mig_selec(topology);
   eoSelectNumber< Indi > mig_select(mig_selec);
   peoPSOReplacement<Indi> mig_replace;
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval2(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval2(f);
   peoParaPopEval< Indi > eval2(plainEval2);
   eoUniformGenerator < double >uGen2 (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random2 (VEC_SIZE, uGen2);
@@ -111,7 +111,7 @@ int main (int __argc, char *__argv[])
   peoPSOSelect<Indi> mig_selec2(topology2);
   eoSelectNumber< Indi > mig_select2(mig_selec2);
   peoPSOReplacement<Indi> mig_replace2;
-  peoEvalFuncPSO<Indi, double, const Indi& > plainEval3(f);
+  peoEvalFunc<Indi, double, const Indi& > plainEval3(f);
   peoParaPopEval< Indi > eval3(plainEval3);
   eoUniformGenerator < double >uGen3 (INIT_POSITION_MIN, INIT_POSITION_MAX);
   eoInitFixedLength < Indi > random3 (VEC_SIZE, uGen3);