diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py
index 54ae44f91a8..7c743191168 100644
--- a/neutron/agent/linux/openvswitch_firewall/firewall.py
+++ b/neutron/agent/linux/openvswitch_firewall/firewall.py
@@ -479,8 +479,8 @@ class OVSFirewallDriver(firewall.FirewallDriver):
             self._initialize_egress_no_port_security(port['device'])
             return
         old_of_port = self.get_ofport(port)
-        # Make sure delete old allow_address_pair MACs because
-        # allow_address_pair MACs will be updated in
+        # Make sure delete old allowed_address_pair MACs because
+        # allowed_address_pair MACs will be updated in
         # self.get_or_create_ofport(port)
         if old_of_port:
             LOG.error("Initializing port %s that was already "
diff --git a/neutron/tests/tempest/api/test_extension_driver_port_security.py b/neutron/tests/tempest/api/test_extension_driver_port_security.py
index 53b6794d2ae..1e467c58b07 100644
--- a/neutron/tests/tempest/api/test_extension_driver_port_security.py
+++ b/neutron/tests/tempest/api/test_extension_driver_port_security.py
@@ -137,7 +137,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
     @decorators.idempotent_id('ed93e453-3f8d-495e-8e7e-b0e268c2ebd9')
     @utils.requires_ext(extension='port-security', service='network')
     @utils.requires_ext(extension='allowed-address-pairs', service='network')
-    def test_allow_address_pairs(self):
+    def test_allowed_address_pairs(self):
         network = self.create_network()
         self.create_subnet(network)
         port = self.create_port(network=network, port_security_enabled=False)