diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java
index 8e95b91fbe..429535de8e 100644
--- a/core/src/main/java/hudson/model/RunParameterValue.java
+++ b/core/src/main/java/hudson/model/RunParameterValue.java
@@ -72,11 +72,11 @@ public class RunParameterValue extends ParameterValue {
         String value = Jenkins.getInstance().getRootUrl() + getRun().getUrl();
         env.put(name, value);
 
-        env.put(name + ".jobName", getJobName());
-        env.put(name + "_jobName", getJobName());
+        env.put(name + ".jobName", getJobName());   // undocumented, left for backward compatibility
+        env.put(name + "_JOBNAME", getJobName());   // prefer this version
 
-        env.put(name + ".number" , getNumber ());
-        env.put(name + "_number" , getNumber ());
+        env.put(name + ".number" , getNumber ());   // same as above
+        env.put(name + "_NUMBER" , getNumber ());
 
         env.put(name.toUpperCase(Locale.ENGLISH),value); // backward compatibility pre 1.345
 
diff --git a/test/src/test/java/hudson/model/RunParameterDefinitionTest.java b/test/src/test/java/hudson/model/RunParameterDefinitionTest.java
index 3a7fa63e0a..7d0da8964c 100644
--- a/test/src/test/java/hudson/model/RunParameterDefinitionTest.java
+++ b/test/src/test/java/hudson/model/RunParameterDefinitionTest.java
@@ -60,9 +60,9 @@ public class RunParameterDefinitionTest {
         val.buildEnvVars(null, env);
         assertEquals(j.jenkins.getRootUrl() + "job/dir/job/sub%20dir/job/some%20project/2/", env.get("build"));
         assertEquals("dir/sub dir/some project", env.get("build.jobName"));
-        assertEquals("dir/sub dir/some project", env.get("build_jobName"));
+        assertEquals("dir/sub dir/some project", env.get("build_JOBNAME"));
         assertEquals("2", env.get("build.number"));
-        assertEquals("2", env.get("build_number"));
+        assertEquals("2", env.get("build_NUMBER"));
     }
 
 }
diff --git a/war/src/main/webapp/help/parameter/run-project.html b/war/src/main/webapp/help/parameter/run-project.html
index 13663423f5..a7456ecbf8 100755
--- a/war/src/main/webapp/help/parameter/run-project.html
+++ b/war/src/main/webapp/help/parameter/run-project.html
@@ -1,13 +1,9 @@
 <div>
-    Defines the job from which the user can pick runs. The last run will be the default.<br/>
-    <br/>
-    These parameters are exposed to build as environment variables:<br/>
-    <br/>
-    PARAMETER_NAME=&lt;jenkins_url&gt;/job/&lt;job_name&gt;/&lt;run_number/<br/>
-    <br/>
-    PARAMETER_NAME.jobName=&lt;job_name&gt;<br/>
-    PARAMETER_NAME_jobName=&lt;job_name&gt;<br/>
-    <br/>
-    PARAMETER_NAME.number=&lt;run_number&gt;<br/>
-    PARAMETER_NAME_number=&lt;run_number&gt;
+    Defines the job from which the user can pick runs. The last run will be the default.
+    These parameters are exposed to build as environment variables:
+<pre>
+PARAMETER_NAME=<i>&lt;jenkins_url&gt;</i>/job/<i>&lt;job_name&gt;/&lt;run_number&gt;</i>/
+PARAMETER_NAME_JOBNAME=<i>&lt;job_name&gt;</i>
+PARAMETER_NAME_NUMBER=<i>&lt;run_number&gt;</i>
+</pre>
 </div>
\ No newline at end of file