--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java	2015-06-01 08:14:32.505879582 -0700
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java	2015-06-01 08:14:32.307878275 -0700
@@ -286,10 +286,10 @@
         if (!doProcessArgs(args, allowableOpts, helper, allowOperands, checkFileManager))
             return false;
 
-        String platformString = options.get(Option.PLATFORM);
+        String platformString = options.get(Option.RELEASE);
 
         checkOptionAllowed(platformString == null,
-                option -> error("err.platform.bootclasspath.conflict", option.getText()),
+                option -> error("err.release.bootclasspath.conflict", option.getText()),
                 Option.BOOTCLASSPATH, Option.XBOOTCLASSPATH, Option.XBOOTCLASSPATH_APPEND,
                 Option.XBOOTCLASSPATH_PREPEND, Option.ENDORSEDDIRS, Option.EXTDIRS, Option.SOURCE,
                 Option.TARGET);
@@ -298,7 +298,7 @@
             PlatformProvider platformProvider = lookupPlatformProvider(platformString);
 
             if (platformProvider == null) {
-                error("err.unsupported.platform.version", platformString);
+                error("err.unsupported.release.version", platformString);
                 return false;
             }
 
@@ -316,7 +316,7 @@
                 JavaFileManager fm = getFileManager();
 
                 if (!(fm instanceof StandardJavaFileManager)) {
-                    error("err.platform.not.standard.file.manager");
+                    error("err.release.not.standard.file.manager");
                     return false;
                 }
 
@@ -470,7 +470,7 @@
 
         boolean lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option);
 
-        if (lintOptions && source.compareTo(Source.DEFAULT) < 0 && !options.isSet(Option.PLATFORM)) {
+        if (lintOptions && source.compareTo(Source.DEFAULT) < 0 && !options.isSet(Option.RELEASE)) {
             JavaFileManager fm = getFileManager();
             if (fm instanceof BaseFileManager) {
                 if (((BaseFileManager) fm).isDefaultBootClassPath())