diff --git a/edo/src/edoBounder.h b/edo/src/edoBounder.h
index 8291cffc4..471e47f9d 100644
--- a/edo/src/edoBounder.h
+++ b/edo/src/edoBounder.h
@@ -28,15 +28,15 @@ Authors:
 #ifndef _edoBounder_h
 #define _edoBounder_h
 
-#include <eoFunctor.h>
+#include <edoRepairer.h>
 
 /** The interface of a set of classes that modifies a solution so as to respect
  * a given set of bounds (typically an hypercube).
  *
- * @ingroup Bounders
+ * @ingroup Repairers
  */
 template < typename EOT >
-class edoBounder : public eoUF< EOT&, void >
+class edoBounder : public edoRepairer< EOT >
 {
 public:
     edoBounder( EOT min = EOT(1, 0), EOT max = EOT(1, 0) )
diff --git a/edo/src/edoBounderBound.h b/edo/src/edoBounderBound.h
index 3c6646242..36ad53144 100644
--- a/edo/src/edoBounderBound.h
+++ b/edo/src/edoBounderBound.h
@@ -32,7 +32,7 @@ Authors:
 
 /** A bounder that correct an incorrect variable by setting it to the min/max
  *
- * @ingroup Bounders
+ * @ingroup Repairers
  */
 template < typename EOT >
 class edoBounderBound : public edoBounder< EOT >
diff --git a/edo/src/edoBounderNo.h b/edo/src/edoBounderNo.h
index 31b4b499d..33416d56d 100644
--- a/edo/src/edoBounderNo.h
+++ b/edo/src/edoBounderNo.h
@@ -32,7 +32,7 @@ Authors:
 
 /** A bounder that does nothing.
  *
- * @ingroup Bounders
+ * @ingroup Repairers
  */
 template < typename EOT >
 class edoBounderNo : public edoBounder< EOT >
diff --git a/edo/src/edoBounderRng.h b/edo/src/edoBounderRng.h
index 7b909ccac..bfe6cb712 100644
--- a/edo/src/edoBounderRng.h
+++ b/edo/src/edoBounderRng.h
@@ -33,7 +33,7 @@ Authors:
 /** A bounder that randomly draw new values for variables going out bounds, 
  * using an eoRng to do so.
  *
- * @ingroup Bounders
+ * @ingroup Repairers
  */
 template < typename EOT >
 class edoBounderRng : public edoBounder< EOT >
diff --git a/edo/src/edoBounderUniform.h b/edo/src/edoBounderUniform.h
index a285c8bc0..7637d8336 100644
--- a/edo/src/edoBounderUniform.h
+++ b/edo/src/edoBounderUniform.h
@@ -32,7 +32,7 @@ Authors:
 /** A bounder that randomly draw new values for variables going out bounds,
  * in a given uniform distribution.
  *
- * @ingroup Bounders
+ * @ingroup Repairers
  */
 template < typename EOT >
 class edoBounderUniform : public edoBounder< EOT >