diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXBitFlippingNeighbor.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXBitFlippingNeighbor.h
index f67e267ee..76abfeb98 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXBitFlippingNeighbor.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXBitFlippingNeighbor.h
@@ -1,8 +1,8 @@
 /*
  <moGPUXBitFlippingNeighbor.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
- Boufaras Karima, Thé Van Luong
+ Karima Boufaras, Thé Van Luong
 
  This software is governed by the CeCILL license under French law and
  abiding by the rules of distribution of free software.  You can  ue,
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighbor.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighbor.h
index 61d4af312..c72c4286d 100755
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighbor.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighbor.h
@@ -1,8 +1,8 @@
 /*
  <moGPUXChangeNeighbor.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
- Boufaras Karima, Thé Van Luong
+ Karima Boufaras, Thé Van Luong
 
  This software is governed by the CeCILL license under French law and
  abiding by the rules of distribution of free software.  You can  use,
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhood.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhood.h
index 1ea85aee7..3c1f2c70f 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhood.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhood.h
@@ -1,6 +1,6 @@
 /*
  <moGPUXChangeNeighborhood.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
  Karima Boufaras, Thé Van LUONG
 
@@ -30,11 +30,11 @@
 #ifndef __moGPUXChangeNeighborhood_h
 #define __moGPUXChangeNeighborhood_h
 
-#include <neighborhood/moXChangeNeighborhood.h>
+#include <neighborhood/moGPUXChange.h>
 #include <eval/moGPUEval.h>
 
 template<class N>
-class moGPUXChangeNeighborhood: public moXChangeNeighborhood<N> {
+class moGPUXChangeNeighborhood: public moGPUXChange<N> {
 
 public:
 
@@ -45,12 +45,12 @@ public:
 	typedef N Neighbor;
 	typedef typename Neighbor::EOT EOT;
 
-	using moXChangeNeighborhood<Neighbor>::neighborhoodSize;
-	using moXChangeNeighborhood<Neighbor>::currentIndex;
-	using moXChangeNeighborhood<Neighbor>::indices;
-	using moXChangeNeighborhood<Neighbor>::mapping;
-	using moXChangeNeighborhood<Neighbor>::xChange;
-	using moXChangeNeighborhood<Neighbor>::mutex;
+	using moGPUXChange<Neighbor>::neighborhoodSize;
+	using moGPUXChange<Neighbor>::currentIndex;
+	using moGPUXChange<Neighbor>::indices;
+	using moGPUXChange<Neighbor>::mapping;
+	using moGPUXChange<Neighbor>::xChange;
+	using moGPUXChange<Neighbor>::mutex;
 
 	/**
 	 * Constructor
@@ -60,7 +60,7 @@ public:
 
 	moGPUXChangeNeighborhood(unsigned int _neighborhoodSize,
 			unsigned int _xChange) :
-		moXChangeNeighborhood<Neighbor> (_neighborhoodSize, _xChange) {
+		moGPUXChange<Neighbor> (_neighborhoodSize, _xChange) {
 		sendMapping = false;
 		cudaMalloc((void**) &device_Mapping, sizeof(unsigned int)
 				* neighborhoodSize * _xChange);
@@ -84,7 +84,7 @@ public:
 
 	virtual void init(EOT& _solution, Neighbor& _current) {
 
-		moXChangeNeighborhood<Neighbor>::init(_solution, _current);
+		moGPUXChange<Neighbor>::init(_solution, _current);
 		if (!sendMapping) {
 			cudaMemcpy(device_Mapping, mapping, xChange * neighborhoodSize
 					* sizeof(unsigned int), cudaMemcpyHostToDevice);
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByCpy.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByCpy.h
index b417144b3..6e79b981b 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByCpy.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByCpy.h
@@ -1,8 +1,8 @@
 /*
  <moGPUXChangeNeighborhoodByCpy.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
- Boufaras Karima, Thé Van Luong
+ Karima Boufaras, Thé Van Luong
 
  This software is governed by the CeCILL license under French law and
  abiding by the rules of distribution of free software.  You can  ue,
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByModif.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByModif.h
index c1cc224ad..4b7606610 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByModif.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXChangeNeighborhoodByModif.h
@@ -1,6 +1,6 @@
 /*
  <moGPUXChangeNeighborhoodByModif.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
  Karima Boufaras, Thé Van Luong
 
diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h
index 386e27baf..106a98143 100644
--- a/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h
+++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h
@@ -1,8 +1,8 @@
 /*
  <moGPUXSwapNeighbor.h.h>
- Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+ Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
 
- Boufaras Karima, Thé Van Luong
+ Karima Boufaras, Thé Van Luong
 
  This software is governed by the CeCILL license under French law and
  abiding by the rules of distribution of free software.  You can  ue,