diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java
index cd3b28e5f5..e89dd83ef1 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/database/DBMSMetadata.java
@@ -88,7 +88,7 @@ public class DBMSMetadata {
 
     /**
      * {@link java.sql.Types} value representing the type returned by
-     * {@link callableStatement}
+     * {@link #callableStatement}
      *
      * <b>Currently only java.sql.Types.String and java.sql.Types.Clob are
      * supported</b>
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
index da668e6d2f..44848174dd 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
@@ -53,7 +53,6 @@ public abstract class Comment extends AbstractNode {
      * of the comment as well as the start marker ({@code //}, {@code /*} or {@code /**}
      * and the end markers (<code>&#x2a;/</code>).
      *
-     * @param comment the raw comment
      * @return List of lines of the comments
      */
     private List<String> multiLinesIn() {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassStats.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassStats.java
index b7aba0d141..589dcdcf49 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassStats.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/multifile/ClassStats.java
@@ -10,18 +10,18 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import net.sourceforge.pmd.lang.java.ast.JavaQualifiedName;
 import net.sourceforge.pmd.lang.java.multifile.signature.JavaFieldSigMask;
 import net.sourceforge.pmd.lang.java.multifile.signature.JavaFieldSignature;
 import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSigMask;
 import net.sourceforge.pmd.lang.java.multifile.signature.JavaOperationSignature;
+import net.sourceforge.pmd.lang.java.qname.JavaTypeQualifiedName;
 
 /**
  * Statistics about a class, enum, interface, or annotation. Stores information about the contained members and their
  * signatures, and memoizes the results of the class metrics computed on the corresponding node.
  *
  * <p>This class does not provide methods to operate directly on its nested classes, but only on itself. To operate on a
- * nested class, retrieve the correct ClassStats with {@link PackageStats#getClassStats(JavaQualifiedName, boolean)}
+ * nested class, retrieve the correct ClassStats with {@link PackageStats#getClassStats(JavaTypeQualifiedName, boolean)}
  * then use the methods of ClassStats. Note that at this level, entities of the data structure do not manipulate
  * QualifiedNames anymore, only Strings.
  *
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
index f73c4f96a8..74f7591cd0 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
@@ -157,7 +157,7 @@ public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
      * Checks, whether there is a statement after the given if statement, and if
      * so, whether this is just a return boolean statement.
      *
-     * @param node
+     * @param ifNode
      *            the if statement
      * @return
      */
@@ -176,7 +176,7 @@ public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
      * Checks whether the given ifstatement just returns a boolean in the if
      * clause.
      *
-     * @param node
+     * @param ifNode
      *            the if statement
      * @return
      */