diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 7f55e4b9c1d8db660b1b2a8b729fde4357d9e3ec..3383aafaf5772f2e60abdc345696902a8118800a 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1789,38 +1789,27 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
         super.submit(req,rsp);
         JSONObject json = req.getSubmittedForm();
 
-        // "disable": true
         makeDisabled(json.optBoolean("disable"));
 
         jdk = json.optString("jdk", null);
 
-        // "hasCustomQuietPeriod": {"quiet_period": "3"}
-        JSONObject customQuietPeriodJson = json.optJSONObject("hasCustomQuietPeriod");
-        if(customQuietPeriodJson!=null && !customQuietPeriodJson.isNullObject()) {
-            quietPeriod = customQuietPeriodJson.optInt("quiet_period");
+        if(json.optBoolean("hasCustomQuietPeriod", json.has("quiet_period"))) {
+            quietPeriod = json.optInt("quiet_period");
         } else {
             quietPeriod = null;
         }
 
-        // "hasCustomScmCheckoutRetryCount": {"scmCheckoutRetryCount": "12"}
-        JSONObject customRetryJson = json.optJSONObject("hasCustomScmCheckoutRetryCount");
-        if(customRetryJson!=null && !customRetryJson.isNullObject()) {
-            scmCheckoutRetryCount = customRetryJson.optInt("scmCheckoutRetryCount");
+        if(json.optBoolean("hasCustomScmCheckoutRetryCount", json.has("scmCheckoutRetryCount"))) {
+            scmCheckoutRetryCount = json.optInt("scmCheckoutRetryCount");
         } else {
             scmCheckoutRetryCount = null;
         }
 
-        // "blockBuildWhenDownstreamBuilding": true
         blockBuildWhenDownstreamBuilding = json.optBoolean("blockBuildWhenDownstreamBuilding");
-
-        // "blockBuildWhenUpstreamBuilding": true
         blockBuildWhenUpstreamBuilding = json.optBoolean("blockBuildWhenUpstreamBuilding");
 
-        // "customWorkspace": {"directory": "aaa"}
-        JSONObject customWorkspaceJson = json.optJSONObject("customWorkspace");
-        if(customWorkspace!=null && !customWorkspaceJson.isNullObject()) {
-            customWorkspace = Util.fixEmptyAndTrim(
-                customWorkspaceJson.optString("directory"));
+        if(json.optBoolean("hasCustomWorkspace", json.has("customWorkspace"))) {
+            customWorkspace = Util.fixEmptyAndTrim(json.optString("customWorkspace"));
         } else {
             customWorkspace = null;
         }
@@ -1831,11 +1820,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
         else
             scmCheckoutStrategy = null;
 
-
-        JSONObject slaveAffinity = json.getJSONObject("hasSlaveAffinity");
-        if(slaveAffinity!=null && !slaveAffinity.isNullObject()) {
-            assignedNode = Util.fixEmptyAndTrim(
-                slaveAffinity.optString("assignedLabelString"));
+        if(json.optBoolean("hasSlaveAffinity", json.has("label"))) {
+            assignedNode = Util.fixEmptyAndTrim(json.optString("label"));
         } else {
             assignedNode = null;
         }
@@ -2032,8 +2018,8 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
             return true;
         }
 
-        public FormValidation doCheckAssignedLabelString(@AncestorInPath AbstractProject<?,?> project,
-                                                         @QueryParameter String value) {
+        public FormValidation doCheckLabel(@AncestorInPath AbstractProject<?,?> project,
+                                           @QueryParameter String value) {
             if (Util.fixEmpty(value)==null)
                 return FormValidation.ok(); // nothing typed yet
             try {
@@ -2070,7 +2056,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
             ));
         }
 
-        public FormValidation doCheckCustomWorkspace(@QueryParameter(value="customWorkspace.directory") String customWorkspace){
+        public FormValidation doCheckCustomWorkspace(@QueryParameter String customWorkspace){
         	if(Util.fixEmptyAndTrim(customWorkspace)==null)
         		return FormValidation.error(Messages.AbstractProject_CustomWorkspaceEmpty());
         	else
@@ -2090,7 +2076,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
             return candidates;
         }
 
-        public AutoCompletionCandidates doAutoCompleteAssignedLabelString(@QueryParameter String value) {
+        public AutoCompletionCandidates doAutoCompleteLabel(@QueryParameter String value) {
             AutoCompletionCandidates c = new AutoCompletionCandidates();
             Set<Label> labels = Jenkins.getInstance().getLabels();
             List<String> queries = new AutoCompleteSeeder(value).getSeeds();
diff --git a/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly b/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
index 1bbca02c7de485c2d4207e8ecd856c07f015f88c..9959f6d18d119523d73dc491e08e460ca6650ed0 100644
--- a/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-assignedLabel.jelly
@@ -29,9 +29,9 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <!-- master/slave -->
   <j:if test="${app.labels.size() gt 1 || app.clouds.size() gt 0 || (it.assignedLabel!=null and it.assignedLabel!=app.selfLabel)}">
-    <f:optionalBlock name="hasSlaveAffinity" title="${%Restrict where this project can be run}" checked="${it.assignedLabel!=null}" field="slaveAffinity">
-      <f:entry title="${%Label Expression}" field="assignedLabelString">
-        <f:textbox autoCompleteDelimChar=" "/>
+    <f:optionalBlock name="hasSlaveAffinity" title="${%Restrict where this project can be run}" checked="${it.assignedLabel!=null}" field="slaveAffinity" inline="true">
+      <f:entry title="${%Label Expression}" field="label">
+        <f:textbox autoCompleteDelimChar=" " value="${it.assignedLabelString}"/>
       </f:entry>
     </f:optionalBlock>
   </j:if>
diff --git a/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly b/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
index c1c736c051facbdc8248feff5138b26732e20422..44a2aefa76a86c1a990ebb3dab1e8d384320016c 100644
--- a/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-customWorkspace.jelly
@@ -25,9 +25,10 @@ THE SOFTWARE.
 <!-- custom workspace -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:optionalBlock name="customWorkspace" title="${%Use custom workspace}" checked="${it.customWorkspace!=null}" help="/help/project-config/custom-workspace.html">
-    <f:entry title="${%Directory}">
-      <f:textbox name="customWorkspace.directory" field="customWorkspace" />
+  <f:optionalBlock name="hasCustomWorkspace" title="${%Use custom workspace}" checked="${it.customWorkspace!=null}"
+                   help="/help/project-config/custom-workspace.html" inline="true">
+    <f:entry title="${%Directory}" field="customWorkspace">
+      <f:textbox />
     </f:entry>
   </f:optionalBlock>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly b/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
index b6b2ed7e791750aa98ccf556497f1b66a28c2a2f..b61121b60fc231fcea4c2dc93a135d8784a0d362 100644
--- a/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-quietPeriod.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="hasCustomQuietPeriod" title="${%Quiet period}" checked="${it.hasCustomQuietPeriod}"
-      help="/descriptor/jenkins.model.GlobalQuietPeriodConfiguration/help/quietPeriod">
+      help="/descriptor/jenkins.model.GlobalQuietPeriodConfiguration/help/quietPeriod" inline="true">
     <f:entry title="${%Quiet period}"
       description="${%Number of seconds}">
       <f:number clazz="number" name="quiet_period" value="${it.quietPeriod}" min="0" step="1"/>
diff --git a/core/src/main/resources/lib/hudson/project/config-retryCount.jelly b/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
index 4e98108b57b8eaa1a39c107066c15b23c06584e5..ce51ea8cc1a9049e2386b9fb0c980e6c3ebb7eeb 100644
--- a/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
+++ b/core/src/main/resources/lib/hudson/project/config-retryCount.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="hasCustomScmCheckoutRetryCount" title="${%Retry Count}" checked="${it.hasCustomScmCheckoutRetryCount()}"
-      help="/help/project-config/scmCheckoutRetryCount.html">
+      help="/help/project-config/scmCheckoutRetryCount.html" inline="true">
     <f:entry title="${%SCM checkout retry count}">
       <f:number clazz="number" name="scmCheckoutRetryCount" value="${it.scmCheckoutRetryCount}" min="0" step="1"/>
     </f:entry>
diff --git a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
index d75e892567ff9c3166ce6e63e66a687354cae155..28acaeeebf4679ef0ee79be7db48b4cbe0c82d96 100644
--- a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
+++ b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
@@ -233,11 +233,11 @@ public class LabelExpressionTest extends HudsonTestCase {
 
                 Label l = jenkins.getLabel("foo");
                 DumbSlave s = createSlave(l);
-                String msg = d.doCheckAssignedLabelString(null, "goo").renderHtml();
+                String msg = d.doCheckLabel(null, "goo").renderHtml();
                 assertTrue(msg.contains("foo"));
                 assertTrue(msg.contains("goo"));
 
-                msg = d.doCheckAssignedLabelString(null, "master && goo").renderHtml();
+                msg = d.doCheckLabel(null, "master && goo").renderHtml();
                 assertTrue(msg.contains("foo"));
                 assertTrue(msg.contains("goo"));
                 return null;