diff --git a/trunk/paradiseo-moeo/src/fitness/moeoParetoBasedFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceBasedFitnessAssignment.h
similarity index 78%
rename from trunk/paradiseo-moeo/src/fitness/moeoParetoBasedFitnessAssignment.h
rename to trunk/paradiseo-moeo/src/fitness/moeoDominanceBasedFitnessAssignment.h
index ab794e279..af5ca70dd 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoParetoBasedFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceBasedFitnessAssignment.h
@@ -1,7 +1,7 @@
 /*
-* <moeoParetoBasedFitnessAssignment.h>
-* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
-* (C) OPAC Team, LIFL, 2002-2007
+* <moeoDominanceBasedFitnessAssignment.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
 *
 * Arnaud Liefooghe
 *
@@ -35,16 +35,16 @@
 */
 //-----------------------------------------------------------------------------
 
-#ifndef MOEOPARETOBASEDFITNESSASSIGNMENT_H_
-#define MOEOPARETOBASEDFITNESSASSIGNMENT_H_
+#ifndef MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
+#define MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_
 
 #include <fitness/moeoFitnessAssignment.h>
 
 /**
- * moeoParetoBasedFitnessAssignment is a moeoFitnessAssignment for Pareto-based strategies.
+ * moeoDominanceBasedFitnessAssignment is a moeoFitnessAssignment for dominance-based strategies.
  */
 template < class MOEOT >
-class moeoParetoBasedFitnessAssignment : public moeoFitnessAssignment < MOEOT >
-  {};
+class moeoDominanceBasedFitnessAssignment : public moeoFitnessAssignment < MOEOT >
+{};
 
-#endif /*MOEOPARETOBASEDFITNESSASSIGNMENT_H_*/
+#endif /*MOEODOMINANCEBASEDFITNESSASSIGNMENT_H_*/
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
index 3572a067f..2de727d7e 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountFitnessAssignment.h
@@ -46,14 +46,14 @@
 #include <archive/moeoUnboundedArchive.h>
 #include <comparator/moeoObjectiveVectorComparator.h>
 #include <comparator/moeoParetoObjectiveVectorComparator.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceBasedFitnessAssignment.h>
 #include <utils/moeoDominanceMatrix.h>
 
 /**
  * Fitness assignment sheme that computes how many solutions does each solution dominate.
  */
 template < class MOEOT >
-class moeoDominanceCountFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT >
+class moeoDominanceCountFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
 {
 public:
 
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
index 57b622c00..22426bdd3 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceCountRankingFitnessAssignment.h
@@ -47,7 +47,7 @@
 #include <archive/moeoUnboundedArchive.h>
 #include <comparator/moeoObjectiveVectorComparator.h>
 #include <comparator/moeoParetoObjectiveVectorComparator.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceBasedFitnessAssignment.h>
 #include <utils/moeoDominanceMatrix.h>
 
 /**
@@ -57,7 +57,7 @@
  * Computer Engineering and Networks Laboratory (TIK), ETH Zurich, Zurich, Switzerland, 2001.
  */
 template < class MOEOT >
-class moeoDominanceCountRankingFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT >
+class moeoDominanceCountRankingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
 {
 public:
 
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
index c28695e5e..e67d76658 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoDominanceRankFitnessAssignment.h
@@ -45,14 +45,14 @@
 #include <archive/moeoArchive.h>
 #include <comparator/moeoObjectiveVectorComparator.h>
 #include <comparator/moeoParetoObjectiveVectorComparator.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceBasedFitnessAssignment.h>
 #include <utils/moeoDominanceMatrix.h>
 
 /**
  * Fitness assignment sheme that computes how many solutions each solution is dominated by.
  */
 template < class MOEOT >
-class moeoDominanceRankFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT >
+class moeoDominanceRankFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
 {
 public:
 
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h
index 4225cea8a..dd157b880 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoFastNonDominatedSortingFitnessAssignment.h
@@ -43,7 +43,7 @@
 #include <comparator/moeoObjectiveObjectiveVectorComparator.h>
 #include <comparator/moeoObjectiveVectorComparator.h>
 #include <comparator/moeoParetoObjectiveVectorComparator.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceBasedFitnessAssignment.h>
 
 
 /**
@@ -54,7 +54,7 @@
  * This strategy is, for instance, used in NSGA and NSGA-II.
  */
 template < class MOEOT >
-class moeoFastNonDominatedSortingFitnessAssignment : public moeoParetoBasedFitnessAssignment < MOEOT >
+class moeoFastNonDominatedSortingFitnessAssignment : public moeoDominanceBasedFitnessAssignment < MOEOT >
   {
   public:
 
diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo
index 617948055..1a45e20b4 100644
--- a/trunk/paradiseo-moeo/src/moeo
+++ b/trunk/paradiseo-moeo/src/moeo
@@ -99,17 +99,17 @@
 #include <fitness/moeoAchievementFitnessAssignment.h>
 #include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoCriterionBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceBasedFitnessAssignment.h>
+#include <fitness/moeoDominanceCountFitnessAssignment.h>
+#include <fitness/moeoDominanceCountRankingFitnessAssignment.h>
+#include <fitness/moeoDominanceRankFitnessAssignment.h>
 #include <fitness/moeoDummyFitnessAssignment.h>
 #include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
 #include <fitness/moeoFastNonDominatedSortingFitnessAssignment.h>
 #include <fitness/moeoFitnessAssignment.h>
 #include <fitness/moeoIndicatorBasedFitnessAssignment.h>
-#include <fitness/moeoParetoBasedFitnessAssignment.h>
 #include <fitness/moeoScalarFitnessAssignment.h>
 #include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
-#include <fitness/moeoDominanceCountFitnessAssignment.h>
-#include <fitness/moeoDominanceCountRankingFitnessAssignment.h>
-#include <fitness/moeoDominanceRankFitnessAssignment.h>
 
 #include <metric/moeoAdditiveEpsilonBinaryMetric.h>
 #include <metric/moeoContributionMetric.h>