diff --git a/Casks/java-beta.rb b/Casks/java-beta.rb
index 8c21ee910..35f967503 100644
--- a/Casks/java-beta.rb
+++ b/Casks/java-beta.rb
@@ -1,32 +1,32 @@
 cask 'java-beta' do
-  version '1.8.0_152_b05'
-  sha256 '0ff18371bd0b9e6a5f8a1477fed5576aa7642414f43b12ec7b1c950d0ede22cb'
+  version '1.9,181'
+  sha256 '4d24a3260fc0e238cc67a40b72fbd733864f345dc5a59d2d796eeaebac00bc38'
 
-  url 'http://download.java.net/java/jdk8u152/archive/b05/binaries/jdk-8u152-ea-bin-b05-macosx-x86_64-20_jun_2017.dmg',
+  url "http://download.java.net/java/jdk#{version.minor}/archive/#{version.after_comma}/binaries/jdk-#{version.minor}+#{version.after_comma}_osx-x64_bin.dmg",
       cookies: { 'oraclelicense' => 'accept-securebackup-cookie' }
   name 'Java Standard Edition Development Kit'
-  homepage 'http://jdk.java.net/8/'
+  homepage "http://jdk.java.net/#{version.minor}/"
 
-  pkg "JDK #{version.minor} Update #{version.split('_')[1].split('-')[0]}.pkg"
+  pkg "JDK #{version.minor}.pkg"
 
   postflight do
     system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"],
+                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
                    sudo: true
     system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"],
+                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
                    sudo: true
     system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"],
+                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
                    sudo: true
     system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Info.plist"],
+                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
                    sudo: true
     system_command '/bin/mkdir',
-                   args: ['-p', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries"],
+                   args: ['-p', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/bundle/Libraries"],
                    sudo: true
     system_command '/bin/ln',
-                   args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/jre/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"],
+                   args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"],
                    sudo: true
 
     if MacOS.version <= :mavericks
@@ -34,22 +34,22 @@ cask 'java-beta' do
                      args: ['-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
                      sudo: true
       system_command '/bin/ln',
-                     args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk#{version}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
+                     args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
                      sudo: true
     end
   end
 
-  uninstall pkgutil: 'com.oracle.jdk8u122',
+  uninstall pkgutil: "com.oracle.jdk-#{version.minor}",
             delete:  [
                        MacOS.version <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
                      ].keep_if { |v| !v.empty? }
 
-  zap       delete: [
-                      '~/Library/Application Support/Oracle/Java',
-                      '~/Library/Caches/com.oracle.java.Java-Updater',
-                      '~/Library/Caches/net.java.openjdk.cmd',
-                    ],
-            rmdir:  '~/Library/Application Support/Oracle/'
+  zap delete: [
+                '~/Library/Caches/com.oracle.java.Java-Updater',
+                '~/Library/Caches/net.java.openjdk.cmd',
+              ],
+      trash:  '~/Library/Application Support/Oracle/Java',
+      rmdir:  '~/Library/Application Support/Oracle/'
 
   caveats <<-EOS.undent
     This Cask makes minor modifications to the JRE to prevent any packaged
diff --git a/Casks/java9-beta.rb b/Casks/java9-beta.rb
deleted file mode 100644
index a331b054c..000000000
--- a/Casks/java9-beta.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-cask 'java9-beta' do
-  version '1.9,181'
-  sha256 '4d24a3260fc0e238cc67a40b72fbd733864f345dc5a59d2d796eeaebac00bc38'
-
-  url "http://download.java.net/java/jdk#{version.before_comma.minor}/archive/#{version.after_comma}/binaries/jdk-#{version.before_comma.minor}+#{version.after_comma}_osx-x64_bin.dmg",
-      cookies: { 'oraclelicense' => 'accept-securebackup-cookie' }
-  name 'Java Standard Edition Development Kit'
-  homepage 'http://jdk.java.net/9/'
-
-  pkg 'JDK 9.pkg'
-
-  postflight do
-    system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string BundledApp', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
-                   sudo: true
-    system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string JNI', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
-                   sudo: true
-    system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string WebStart', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
-                   sudo: true
-    system_command '/usr/libexec/PlistBuddy',
-                   args: ['-c', 'Add :JavaVM:JVMCapabilities: string Applets', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Info.plist"],
-                   sudo: true
-    system_command '/bin/mkdir',
-                   args: ['-p', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/bundle/Libraries"],
-                   sudo: true
-    system_command '/bin/ln',
-                   args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/lib/server/libjvm.dylib", "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents/Home/bundle/Libraries/libserver.dylib"],
-                   sudo: true
-
-    if MacOS.version <= :mavericks
-      system_command '/bin/rm',
-                     args: ['-rf', '--', '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
-                     sudo: true
-      system_command '/bin/ln',
-                     args: ['-nsf', '--', "/Library/Java/JavaVirtualMachines/jdk-#{version.minor}.jdk/Contents", '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'],
-                     sudo: true
-    end
-  end
-
-  uninstall pkgutil: 'com.oracle.jdk-9',
-            delete:  [
-                       MacOS.version <= :mavericks ? '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK' : '',
-                     ].keep_if { |v| !v.empty? }
-
-  zap       delete: [
-                      '~/Library/Application Support/Oracle/Java',
-                      '~/Library/Caches/com.oracle.java.Java-Updater',
-                      '~/Library/Caches/net.java.openjdk.cmd',
-                    ],
-            rmdir:  '~/Library/Application Support/Oracle/'
-
-  caveats <<-EOS.undent
-    This Cask makes minor modifications to the JRE to prevent any packaged
-    application issues.
-
-    If your Java application still asks for JRE installation, you might need to
-    reboot or logout/login.
-
-    The JRE packaging bug is discussed here:
-
-        https://bugs.eclipse.org/bugs/show_bug.cgi?id=411361
-
-    Installing this Cask means you have AGREED to the Oracle Binary Code License
-    Agreement for Java SE at
-
-        http://www.oracle.com/technetwork/java/javase/terms/license/index.html
-
-    EOS
-end