diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
index e93ed5364..bb5884ccd 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java
@@ -41,9 +41,9 @@ import org.apache.commons.math.random.RandomVectorGenerator;
  * @since 3.0
  */
 public class BaseMultivariateMultiStartOptimizer<FUNC extends MultivariateFunction>
-    implements BaseMultivariateRealOptimizer<FUNC> {
+    implements BaseMultivariateOptimizer<FUNC> {
     /** Underlying classical optimizer. */
-    private final BaseMultivariateRealOptimizer<FUNC> optimizer;
+    private final BaseMultivariateOptimizer<FUNC> optimizer;
     /** Maximal number of evaluations allowed. */
     private int maxEvaluations;
     /** Number of evaluations already performed for all starts. */
@@ -67,7 +67,7 @@ public class BaseMultivariateMultiStartOptimizer<FUNC extends MultivariateFuncti
      * is {@code null}.
      * @throws NotStrictlyPositiveException if {@code starts < 1}.
      */
-    protected BaseMultivariateMultiStartOptimizer(final BaseMultivariateRealOptimizer<FUNC> optimizer,
+    protected BaseMultivariateMultiStartOptimizer(final BaseMultivariateOptimizer<FUNC> optimizer,
                                                       final int starts,
                                                       final RandomVectorGenerator generator) {
         if (optimizer == null ||
diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
rename to src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
index 758b7e7a7..a36ded4ff 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java
@@ -33,7 +33,7 @@ import org.apache.commons.math.analysis.MultivariateFunction;
  * @version $Id$
  * @since 3.0
  */
-public interface BaseMultivariateRealOptimizer<FUNC extends MultivariateFunction>
+public interface BaseMultivariateOptimizer<FUNC extends MultivariateFunction>
     extends BaseOptimizer<RealPointValuePair> {
     /**
      * Optimize an objective function.
diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
index 833eca3a4..62fde33ab 100644
--- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java
@@ -34,7 +34,7 @@ import org.apache.commons.math.analysis.MultivariateFunction;
  * @since 3.0
  */
 public interface BaseMultivariateSimpleBoundsOptimizer<FUNC extends MultivariateFunction>
-    extends BaseMultivariateRealOptimizer<FUNC> {
+    extends BaseMultivariateOptimizer<FUNC> {
     /**
      * Optimize an objective function.
      *
diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
index 05a6a2bcd..17d6c5e2f 100644
--- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateRealOptimizer.java
@@ -33,4 +33,4 @@ import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
  * @since 2.0
  */
 public interface DifferentiableMultivariateRealOptimizer
-    extends BaseMultivariateRealOptimizer<DifferentiableMultivariateFunction> {}
+    extends BaseMultivariateOptimizer<DifferentiableMultivariateFunction> {}
diff --git a/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
index 8146a6b0c..4980e6fef 100644
--- a/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
@@ -31,4 +31,4 @@ import org.apache.commons.math.analysis.MultivariateFunction;
  * @since 2.0
  */
 public interface MultivariateRealOptimizer
-    extends BaseMultivariateRealOptimizer<MultivariateFunction> {}
+    extends BaseMultivariateOptimizer<MultivariateFunction> {}
diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
index 02f9f2837..7da337983 100644
--- a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java
@@ -22,7 +22,7 @@ import org.apache.commons.math.exception.MaxCountExceededException;
 import org.apache.commons.math.exception.TooManyEvaluationsException;
 import org.apache.commons.math.exception.NullArgumentException;
 import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
+import org.apache.commons.math.optimization.BaseMultivariateOptimizer;
 import org.apache.commons.math.optimization.GoalType;
 import org.apache.commons.math.optimization.ConvergenceChecker;
 import org.apache.commons.math.optimization.RealPointValuePair;
@@ -39,7 +39,7 @@ import org.apache.commons.math.optimization.SimpleScalarValueChecker;
  * @since 2.2
  */
 public abstract class BaseAbstractMultivariateOptimizer<FUNC extends MultivariateFunction>
-    implements BaseMultivariateRealOptimizer<FUNC> {
+    implements BaseMultivariateOptimizer<FUNC> {
     /** Evaluations counter. */
     protected final Incrementor evaluations = new Incrementor();
     /** Convergence checker. */
diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
index ef5585b37..fa6885fa4 100644
--- a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
+++ b/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java
@@ -18,7 +18,7 @@
 package org.apache.commons.math.optimization.direct;
 
 import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.BaseMultivariateRealOptimizer;
+import org.apache.commons.math.optimization.BaseMultivariateOptimizer;
 import org.apache.commons.math.optimization.BaseMultivariateSimpleBoundsOptimizer;
 import org.apache.commons.math.optimization.GoalType;
 import org.apache.commons.math.optimization.RealPointValuePair;
@@ -41,7 +41,7 @@ import org.apache.commons.math.exception.NumberIsTooLargeException;
  */
 public abstract class BaseAbstractMultivariateSimpleBoundsOptimizer<FUNC extends MultivariateFunction>
     extends BaseAbstractMultivariateOptimizer<FUNC>
-    implements BaseMultivariateRealOptimizer<FUNC>,
+    implements BaseMultivariateOptimizer<FUNC>,
                BaseMultivariateSimpleBoundsOptimizer<FUNC> {
     /** Lower bounds. */
     private double[] lowerBound;
diff --git a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
index a3078a2c0..be4eed31d 100644
--- a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
+++ b/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java
@@ -54,7 +54,7 @@ import org.apache.commons.math.util.MathUtils;
  * user is responsible for converting his bounded point to unbounded by calling
  * {@link #boundedToUnbounded(double[])} before providing them to the optimizer.
  * For the same reason, the point returned by the {@link
- * org.apache.commons.math.optimization.BaseMultivariateRealOptimizer#optimize(int,
+ * org.apache.commons.math.optimization.BaseMultivariateOptimizer#optimize(int,
  * MultivariateFunction, org.apache.commons.math.optimization.GoalType, double[])}
  * method is unbounded. So to convert this point to bounded, users must call
  * {@link #unboundedToBounded(double[])} by themselves!</p>