diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java
index 8ec88519516ca7d0e701afddd63e5040ae434a5e..58878783c9d00ab3ae2d2a9155ffbfae3065775c 100644
--- a/core/src/main/java/hudson/slaves/CommandLauncher.java
+++ b/core/src/main/java/hudson/slaves/CommandLauncher.java
@@ -2,7 +2,6 @@ package hudson.slaves;
 
 import org.kohsuke.stapler.DataBoundConstructor;
 import hudson.model.Descriptor;
-import hudson.model.Messages;
 import hudson.util.StreamTaskListener;
 import hudson.util.ProcessTreeKiller;
 import hudson.util.StreamCopyThread;
@@ -44,7 +43,7 @@ public class CommandLauncher extends ComputerLauncher {
 
     public static final Descriptor<ComputerLauncher> DESCRIPTOR = new Descriptor<ComputerLauncher>(CommandLauncher.class) {
         public String getDisplayName() {
-            return "Launch slave via execution of command on the Master";
+            return Messages.CommandLauncher_displayName();
         }
     };
 
@@ -60,7 +59,7 @@ public class CommandLauncher extends ComputerLauncher {
         EnvVars _cookie = null;
         Process _proc = null;
         try {
-            listener.getLogger().println(Messages.Slave_Launching(getTimestamp()));
+            listener.getLogger().println(hudson.model.Messages.Slave_Launching(getTimestamp()));
             listener.getLogger().println("$ " + getCommand());
 
             ProcessBuilder pb = new ProcessBuilder(Util.tokenize(getCommand()));
@@ -77,7 +76,7 @@ public class CommandLauncher extends ComputerLauncher {
                 public void onClosed(Channel channel, IOException cause) {
                     if (cause != null) {
                         cause.printStackTrace(
-                            listener.error(Messages.Slave_Terminated(getTimestamp())));
+                            listener.error(hudson.model.Messages.Slave_Terminated(getTimestamp())));
                     }
                     ProcessTreeKiller.get().kill(proc, cookie);
                 }
@@ -99,7 +98,7 @@ public class CommandLauncher extends ComputerLauncher {
             } else {
                 msg = " : " + msg;
             }
-            msg = Messages.Slave_UnableToLaunch(computer.getDisplayName(), msg);
+            msg = hudson.model.Messages.Slave_UnableToLaunch(computer.getDisplayName(), msg);
             LOGGER.log(Level.SEVERE, msg, e);
             e.printStackTrace(listener.error(msg));
 
diff --git a/core/src/main/resources/hudson/slaves/Messages.properties b/core/src/main/resources/hudson/slaves/Messages.properties
index 7402ff4e8588cc7018e90f2bd43e5d454bde0744..030020ec1092a6ff88288f23a1247d8552db56e9 100644
--- a/core/src/main/resources/hudson/slaves/Messages.properties
+++ b/core/src/main/resources/hudson/slaves/Messages.properties
@@ -1,2 +1,3 @@
 RetentionStrategy.Always.displayName=Keep this slave on-line as much as possible
-RetentionStrategy.Demand.displayName=Take this slave on-line when in demand and off-line when idle
\ No newline at end of file
+RetentionStrategy.Demand.displayName=Take this slave on-line when in demand and off-line when idle
+CommandLauncher.displayName=Launch slave via execution of command on the Master
\ No newline at end of file