diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/CMakeLists.txt b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/CMakeLists.txt
index 93fa4ed25..bd01c9d62 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/CMakeLists.txt
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/CMakeLists.txt
@@ -33,5 +33,9 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
 CUDA_ADD_EXECUTABLE(GPU_testSimpleHC testSimpleHC.cu) 
 CUDA_ADD_EXECUTABLE(GPU_testSimpleTS testSimpleTS.cu) 
 
+######################################################################################
+### 4) Link the librairies for your target(s)
+######################################################################################
+
 TARGET_LINK_LIBRARIES(GPU_testSimpleHC eoutils ga eo)
 TARGET_LINK_LIBRARIES(GPU_testSimpleTS eoutils ga eo)
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleHC.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleHC.cu
index 4fbfc6816..80a9b8539 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleHC.cu
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleHC.cu
@@ -48,12 +48,12 @@ __device__ int * dev_b;
 #include <eo>
 #include <ga.h>
 // Fitness function
-#include <problems/eval/QAPEval.h>
+#include <problems/eval/moGPUQAPEval.h>
 // Cuda Fitness function
 #include <eval/moGPUMappingEvalByCpy.h>
-#include <problems/eval/QAPIncrEval.h>
+#include <problems/eval/moGPUQAPIncrEval.h>
 //Specific data to QAP problem
-#include <problems/data/QAPData.h>
+#include <problems/data/moGPUQAPData.h>
 // QAP solution
 #include <GPUType/moGPUPermutationVector.h>
 // Swap neighbor
@@ -61,7 +61,7 @@ __device__ int * dev_b;
 //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
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-  QAPData<int> _data(argv[1]);
+  moGPUQAPData<int> _data(argv[1]);
 
   /* =========================================================
    *
@@ -153,10 +153,10 @@ int main(int argc, char **argv)
    * Evaluation of a solution neighbor's
    *
    * ========================================================= */
-  QAPEval<solution> eval(_data);
+  moGPUQAPEval<solution> eval(_data);
   unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS);
-  QAPIncrEval<Neighbor> incr_eval;
-  moGPUMappingEvalByCpy<Neighbor,QAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
+  moGPUQAPIncrEval<Neighbor> incr_eval;
+  moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
   
   /* =========================================================
    *
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleTS.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleTS.cu
index 016122c61..f1b54c60f 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleTS.cu
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleTS.cu
@@ -47,12 +47,12 @@ __device__ int * dev_b;
 #include <eo>
 #include <ga.h>
 // Fitness function
-#include <problems/eval/QAPEval.h>
+#include <problems/eval/moGPUQAPEval.h>
 // Cuda Fitness function
 #include <eval/moGPUMappingEvalByCpy.h>
-#include <problems/eval/QAPIncrEval.h>
+#include <problems/eval/moGPUQAPIncrEval.h>
 //Specific data to QAP problem
-#include <problems/data/QAPData.h>
+#include <problems/data/moGPUQAPData.h>
 // QAP solution
 #include <GPUType/moGPUPermutationVector.h>
 // Swap neighbor
@@ -60,7 +60,7 @@ __device__ int * dev_b;
 //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
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-  QAPData<int> _data(argv[1]);
+  moGPUQAPData<int> _data(argv[1]);
 
   /* =========================================================
    *
@@ -160,10 +160,10 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-   QAPEval<solution> eval(_data);
+   moGPUQAPEval<solution> eval(_data);
    unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS);
-   QAPIncrEval<Neighbor> incr_eval;
-   moGPUMappingEvalByCpy<Neighbor,QAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
+   moGPUQAPIncrEval<Neighbor> incr_eval;
+   moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
   
   /* =========================================================
    *