diff --git a/octavia/amphorae/drivers/driver_base.py b/octavia/amphorae/drivers/driver_base.py
index 6e695b8e0a..f2c72ed807 100644
--- a/octavia/amphorae/drivers/driver_base.py
+++ b/octavia/amphorae/drivers/driver_base.py
@@ -188,7 +188,7 @@ class AmphoraLoadBalancerDriver(object):
         Upload cert file to amphora for Controller Communication.
         """
 
-    def update_agent_config(self, amphora, agent_config):
+    def update_amphora_agent_config(self, amphora, agent_config):
         """Upload and update the amphora agent configuration.
 
         :param amphora: amphora object, needs id and network ip(s)
diff --git a/octavia/amphorae/drivers/noop_driver/driver.py b/octavia/amphorae/drivers/noop_driver/driver.py
index 688f145afa..bd53ee5c5c 100644
--- a/octavia/amphorae/drivers/noop_driver/driver.py
+++ b/octavia/amphorae/drivers/noop_driver/driver.py
@@ -106,12 +106,12 @@ class NoopManager(object):
         self.amphoraconfig[amphora.id, pem_file] = (amphora.id, pem_file,
                                                     'update_amp_cert_file')
 
-    def update_agent_config(self, amphora, agent_config):
+    def update_amphora_agent_config(self, amphora, agent_config):
         LOG.debug("Amphora %s no-op, update agent config amphora "
                   "%s, with agent config %s",
                   self.__class__.__name__, amphora.id, agent_config)
         self.amphoraconfig[amphora.id, agent_config] = (
-            amphora.id, agent_config, 'update_agent_config')
+            amphora.id, agent_config, 'update_amphora_agent_config')
 
 
 class NoopAmphoraLoadBalancerDriver(
@@ -163,8 +163,8 @@ class NoopAmphoraLoadBalancerDriver(
 
         self.driver.upload_cert_amp(amphora, pem_file)
 
-    def update_agent_config(self, amphora, agent_config):
-        self.driver.update_agent_config(amphora, agent_config)
+    def update_amphora_agent_config(self, amphora, agent_config):
+        self.driver.update_amphora_agent_config(amphora, agent_config)
 
     def update_vrrp_conf(self, loadbalancer):
         pass
diff --git a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
index 256a27aed8..49c55d0768 100644
--- a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
+++ b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
@@ -145,8 +145,10 @@ class TestNoopAmphoraLoadBalancerDriver(base.TestCase):
                 self.amphora.id, self.pem_file)])
 
     def test_update_agent_config(self):
-        self.driver.update_agent_config(self.amphora, self.agent_config)
+        self.driver.update_amphora_agent_config(self.amphora,
+                                                self.agent_config)
         self.assertEqual(
-            (self.amphora.id, self.agent_config, 'update_agent_config'),
+            (self.amphora.id, self.agent_config,
+             'update_amphora_agent_config'),
             self.driver.driver.amphoraconfig[(
                 self.amphora.id, self.agent_config)])