diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index 5eb52ef321..586c667044 100644
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -34,7 +34,7 @@ root_helper = sudo
 # value should be set to the UUID of that external network.  If empty,
 # the agent will enforce that only a single external networks exists and
 # use that external network id
-# gateway_external_net_id =
+# gateway_external_network_id =
 
 # Indicates that this L3 agent should also handle routers that do not have
 # an external network gateway configured.  This option should be True only
diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 0630824dfa..526a67610b 100644
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -181,7 +181,7 @@ class L3NATAgent(object):
         params = {'router:external': True}
         ex_nets = self.qclient.list_networks(**params)['networks']
         if len(ex_nets) > 1:
-            raise Exception("must configure 'external_network_id' if "
+            raise Exception("must configure 'gateway_external_network_id' if "
                             "Quantum has more than one external network.")
         if len(ex_nets) == 0:
             return None