diff --git a/build/build.xml b/build/build.xml
index c0ff1817f..c1a2aabc5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -366,13 +366,12 @@
       <equals arg1="${jdk.data.model}" arg2="64" />
     </condition>
 
-    <downloader train="${jdk.train}"
+    <downloader component="jdk"
+                train="${jdk.train}"
                 version="${jdk.version}"
-                openJdk="true"
                 platform="${target-platform}${jdk.data.model}"
                 update="${jdk.update}"
                 build="${jdk.build}"
-                component="JDK"
                 flavor="${jdk.downloader}"
                 path="${jdk.tgz.path}" />
   </target>
@@ -380,14 +379,13 @@
   <target name="jfx-download" depends="jfx-check, downloader-setup"
           unless="jfx.zip.downloaded">
 
-    <downloader train="${jfx.train}"
+    <downloader component="jfx"
+                train="${jfx.train}"
                 version="${jfx.version}"
-                openJdk="true"
                 platform="${target-platform}${jdk.data.model}"
                 update="${jfx.update}"
                 build="1"
                 hash="${jfx.hash}"
-                component="JFX"
                 flavor="${target-platform}${jdk.data.model}.zip"
                 path="${jfx.path.zip}" />
 
diff --git a/build/jre/src/Downloader.java b/build/jre/src/Downloader.java
index 575faa824..ef216a032 100644
--- a/build/jre/src/Downloader.java
+++ b/build/jre/src/Downloader.java
@@ -39,7 +39,7 @@ public class Downloader extends Task {
   private int update;  // Update 131
   private int build;  // Build 11
 
-  private String component;  // "jre", "jdk", or "jfx"
+  private String component;  // "jdk" or "jfx"
   private String flavor;  // Like "zip"
   private String path;  // target path
 
@@ -103,10 +103,10 @@ public class Downloader extends Task {
   /**
    * Indicate what component or release type of Java is being downloaded.
    *
-   * @param component The component to download like "JDK", "JRE", or "OpenJFX".
+   * @param component The component to download like "jdk" or "jfx"
    */
   public void setComponent(String component) {
-    this.component = component;
+    this.component = component.toLowerCase();
   }
 
 
@@ -131,7 +131,7 @@ public class Downloader extends Task {
 
 
   /**
-   * Download the JDK or JRE.
+   * Entry point called by Ant
    */
   public void execute() throws BuildException {
     if (train == 0) {
@@ -139,8 +139,7 @@ public class Downloader extends Task {
       throw new BuildException("Train (i.e. 1 or 11) must be set");
     }
 
-    boolean isJava11 = train == 11;
-    if (!isJava11 && version == 0) {
+    if (train != 11 && version == 0) {
       throw new BuildException("Version (i.e. 7 or 8) must be set");
     }
 
@@ -281,18 +280,12 @@ public class Downloader extends Task {
    * @return The to be downloaded or empty if there is no download required.
    */
   private Optional<DownloadItem> getDownloadItem() {
-    // Determine download type
-    boolean isJavaDownload = component.equalsIgnoreCase("jdk");
-    isJavaDownload = isJavaDownload || component.equalsIgnoreCase("jre");
-
-    boolean isJfxDownload = component.equalsIgnoreCase("jfx");
-
     DownloadUrlGenerator downloadUrlGenerator;
 
     // Determine url generator
-    if (isJavaDownload) {
+    if (component.equals("jdk")) {
       downloadUrlGenerator = new AdoptOpenJdkDownloadUrlGenerator();
-    } else if (isJfxDownload) {
+    } else if (component.equals("jfx")) {
       downloadUrlGenerator = new GluonHqDownloadUrlGenerator();
     } else {
       throw new RuntimeException("Do not know how to download: " + component);