diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/CMakeLists.txt b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/CMakeLists.txt
index 0884e0ace..e4e89b44c 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/CMakeLists.txt
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/CMakeLists.txt
@@ -33,6 +33,10 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
 CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByModif.cu)
 CUDA_ADD_EXECUTABLE(GPUtestKswapHCByCpy testKswapHCByCpy.cu)  
 
+######################################################################################
+### 4) Link the librairies for your target(s)
+######################################################################################
+
 TARGET_LINK_LIBRARIES(GPUtestKswapHCByModif eoutils ga eo)
 TARGET_LINK_LIBRARIES(GPUtestKswapHCByCpy eoutils ga eo)
 
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu
index 72affd32b..0ddcfef79 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu
@@ -42,10 +42,10 @@ using namespace std;
 #include <eo>
 #include <ga.h>
 // OneMax full eval function
-#include <problems/eval/EvalOneMax.h>
+#include <problems/eval/moGPUEvalOneMax.h>
 // OneMax incremental eval function
 #include <eval/moGPUMappingEvalByCpy.h>
-#include <problems/eval/OneMaxIncrEval.h>
+#include <problems/eval/moGPUOneMaxIncrEval.h>
 // One Max solution
 #include <GPUType/moGPUBitVector.h>
 // One Max neighbor
@@ -53,7 +53,7 @@ using namespace std;
 //To compute execution time
 #include <performance/moGPUTimer.h>
 //Utils to compute size Mapping of x-change position
-#include <neighborhood/moNeighborhoodSizeUtils.h>
+#include <neighborhood/moGPUNeighborhoodSizeUtils.h>
 // Use an ordered neighborhood without mapping, with local copy of solution
 #include <neighborhood/moGPUXChangeNeighborhoodByCpy.h>
 // The Solution and neighbor comparator
@@ -129,7 +129,7 @@ void main_function(int argc, char **argv)
    *
    * ========================================================= */
 
-  EvalOneMax<solution> eval;
+  moGPUEvalOneMax<solution> eval;
   
   /* =========================================================
    *
@@ -138,8 +138,8 @@ void main_function(int argc, char **argv)
    * ========================================================= */
 
   unsigned long int sizeMap=sizeMapping(SIZE,NB_POS);
-  OneMaxIncrEval<Neighbor> incr_eval;
-  moGPUMappingEvalByCpy<Neighbor,OneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
+  moGPUOneMaxIncrEval<Neighbor> incr_eval;
+  moGPUMappingEvalByCpy<Neighbor,moGPUOneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
   
   /* =========================================================
    *
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu
index 4a00f7c92..7e4bd7f48 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu
@@ -42,10 +42,10 @@ using namespace std;
 #include <eo>
 #include <ga.h>
 // OneMax full eval function
-#include <problems/eval/EvalOneMax.h>
+#include <problems/eval/moGPUEvalOneMax.h>
 // OneMax incremental eval function
 #include <eval/moGPUMappingEvalByModif.h>
-#include <problems/eval/OneMaxIncrEval.h>
+#include <problems/eval/moGPUOneMaxIncrEval.h>
 // One Max solution
 #include <GPUType/moGPUBitVector.h>
 // One Max neighbor
@@ -53,7 +53,7 @@ using namespace std;
 //To compute execution time
 #include <performance/moGPUTimer.h>
 //Utils to compute size Mapping of x-change position
-#include <neighborhood/moNeighborhoodSizeUtils.h>
+#include <neighborhood/moGPUNeighborhoodSizeUtils.h>
 // One Max ordered neighborhood
 #include <neighborhood/moGPUXChangeNeighborhoodByModif.h>
 // The Solution and neighbor comparator
@@ -139,7 +139,7 @@ void main_function(int argc, char **argv)
    *
    * ========================================================= */
 
-  EvalOneMax<solution> eval;
+  moGPUEvalOneMax<solution> eval;
   
   /* =========================================================
    *
@@ -148,8 +148,8 @@ void main_function(int argc, char **argv)
    * ========================================================= */
 
   unsigned long int sizeMap=sizeMapping(SIZE,NB_POS);
-  OneMaxIncrEval<Neighbor> incr_eval;
-  moGPUMappingEvalByModif<Neighbor,OneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
+  moGPUOneMaxIncrEval<Neighbor> incr_eval;
+  moGPUMappingEvalByModif<Neighbor,moGPUOneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
   
   /* =========================================================
    *