diff --git a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java
index a03609876..77311ee24 100644
--- a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java
+++ b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 /**
  * This class is a simple container for weighted observed point in
- * {@link CurveFitter curve fitting}.
+ * {@link AbstractCurveFitter curve fitting}.
  * <p>Instances of this class are guaranteed to be immutable.</p>
  * @since 2.0
  */
diff --git a/src/main/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSet.java b/src/main/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSet.java
index 696878360..7f655c7b1 100644
--- a/src/main/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSet.java
+++ b/src/main/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSet.java
@@ -125,7 +125,7 @@ public class PolygonsSet extends AbstractRegion<Euclidean2D, Euclidean1D> {
      * <p>This constructor does not handle polygons with a boundary
      * forming several disconnected paths (such as polygons with holes).</p>
      * <p>For cases where this simple constructor applies, it is expected to
-     * be numerically more robust than the {@link #PolygonsSet(Collection) general
+     * be numerically more robust than the {@link #PolygonsSet(Collection,double) general
      * constructor} using {@link SubHyperplane subhyperplanes}.</p>
      * <p>If the list is empty, the region will represent the whole
      * space.</p>
@@ -186,7 +186,7 @@ public class PolygonsSet extends AbstractRegion<Euclidean2D, Euclidean1D> {
      * <p>This constructor does not handle polygons with a boundary
      * forming several disconnected paths (such as polygons with holes).</p>
      * <p>For cases where this simple constructor applies, it is expected to
-     * be numerically more robust than the {@link #PolygonsSet(Collection) general
+     * be numerically more robust than the {@link #PolygonsSet(Collection,double) general
      * constructor} using {@link SubHyperplane subhyperplanes}.</p>
      * @param hyperplaneThickness tolerance below which points are consider to
      * belong to the hyperplane (which is therefore more a slab)
diff --git a/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java b/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
index 1378234c6..191b6859c 100644
--- a/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
+++ b/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
@@ -52,7 +52,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
      * Build a 0-length vector.
      * Zero-length vectors may be used to initialize construction of vectors
      * by data gathering. We start with zero-length and use either the {@link
-     * #ArrayFieldVector(ArrayFieldVector, ArrayFieldVector)} constructor
+     * #ArrayFieldVector(FieldVector, FieldVector)} constructor
      * or one of the {@code append} methods ({@link #add(FieldVector)} or
      * {@link #append(ArrayFieldVector)}) to gather data into this vector.
      *
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
index e2ac975b9..736382549 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
@@ -52,8 +52,7 @@ import org.apache.commons.math4.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.math4.optimization.BaseMultivariateOptimizer#optimize(int,
- * MultivariateFunction, org.apache.commons.math4.optimization.GoalType, double[])}
+ * org.apache.commons.math4.optim.BaseMultivariateOptimizer#optimize(OptimizationData[])}
  * method is unbounded. So to convert this point to bounded, users must call
  * {@link #unboundedToBounded(double[])} by themselves!</p>
  * <p>
diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java b/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java
index 935e74b74..b37a5b3b2 100644
--- a/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java
@@ -22,7 +22,7 @@ import org.apache.commons.math4.util.FastMath;
 
 /**
  * Simple implementation of the
- * {@link org.apache.commons.math4.optimization.ConvergenceChecker} interface
+ * {@link org.apache.commons.math4.optim.ConvergenceChecker} interface
  * that uses only objective function values.
  *
  * Convergence is considered to have been reached if either the relative
diff --git a/src/main/java/org/apache/commons/math4/random/ValueServer.java b/src/main/java/org/apache/commons/math4/random/ValueServer.java
index e3132f0a4..de9118a13 100644
--- a/src/main/java/org/apache/commons/math4/random/ValueServer.java
+++ b/src/main/java/org/apache/commons/math4/random/ValueServer.java
@@ -347,7 +347,7 @@ public class ValueServer {
     /**
      * Reseeds the random data generator.
      *
-     * @param seed Value with which to reseed the {@link RandomDataImpl}
+     * @param seed Value with which to reseed the {@link RandomDataGenerator}
      * used to generate random data.
      */
     public void reSeed(long seed) {