diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 1704046628..b8e78113e6 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -498,7 +498,7 @@ public class Functions {
         return ComputerLauncher.LIST;
     }
 
-    public static List<Descriptor<RetentionStrategy<?>>> getSlaveAvailabilityStrategyDescriptors() {
+    public static List<Descriptor<RetentionStrategy<?>>> getRetentionStrategyDescriptors() {
         return RetentionStrategy.LIST;
     }
 
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index c04cb6aff7..4a6f4ae95f 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -1524,7 +1524,7 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node,
 
     private Slave newSlave(StaplerRequest req, JSONObject j) throws FormException {
         final ComputerLauncher launcher = newDescribedChild(req, j, "launcher", ComputerLauncher.LIST);
-        final RetentionStrategy retentionStrategy = newDescribedChild(req, j, "availabilityStrategy", RetentionStrategy.LIST);
+        final RetentionStrategy retentionStrategy = newDescribedChild(req, j, "retentionStrategy", RetentionStrategy.LIST);
         final Slave slave = req.bindJSON(Slave.class, j);
         slave.setLauncher(launcher);
         slave.setRetentionStrategy(retentionStrategy);
diff --git a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
index ee5ecaf1d1..0919ec040f 100644
--- a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly
@@ -62,14 +62,13 @@
                     </select>
                 </s:entry>
 
-                <s:dropdownList name="slave.startMethodClass" title="${%Start method}"
+                <s:dropdownList name="slave.launcherClass" title="${%Start method}"
                                 help="/help/system-config/master-slave/launcher.html">
                     <j:forEach var="d" items="${h.getComputerLauncherDescriptors()}" varStatus="loop">
                         <s:dropdownListBlock value="${d.class.name}" name="${d.displayName}"
                                              selected="${s.launcher.descriptor==d}"
                                              title="${d.displayName}">
                             <s:nested>
-                                <j:if test='${d.configPage != ""}'>
                                 <div name="launcher">
                                     <table width="100%">
                                         <j:set var="descriptor" value="${d}"/>
@@ -78,26 +77,23 @@
                                         <st:include from="${d}" page="${d.configPage}" optional="true"/>
                                     </table>
                                 </div>
-                                </j:if>
                             </s:nested>
                         </s:dropdownListBlock>
                     </j:forEach>
                 </s:dropdownList>
 
-                <s:dropdownList name="slave.availabilityStrategyClass" title="${%Availability}"
+                <s:dropdownList name="slave.retentionStrategyClass" title="${%Availability}"
                                 help="/help/system-config/master-slave/availability.html">
-                    <j:forEach var="d" items="${h.getSlaveAvailabilityStrategyDescriptors()}">
+                    <j:forEach var="d" items="${h.getRetentionStrategyDescriptors()}">
                         <j:if test="${d != null}">
                             <s:dropdownListBlock value="${d.class.name}" name="${d.displayName}"
-                                                 selected="${s.availabilityStrategy.descriptor==d}"
+                                                 selected="${s.retentionStrategy.descriptor==d}"
                                                  title="${d.displayName}">
                                 <s:nested>
-                                    <j:if test='${d.configPage != ""}'>
-                                        <j:set var="descriptor" value="${d}"/>
-                                        <j:set var="instance"
-                                               value="${h.ifThenElse(s.availabilityStrategy.descriptor==d,s.availabilityStrategy,null)}"/>
-                                        <st:include from="${d}" page="${d.configPage}" optional="true"/>
-                                    </j:if>
+                                      <j:set var="descriptor" value="${d}"/>
+                                      <j:set var="instance"
+                                             value="${h.ifThenElse(s.retentionStrategy.descriptor==d,s.retentionStrategy,null)}"/>
+                                      <st:include from="${d}" page="${d.configPage}" optional="true"/>
                                 </s:nested>
                             </s:dropdownListBlock>
                         </j:if>