diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java
index a357ba2e82..0ab7e44a1e 100644
--- a/core/src/main/java/hudson/FileSystemProvisioner.java
+++ b/core/src/main/java/hudson/FileSystemProvisioner.java
@@ -126,7 +126,7 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
      *
      * <p>
      * This method can prepare the underlying file system in preparation
-     * for the later {@link #snapshot(AbstractBuild, FilePath, TaskListener)}.
+     * for the later {@link FileSystemProvisioner.Default#snapshot(AbstractBuild, FilePath, TaskListener)}.
      *
      * TODO : the method needs to be able to see the snapshot would
      * be later needed. In fact, perhaps we should only call this method
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index c1756bb635..af50bca74a 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1278,7 +1278,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     /**
      * Gets the current {@link Computer} that the build is running.
      * This method only works when called during a build, such as by
-     * {@link Publisher}, {@link BuildWrapper}, etc.
+     * {@link hudson.tasks.Publisher}, {@link hudson.tasks.BuildWrapper}, etc.
      */
     public static Computer currentComputer() {
         Executor e = Executor.currentExecutor();
diff --git a/core/src/main/java/hudson/model/ComputerPanelBox.java b/core/src/main/java/hudson/model/ComputerPanelBox.java
index 0f6af199cb..9854650655 100644
--- a/core/src/main/java/hudson/model/ComputerPanelBox.java
+++ b/core/src/main/java/hudson/model/ComputerPanelBox.java
@@ -11,7 +11,7 @@ import java.util.List;
  *
  * @author Lucie Votypkova
  * @since 1.434
- * @see jenkins.model.Computer#getComputerPanelBoxs()
+ * @see hudson.model.Computer#getComputerPanelBoxs()
  */
 
 public abstract class ComputerPanelBox implements ExtensionPoint{
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 2aa98d0219..700b908280 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -576,7 +576,7 @@ public class Executor extends Thread implements ModelObject {
      * was compiled against Hudson < 1.383
      *
      * @deprecated as of 1.388
-     *      Use {@link Executables#getEstimatedDurationFor(Executable)}
+     *      Use {@link Executables#getEstimatedDurationFor(Queue.Executable)}
      */
     public static long getEstimatedDurationFor(Executable e) {
         return Executables.getEstimatedDurationFor(e);
diff --git a/core/src/main/java/hudson/model/OverallLoadStatistics.java b/core/src/main/java/hudson/model/OverallLoadStatistics.java
index f576ad14f0..0a5789e80a 100644
--- a/core/src/main/java/hudson/model/OverallLoadStatistics.java
+++ b/core/src/main/java/hudson/model/OverallLoadStatistics.java
@@ -36,7 +36,7 @@ import org.kohsuke.stapler.export.Exported;
  *
  * @author Kohsuke Kawaguchi
  * @see Jenkins#overallLoad
- * @see UnlabeldLoadStatistics
+ * @see jenkins.model.UnlabeledLoadStatistics
  */
 public class OverallLoadStatistics extends LoadStatistics {
     /**
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 88f6cf3f19..a8d9ca80a4 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -188,7 +188,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
     /**
      * The build result.
-     * This value may change while the state is in {@link State#BUILDING}.
+     * This value may change while the state is in {@link Run.State#BUILDING}.
      */
     protected volatile Result result;
 
@@ -464,7 +464,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
      * This method looks for {@link Executor} who's {@linkplain Executor#getCurrentExecutable() assigned to this build},
      * and because of that this might not be necessarily in sync with the return value of {@link #isBuilding()} &mdash;
      * an executor holds on to {@link Run} some more time even after the build is finished (for example to
-     * perform {@linkplain State#POST_PRODUCTION post-production processing}.)
+     * perform {@linkplain Run.State#POST_PRODUCTION post-production processing}.)
      */
     @Exported 
     public @CheckForNull Executor getExecutor() {
diff --git a/core/src/main/java/hudson/model/TaskThread.java b/core/src/main/java/hudson/model/TaskThread.java
index 175a09e637..d1c750f64f 100644
--- a/core/src/main/java/hudson/model/TaskThread.java
+++ b/core/src/main/java/hudson/model/TaskThread.java
@@ -161,7 +161,7 @@ public abstract class TaskThread extends Thread {
 
         /**
          * @deprecated as of Hudson 1.350
-         *      Use {@link #forMemory(TaskThread)} and pass in the calling {@link TaskAction}
+         *      Use {@link #forMemory(TaskAction)} and pass in the calling {@link TaskAction}
          */
         public static ListenerAndText forMemory() {
             return forMemory(null);
@@ -169,7 +169,7 @@ public abstract class TaskThread extends Thread {
 
         /**
          * @deprecated as of Hudson 1.350
-         *      Use {@link #forFile(File, TaskThread)} and pass in the calling {@link TaskAction}
+         *      Use {@link #forFile(File, TaskAction)} and pass in the calling {@link TaskAction}
          */
         public static ListenerAndText forFile(File f) throws IOException {
             return forFile(f,null);
diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java
index bbbdebbf51..ad67a05279 100644
--- a/core/src/main/java/hudson/model/UserProperty.java
+++ b/core/src/main/java/hudson/model/UserProperty.java
@@ -45,7 +45,7 @@ import org.kohsuke.stapler.export.ExportedBean;
  * Configuration screen should be defined in <tt>config.jelly</tt>.
  * Within this page, the {@link UserProperty} instance is available
  * as <tt>instance</tt> variable (while <tt>it</tt> refers to {@link User}.
- * See {@link UserSearchProperty.UserProperty}'s <tt>config.jelly</tt> for an example.
+ * See {@link hudson.search.UserSearchProperty}'s <tt>config.jelly</tt> for an example.
  *
  *
  * @author Kohsuke Kawaguchi
diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
index 306075b45e..0e21fa31ad 100644
--- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java
+++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
@@ -82,7 +82,7 @@ import static java.lang.Math.*;
  * to assist various algorithms that produce the solution of this mapping problem,
  * which is represented as {@link Mapping}.
  *
- * @see LoadBalancer#map(Task, MappingWorksheet)
+ * @see LoadBalancer#map(Queue.Task, MappingWorksheet)
  * @author Kohsuke Kawaguchi
  */
 public class MappingWorksheet {
diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
index 8a59b8e8f0..ac5e311dbb 100644
--- a/core/src/main/java/hudson/tools/JDKInstaller.java
+++ b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -264,7 +264,7 @@ public class JDKInstaller extends ToolInstaller {
 
     /**
      * Abstraction of the file system to perform JDK installation.
-     * Consider {@link FilePathFileSystem} as the canonical documentation of the contract.
+     * Consider {@link JDKInstaller.FilePathFileSystem} as the canonical documentation of the contract.
      */
     public interface FileSystem {
         void delete(String file) throws IOException, InterruptedException;
diff --git a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
index 258cc309ea..55526dfb19 100644
--- a/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
+++ b/core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
@@ -83,7 +83,7 @@ public class ToolLocationNodeProperty extends NodeProperty<Node> {
      * return the node-specific home directory. Otherwise return {@code installation.getHome()}
      *
      * <p>
-     * This is the core logic behind {@link NodeSpecific#forNode(Node)} for {@link ToolInstallation}.
+     * This is the core logic behind {@link NodeSpecific#forNode(Node, TaskListener)} for {@link ToolInstallation}.
      *
      * @return
      *      never null.
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index df5946c2d6..28bb826756 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -306,7 +306,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
      * Code that gets executed on the machine where the {@link OSProcess} is local.
      * Used to act on {@link OSProcess}.
      *
-     * @see OSProcess#act(ProcessCallable)
+     * @see ProcessTree.OSProcess#act(ProcessTree.ProcessCallable)
      */
     public interface ProcessCallable<T> extends Serializable {
         /**