diff --git a/hooks/neutron_contexts.py b/hooks/neutron_contexts.py
index e5eb7eb7..80007cd6 100644
--- a/hooks/neutron_contexts.py
+++ b/hooks/neutron_contexts.py
@@ -118,7 +118,7 @@ class L3AgentContext(OSContextGenerator):
         return ctxt
 
 
-class QuantumGatewayContext(OSContextGenerator):
+class NeutronGatewayContext(OSContextGenerator):
 
     def __call__(self):
         api_settings = NeutronAPIContext()()
diff --git a/hooks/neutron_utils.py b/hooks/neutron_utils.py
index 6d95aa0a..e4f75b31 100644
--- a/hooks/neutron_utils.py
+++ b/hooks/neutron_utils.py
@@ -64,7 +64,7 @@ from neutron_contexts import (
     CORE_PLUGIN, OVS, NVP, NSX, N1KV,
     NEUTRON, QUANTUM,
     networking_name,
-    QuantumGatewayContext,
+    NeutronGatewayContext,
     L3AgentContext,
     remap_plugin,
 )
@@ -302,7 +302,7 @@ NOVA_CONFIG_FILES = {
         'hook_contexts': [context.SharedDBContext(ssl_dir=NOVA_CONF_DIR),
                           context.PostgresqlDBContext(),
                           NetworkServiceContext(),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext(),
                           context.ZeroMQContext(),
                           context.NotificationDriverContext()],
@@ -312,12 +312,12 @@ NOVA_CONFIG_FILES = {
 
 QUANTUM_SHARED_CONFIG_FILES = {
     QUANTUM_DHCP_AGENT_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['quantum-dhcp-agent']
     },
     QUANTUM_METADATA_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
-                          QuantumGatewayContext()],
+                          NeutronGatewayContext()],
         'services': ['quantum-metadata-agent']
     },
 }
@@ -325,16 +325,16 @@ QUANTUM_SHARED_CONFIG_FILES.update(NOVA_CONFIG_FILES)
 
 NEUTRON_SHARED_CONFIG_FILES = {
     NEUTRON_DHCP_AGENT_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-dhcp-agent']
     },
     NEUTRON_DNSMASQ_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-dhcp-agent']
     },
     NEUTRON_METADATA_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
-                          QuantumGatewayContext()],
+                          NeutronGatewayContext()],
         'services': ['neutron-metadata-agent']
     },
 }
@@ -343,7 +343,7 @@ NEUTRON_SHARED_CONFIG_FILES.update(NOVA_CONFIG_FILES)
 QUANTUM_OVS_CONFIG_FILES = {
     QUANTUM_CONF: {
         'hook_contexts': [context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext(),
                           context.ZeroMQContext(),
                           context.NotificationDriverContext()],
@@ -354,11 +354,11 @@ QUANTUM_OVS_CONFIG_FILES = {
     },
     QUANTUM_L3_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
-                          QuantumGatewayContext()],
+                          NeutronGatewayContext()],
         'services': ['quantum-l3-agent']
     },
     QUANTUM_OVS_PLUGIN_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['quantum-plugin-openvswitch-agent']
     },
     EXT_PORT_CONF: {
@@ -375,7 +375,7 @@ QUANTUM_OVS_CONFIG_FILES.update(QUANTUM_SHARED_CONFIG_FILES)
 NEUTRON_OVS_CONFIG_FILES = {
     NEUTRON_CONF: {
         'hook_contexts': [context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext(),
                           context.ZeroMQContext(),
                           context.NotificationDriverContext()],
@@ -392,33 +392,33 @@ NEUTRON_OVS_CONFIG_FILES = {
     NEUTRON_L3_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
                           L3AgentContext(),
-                          QuantumGatewayContext()],
+                          NeutronGatewayContext()],
         'services': ['neutron-l3-agent', 'neutron-vpn-agent']
     },
     NEUTRON_METERING_AGENT_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-plugin-metering-agent',
                      'neutron-metering-agent']
     },
     NEUTRON_LBAAS_AGENT_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-lbaas-agent']
     },
     NEUTRON_VPNAAS_AGENT_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-plugin-vpn-agent',
                      'neutron-vpn-agent']
     },
     NEUTRON_FWAAS_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-l3-agent', 'neutron-vpn-agent']
     },
     NEUTRON_OVS_PLUGIN_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-plugin-openvswitch-agent']
     },
     NEUTRON_ML2_PLUGIN_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
+        'hook_contexts': [NeutronGatewayContext()],
         'services': ['neutron-plugin-openvswitch-agent']
     },
     EXT_PORT_CONF: {
@@ -435,7 +435,7 @@ NEUTRON_OVS_CONFIG_FILES.update(NEUTRON_SHARED_CONFIG_FILES)
 QUANTUM_NVP_CONFIG_FILES = {
     QUANTUM_CONF: {
         'hook_contexts': [context.AMQPContext(ssl_dir=QUANTUM_CONF_DIR),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext()],
         'services': ['quantum-dhcp-agent', 'quantum-metadata-agent']
     },
@@ -445,7 +445,7 @@ QUANTUM_NVP_CONFIG_FILES.update(QUANTUM_SHARED_CONFIG_FILES)
 NEUTRON_NVP_CONFIG_FILES = {
     NEUTRON_CONF: {
         'hook_contexts': [context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext()],
         'services': ['neutron-dhcp-agent', 'neutron-metadata-agent']
     },
@@ -455,7 +455,7 @@ NEUTRON_NVP_CONFIG_FILES.update(NEUTRON_SHARED_CONFIG_FILES)
 NEUTRON_N1KV_CONFIG_FILES = {
     NEUTRON_CONF: {
         'hook_contexts': [context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
-                          QuantumGatewayContext(),
+                          NeutronGatewayContext(),
                           SyslogContext()],
         'services': ['neutron-l3-agent',
                      'neutron-dhcp-agent',
@@ -464,7 +464,7 @@ NEUTRON_N1KV_CONFIG_FILES = {
     NEUTRON_L3_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
                           L3AgentContext(),
-                          QuantumGatewayContext()],
+                          NeutronGatewayContext()],
         'services': ['neutron-l3-agent']
     },
 }
diff --git a/unit_tests/test_neutron_contexts.py b/unit_tests/test_neutron_contexts.py
index 0a11ffe3..2fb55a9c 100644
--- a/unit_tests/test_neutron_contexts.py
+++ b/unit_tests/test_neutron_contexts.py
@@ -100,10 +100,10 @@ class TestL3AgentContext(CharmTestCase):
                           'dvr_snat')
 
 
-class TestQuantumGatewayContext(CharmTestCase):
+class TestNeutronGatewayContext(CharmTestCase):
 
     def setUp(self):
-        super(TestQuantumGatewayContext, self).setUp(neutron_contexts,
+        super(TestNeutronGatewayContext, self).setUp(neutron_contexts,
                                                      TO_PATCH)
         self.config.side_effect = self.test_config.get
         self.maxDiff = None
@@ -133,7 +133,7 @@ class TestQuantumGatewayContext(CharmTestCase):
         self.get_os_codename_install_source.return_value = 'folsom'
         _host_ip.return_value = '10.5.0.1'
         _secret.return_value = 'testsecret'
-        ctxt = neutron_contexts.QuantumGatewayContext()()
+        ctxt = neutron_contexts.NeutronGatewayContext()()
         self.assertEquals(ctxt, {
             'shared_secret': 'testsecret',
             'enable_dvr': True,