diff --git a/src/lib/charm/openstack/cinder_backup_swift.py b/src/lib/charm/openstack/cinder_backup_swift_proxy.py
similarity index 100%
rename from src/lib/charm/openstack/cinder_backup_swift.py
rename to src/lib/charm/openstack/cinder_backup_swift_proxy.py
diff --git a/src/reactive/cinder_backup_swift_handlers.py b/src/reactive/cinder_backup_swift_handlers.py
index f2bbe7a..7c1bcc6 100644
--- a/src/reactive/cinder_backup_swift_handlers.py
+++ b/src/reactive/cinder_backup_swift_handlers.py
@@ -5,7 +5,7 @@ import charms_openstack
 # This charm's library contains all of the handler code associated with
 # cinder-backup-swift-proxy -- we need to import it to get the definitions
 # for the charm.
-import charm.openstack.cinder_backup_swift  # noqa
+import charm.openstack.cinder_backup_swift_proxy  # noqa
 import charms.reactive.flags as flags
 from charms.reactive.relations import (
     endpoint_from_flag,
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 8644d85..e425c11 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -6,7 +6,7 @@ smoke_bundles:
   - bionic-queens-swift-v3
   - bionic-queens-swift-v2
 configure:
-  - zaza.openstack.charm_tests.cinder_backup_swift.setup.configure_cinder_backup
+  - zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup
 tests:
-  - zaza.openstack.charm_tests.cinder_backup_swift.tests.CinderBackupSwiftTest
+  - zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest
 
diff --git a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py
index a50de0d..b61fe55 100644
--- a/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py
+++ b/unit_tests/test_lib_charm_openstack_cinder_backup_swift.py
@@ -14,19 +14,20 @@
 from __future__ import absolute_import
 from __future__ import print_function
 import charms_openstack.test_utils as test_utils
-import charm.openstack.cinder_backup_swift as cinder_backup_swift
+import charm.openstack.cinder_backup_swift_proxy as cinder_backup_swift_proxy
 
 
 class Helper(test_utils.PatchHelper):
 
     def setUp(self):
         super().setUp()
-        self.patch_release(cinder_backup_swift.CinderBackupSwiftCharm.release)
+        self.patch_release(
+            cinder_backup_swift_proxy.CinderBackupSwiftCharm.release)
 
 
 class TestCinderBackupSwiftCharm(Helper):
 
     def test_swift_backup_name(self):
-        c = cinder_backup_swift.CinderBackupSwiftCharm()
+        c = cinder_backup_swift_proxy.CinderBackupSwiftCharm()
         result = c.get_swift_backup_config()
         self.assertEqual(result[0], 'cinder-backup')