diff --git a/manifests/api.pp b/manifests/api.pp
index d8a864cf..808cf28e 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -378,7 +378,7 @@ class glance::api(
   }
 
   if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
-    ensure_packages('glance-api',
+    ensure_packages($glance::params::api_package_name,
       {
         ensure => $package_ensure,
         tag    => ['openstack', 'glance-package'],
diff --git a/manifests/params.pp b/manifests/params.pp
index 9ccd0502..ce3c1bfc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,7 +3,7 @@
 class glance::params {
   include ::openstacklib::defaults
 
-  if ($::os_package_type == 'debian') {
+  if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
     $pyvers = '3'
   } else {
     $pyvers = ''
@@ -16,8 +16,6 @@ class glance::params {
 
   case $::osfamily {
     'RedHat': {
-      $api_package_name      = 'openstack-glance'
-      $registry_package_name = 'openstack-glance'
       $api_service_name      = 'openstack-glance-api'
       $registry_service_name = 'openstack-glance-registry'
       if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) {
@@ -25,6 +23,13 @@ class glance::params {
       } else {
         $pyceph_package_name = 'python-rbd'
       }
+      if ($::operatingsystem != 'Fedora') {
+        $api_package_name      = 'openstack-glance'
+        $registry_package_name = 'openstack-glance'
+      } else {
+        $api_package_name      = 'openstack-glance-api'
+        $registry_package_name = 'openstack-glance-registry'
+      }
     }
     'Debian': {
       $api_package_name      = 'glance-api'
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 279d8f2c..d68c8b5e 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -156,7 +156,7 @@ class glance::registry(
   include ::glance::registry::db
 
   if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
-    ensure_packages( 'glance-registry',
+    ensure_packages($glance::params::registry_package_name,
       {
         ensure => $package_ensure,
         tag    => ['openstack', 'glance-package'],
diff --git a/spec/classes/glance_client_spec.rb b/spec/classes/glance_client_spec.rb
index 4537f7f3..4cfac09e 100644
--- a/spec/classes/glance_client_spec.rb
+++ b/spec/classes/glance_client_spec.rb
@@ -29,7 +29,11 @@ describe 'glance::client' do
             { :client_package_name => 'python-glanceclient' }
           end
         when 'RedHat'
-          { :client_package_name => 'python-glanceclient' }
+          if facts[:operatingsystem] == 'Fedora'
+            { :client_package_name => 'python3-glanceclient' }
+          else
+            { :client_package_name => 'python-glanceclient' }
+          end
         end
       end