diff --git a/glance/location.py b/glance/location.py
index 0f6f2c3e6c..25639ceb60 100644
--- a/glance/location.py
+++ b/glance/location.py
@@ -421,9 +421,11 @@ class ImageProxy(glance.domain.proxy.Image):
             key_type = extra_props[signature_utils.KEY_TYPE]
             cert_uuid = extra_props[signature_utils.CERT_UUID]
             verifier = signature_utils.get_verifier(
-                context=self.context, cert_uuid=cert_uuid,
-                hash_method=hash_method, img_signature=img_signature,
-                key_type=key_type
+                context=self.context,
+                img_signature_certificate_uuid=cert_uuid,
+                img_signature_hash_method=hash_method,
+                img_signature=img_signature,
+                img_signature_key_type=key_type
             )
         else:
             verifier = None
diff --git a/glance/tests/unit/utils.py b/glance/tests/unit/utils.py
index 0793258803..83636a030b 100644
--- a/glance/tests/unit/utils.py
+++ b/glance/tests/unit/utils.py
@@ -85,8 +85,9 @@ def fake_get_size_from_backend(uri, context=None):
     return 1
 
 
-def fake_get_verifier(context, cert_uuid, hash_method,
-                      img_signature, key_type):
+def fake_get_verifier(context, img_signature_certificate_uuid,
+                      img_signature_hash_method, img_signature,
+                      img_signature_key_type):
     verifier = mock.Mock()
     if (img_signature is not None and img_signature == 'VALID'):
         verifier.verify.return_value = None