diff --git a/hooks/neutron_ovs_context.py b/hooks/neutron_ovs_context.py
index 4be53988..303003a8 100644
--- a/hooks/neutron_ovs_context.py
+++ b/hooks/neutron_ovs_context.py
@@ -72,7 +72,7 @@ class DataPortContext(NeutronPortContext):
             normalized.update({port: port for port in resolved
                                if port in ports})
             if resolved:
-                return {provider: normalized[port] for provider, port in
+                return {bridge: normalized[port] for bridge, port in
                         portmap.iteritems() if port in normalized.keys()}
 
         return None
@@ -105,10 +105,10 @@ class OVSPluginContext(context.NeutronContext):
         for provider, br in bridgemaps.iteritems():
             add_bridge(br)
 
-            if not portmaps or provider not in portmaps:
+            if not portmaps or br not in portmaps:
                 continue
 
-            add_bridge_port(br, portmaps[provider], promisc=True)
+            add_bridge_port(br, portmaps[br], promisc=True)
 
         service_restart('os-charm-phy-nic-mtu')
 
diff --git a/unit_tests/test_neutron_ovs_context.py b/unit_tests/test_neutron_ovs_context.py
index 5e93b5e8..1f8723c5 100644
--- a/unit_tests/test_neutron_ovs_context.py
+++ b/unit_tests/test_neutron_ovs_context.py
@@ -33,10 +33,10 @@ class OVSPluginContextTest(CharmTestCase):
     @patch('charmhelpers.contrib.openstack.context.NeutronPortContext.'
            'resolve_ports')
     def test_data_port_name(self, mock_resolve_ports):
-        self.test_config.set('data-port', 'phybr1:em1')
+        self.test_config.set('data-port', 'br-data:em1')
         mock_resolve_ports.side_effect = lambda ports: ports
         self.assertEquals(context.DataPortContext()(),
-                          {'phybr1': 'em1'})
+                          {'br-data': 'em1'})
 
     @patch.object(context, 'get_nic_hwaddr')
     @patch('charmhelpers.contrib.openstack.context.get_nic_hwaddr')
@@ -48,18 +48,18 @@ class OVSPluginContextTest(CharmTestCase):
         }
         get_nic_hwaddr2.side_effect = lambda nic: machine_machs[nic]
         absent_mac = "cc:cc:cc:cc:cc:cc"
-        config_macs = ("phybr2:%s phybr1:%s" %
+        config_macs = ("br-d1:%s br-d2:%s" %
                        (absent_mac, machine_machs['em1']))
         self.test_config.set('data-port', config_macs)
         list_nics.return_value = machine_machs.keys()
         get_nic_hwaddr.side_effect = lambda nic: machine_machs[nic]
         self.assertEquals(context.DataPortContext()(),
-                          {'phybr1': 'em1'})
+                          {'br-d2': 'em1'})
 
     @patch('charmhelpers.contrib.openstack.context.NeutronPortContext.'
            'resolve_ports')
     def test_ensure_bridge_data_port_present(self, mock_resolve_ports):
-        self.test_config.set('data-port', 'phybr1:em1')
+        self.test_config.set('data-port', 'br-data:em1')
         self.test_config.set('bridge-mappings', 'phybr1:br-data')
 
         def add_port(bridge, port, promisc):