diff --git a/manifests/download.pp b/manifests/download.pp
index 63636c64..8c31fbef 100644
--- a/manifests/download.pp
+++ b/manifests/download.pp
@@ -207,19 +207,19 @@
   # package name to use in destination directory for the installer
   case $_package_type {
     'bin' : {
-      $package_name = "${java_se}-${release_major}-${os}-${arch}.bin"
+      $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.bin"
     }
     'rpmbin' : {
-      $package_name = "${java_se}-${release_major}-${os}-${arch}-rpm.bin"
+      $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}-rpm.bin"
     }
     'rpm' : {
-      $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
+      $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm"
     }
     'tar.gz' : {
-      $package_name = "${java_se}-${release_major}-${os}-${arch}.tar.gz"
+      $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.tar.gz"
     }
     default : {
-      $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
+      $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm"
     }
   }
 
diff --git a/spec/defines/download_spec.rb b/spec/defines/download_spec.rb
index 100cc86e..f2b0c286 100644
--- a/spec/defines/download_spec.rb
+++ b/spec/defines/download_spec.rb
@@ -21,7 +21,7 @@
       let(:title) { 'jdk8' }
 
       it {
-        is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
+        is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.rpm')
       }
     end
 
@@ -81,7 +81,7 @@
       let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
+      it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') }
     end
   end
 
@@ -92,7 +92,7 @@
       let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
+      it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') }
     end
   end