diff --git a/manifests/backup/ceph.pp b/manifests/backup/ceph.pp
index aeb0e5e1..e40670ac 100644
--- a/manifests/backup/ceph.pp
+++ b/manifests/backup/ceph.pp
@@ -23,7 +23,7 @@
 #
 # [*backup_driver*]
 #   (optional) Which cinder backup driver to use
-#   Defaults to 'cinder.backup.drivers.ceph'
+#   Defaults to 'cinder.backup.drivers.ceph.CephBackupDriver'
 #
 # [*backup_ceph_conf*]
 #   (optional) Ceph config file to use.
@@ -58,7 +58,7 @@
 #
 
 class cinder::backup::ceph (
-  $backup_driver            = 'cinder.backup.drivers.ceph',
+  $backup_driver            = 'cinder.backup.drivers.ceph.CephBackupDriver',
   $backup_ceph_conf         = '/etc/ceph/ceph.conf',
   $backup_ceph_user         = 'cinder',
   $backup_ceph_chunk_size   = '134217728',
diff --git a/manifests/backup/glusterfs.pp b/manifests/backup/glusterfs.pp
index fe0fcefe..4fbafee5 100644
--- a/manifests/backup/glusterfs.pp
+++ b/manifests/backup/glusterfs.pp
@@ -6,7 +6,7 @@
 #
 # [*backup_driver*]
 #   (Optional) The backup driver for GlisterFS backend.
-#   Defaults to 'cinder.backup.drivers.glusterfs'.
+#   Defaults to 'cinder.backup.drivers.glusterfs.GlusterfsBackupDriver'.
 #
 # [*glusterfs_backup_mount_point*]
 #   (optional) Base dir container mount point for gluster share.
@@ -39,7 +39,7 @@
 #
 #
 class cinder::backup::glusterfs (
-  $backup_driver                = 'cinder.backup.drivers.glusterfs',
+  $backup_driver                = 'cinder.backup.drivers.glusterfs.GlusterfsBackupDriver',
   $glusterfs_backup_mount_point = $::os_service_default,
   $glusterfs_backup_share       = $::os_service_default,
 ) {
diff --git a/manifests/backup/google.pp b/manifests/backup/google.pp
index d99ebbc6..296179cc 100644
--- a/manifests/backup/google.pp
+++ b/manifests/backup/google.pp
@@ -6,7 +6,7 @@
 #
 # [*backup_driver*]
 #   (Optional) The backup driver for GCS back-end.
-#   Defaults to 'cinder.backup.drivers.google'.
+#   Defaults to 'cinder.backup.drivers.google.GoogleBackupDriver'.
 #
 # [*backup_gcs_bucket*]
 #   (optional) The GCS bucket to use.
@@ -87,7 +87,7 @@
 #
 #
 class cinder::backup::google (
-  $backup_driver                    = 'cinder.backup.drivers.google',
+  $backup_driver                    = 'cinder.backup.drivers.google.GoogleBackupDriver',
   $backup_gcs_bucket                = $::os_service_default,
   $backup_gcs_object_size           = $::os_service_default,
   $backup_gcs_block_size            = $::os_service_default,
diff --git a/manifests/backup/nfs.pp b/manifests/backup/nfs.pp
index 4c30ab4a..1abdb36e 100644
--- a/manifests/backup/nfs.pp
+++ b/manifests/backup/nfs.pp
@@ -10,7 +10,7 @@
 #
 # [*backup_driver*]
 #   (optional) The backup driver for NFS back-end.
-#   Defaults to 'cinder.backup.drivers.nfs'.
+#   Defaults to 'cinder.backup.drivers.nfs.NFSBackupDriver'.
 #
 # [*backup_file_size*]
 #   (optional) The maximum size in bytes of the files used to hold
@@ -70,7 +70,7 @@
 #
 class cinder::backup::nfs (
   $backup_share,
-  $backup_driver                = 'cinder.backup.drivers.nfs',
+  $backup_driver                = 'cinder.backup.drivers.nfs.NFSBackupDriver',
   $backup_file_size             = $::os_service_default,
   $backup_sha_block_size_bytes  = $::os_service_default,
   $backup_enable_progress_timer = $::os_service_default,
diff --git a/manifests/backup/posix.pp b/manifests/backup/posix.pp
index df8963b2..164c780e 100644
--- a/manifests/backup/posix.pp
+++ b/manifests/backup/posix.pp
@@ -6,7 +6,7 @@
 #
 # [*backup_driver*]
 #   (Optional) The backup driver for posix backend.
-#   Defaults to 'cinder.backup.drivers.posix'.
+#   Defaults to 'cinder.backup.drivers.posix.PosixBackupDriver'.
 #
 # [*backup_file_size*]
 #   (optional) The maximum size in bytes of the files used to hold backups.
@@ -56,7 +56,7 @@
 #
 #
 class cinder::backup::posix (
-  $backup_driver               = 'cinder.backup.drivers.posix',
+  $backup_driver               = 'cinder.backup.drivers.posix.PosixBackupDriver',
   $backup_file_size            = $::os_service_default,
   $backup_sha_block_size_bytes = $::os_service_default,
   $backup_posix_path           = $::os_service_default,
diff --git a/manifests/backup/swift.pp b/manifests/backup/swift.pp
index 50df538f..c3b3ffae 100644
--- a/manifests/backup/swift.pp
+++ b/manifests/backup/swift.pp
@@ -6,7 +6,7 @@
 #
 # [*backup_driver*]
 #   (Optional) The backup driver for Swift back-end.
-#   Defaults to 'cinder.backup.drivers.swift'.
+#   Defaults to 'cinder.backup.drivers.swift.SwiftBackupDriver'.
 #
 # [*backup_swift_url*]
 #   (optional) The URL of the Swift endpoint.
@@ -75,7 +75,7 @@
 #
 #
 class cinder::backup::swift (
-  $backup_driver                = 'cinder.backup.drivers.swift',
+  $backup_driver                = 'cinder.backup.drivers.swift.SwiftBackupDriver',
   $backup_swift_url             = $::os_service_default,
   $backup_swift_auth_url        = $::os_service_default,
   $backup_swift_container       = 'volumebackups',
diff --git a/manifests/backup/tsm.pp b/manifests/backup/tsm.pp
index 26db8a10..5180fe47 100644
--- a/manifests/backup/tsm.pp
+++ b/manifests/backup/tsm.pp
@@ -6,7 +6,7 @@
 #
 # [*backup_driver*]
 #   (Optional) The backup driver for tsm backend.
-#   Defaults to 'cinder.backup.drivers.tsm'.
+#   Defaults to 'cinder.backup.drivers.tsm.TSMBackupDriver'.
 #
 # [*backup_tsm_volume_prefix*]
 #   (optional) Volume prefix for the backup id when backing up to TSM.
@@ -42,7 +42,7 @@
 #
 #
 class cinder::backup::tsm (
-  $backup_driver            = 'cinder.backup.drivers.tsm',
+  $backup_driver            = 'cinder.backup.drivers.tsm.TSMBackupDriver',
   $backup_tsm_volume_prefix = $::os_service_default,
   $backup_tsm_password      = $::os_service_default,
   $backup_tsm_compression   = $::os_service_default,
diff --git a/releasenotes/notes/cinder-backup-driver-use-classname-910b92dfb6e67697.yaml b/releasenotes/notes/cinder-backup-driver-use-classname-910b92dfb6e67697.yaml
new file mode 100644
index 00000000..33274ab3
--- /dev/null
+++ b/releasenotes/notes/cinder-backup-driver-use-classname-910b92dfb6e67697.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ability to specify a Cinder backup driver by module name was deprecated
+    in the Queens release and the ability has now been removed in Cinder. This
+    fix updates the defaults to use the full module name, for example
+    ``cinder.backup.drivers.swift.SwiftBackupDriver``.
diff --git a/spec/classes/cinder_backup_ceph_spec.rb b/spec/classes/cinder_backup_ceph_spec.rb
index 52b7df40..12ed7e7b 100644
--- a/spec/classes/cinder_backup_ceph_spec.rb
+++ b/spec/classes/cinder_backup_ceph_spec.rb
@@ -41,7 +41,7 @@ describe 'cinder::backup::ceph' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.ceph')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.ceph.CephBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/backup_ceph_conf').with_value(p[:backup_ceph_conf])
       is_expected.to contain_cinder_config('DEFAULT/backup_ceph_user').with_value(p[:backup_ceph_user])
       is_expected.to contain_cinder_config('DEFAULT/backup_ceph_chunk_size').with_value(p[:backup_ceph_chunk_size])
diff --git a/spec/classes/cinder_backup_glusterfs_spec.rb b/spec/classes/cinder_backup_glusterfs_spec.rb
index 9c29765a..9e261ee5 100644
--- a/spec/classes/cinder_backup_glusterfs_spec.rb
+++ b/spec/classes/cinder_backup_glusterfs_spec.rb
@@ -37,7 +37,7 @@ describe 'cinder::backup::glusterfs' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.glusterfs')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.glusterfs.GlusterfsBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/glusterfs_backup_mount_point').with_value(p[:glusterfs_backup_mount_point])
       is_expected.to contain_cinder_config('DEFAULT/glusterfs_backup_share').with_value(p[:glusterfs_backup_share])
     end
diff --git a/spec/classes/cinder_backup_google_spec.rb b/spec/classes/cinder_backup_google_spec.rb
index 57ecc41c..92356658 100644
--- a/spec/classes/cinder_backup_google_spec.rb
+++ b/spec/classes/cinder_backup_google_spec.rb
@@ -48,7 +48,7 @@ describe 'cinder::backup::google' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.google')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.google.GoogleBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/backup_gcs_bucket').with_value(p[:backup_gcs_bucket])
       is_expected.to contain_cinder_config('DEFAULT/backup_gcs_object_size').with_value(p[:backup_gcs_object_size])
       is_expected.to contain_cinder_config('DEFAULT/backup_gcs_block_size').with_value(p[:backup_gcs_block_size])
diff --git a/spec/classes/cinder_backup_nfs_spec.rb b/spec/classes/cinder_backup_nfs_spec.rb
index 6e2c6498..10834868 100644
--- a/spec/classes/cinder_backup_nfs_spec.rb
+++ b/spec/classes/cinder_backup_nfs_spec.rb
@@ -32,7 +32,7 @@ describe 'cinder::backup::nfs' do
 
   let :default_params do
     {
-      :backup_driver                => 'cinder.backup.drivers.nfs',
+      :backup_driver                => 'cinder.backup.drivers.nfs.NFSBackupDriver',
       :backup_file_size             => '<SERVICE DEFAULT>',
       :backup_sha_block_size_bytes  => '<SERVICE DEFAULT>',
       :backup_enable_progress_timer => '<SERVICE DEFAULT>',
diff --git a/spec/classes/cinder_backup_posix_spec.rb b/spec/classes/cinder_backup_posix_spec.rb
index 3be1b62e..fd7025b7 100644
--- a/spec/classes/cinder_backup_posix_spec.rb
+++ b/spec/classes/cinder_backup_posix_spec.rb
@@ -40,7 +40,7 @@ describe 'cinder::backup::posix' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.posix')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.posix.PosixBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/backup_file_size').with_value(p[:backup_file_size])
       is_expected.to contain_cinder_config('DEFAULT/backup_sha_block_size_bytes').with_value(p[:backup_sha_block_size_bytes])
       is_expected.to contain_cinder_config('DEFAULT/backup_posix_path').with_value(p[:backup_posix_path])
diff --git a/spec/classes/cinder_backup_swift_spec.rb b/spec/classes/cinder_backup_swift_spec.rb
index ac9ba842..513f99c4 100644
--- a/spec/classes/cinder_backup_swift_spec.rb
+++ b/spec/classes/cinder_backup_swift_spec.rb
@@ -45,7 +45,7 @@ describe 'cinder::backup::swift' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.swift')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.swift.SwiftBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/backup_swift_url').with_value(p[:backup_swift_url])
       is_expected.to contain_cinder_config('DEFAULT/backup_swift_auth_url').with_value(p[:backup_swift_auth_url])
       is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container])
diff --git a/spec/classes/cinder_backup_tsm_spec.rb b/spec/classes/cinder_backup_tsm_spec.rb
index 9a627128..8a1f5ee3 100644
--- a/spec/classes/cinder_backup_tsm_spec.rb
+++ b/spec/classes/cinder_backup_tsm_spec.rb
@@ -38,7 +38,7 @@ describe 'cinder::backup::tsm' do
     end
 
     it 'configures cinder.conf' do
-      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.tsm')
+      is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.tsm.TSMBackupDriver')
       is_expected.to contain_cinder_config('DEFAULT/backup_tsm_volume_prefix').with_value(p[:backup_tsm_volume_prefix])
       is_expected.to contain_cinder_config('DEFAULT/backup_tsm_password').with_value(p[:backup_tsm_password]).with_secret(true)
       is_expected.to contain_cinder_config('DEFAULT/backup_tsm_compression').with_value(p[:backup_tsm_compression])