diff --git a/nova/flags.py b/nova/flags.py
index ce30d50334..9d27d336d8 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -184,9 +184,9 @@ DEFINE_string('rabbit_userid', 'guest', 'rabbit userid')
 DEFINE_string('rabbit_password', 'guest', 'rabbit password')
 DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host')
 DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to')
-DEFINE_string('cc_ip', '127.0.0.1', 'ip of api server')
+DEFINE_string('cc_host', '127.0.0.1', 'ip of api server')
 DEFINE_integer('cc_port', 8773, 'cloud controller port')
-DEFINE_string('ec2_url', 'http://%s:%s/services/Cloud'  % (FLAGS.cc_ip, FLAGS.cc_port),
+DEFINE_string('ec2_url', 'http://%s:%s/services/Cloud' % (FLAGS.cc_host, FLAGS.cc_port),
               'Url to ec2 api server')
 
 DEFINE_string('default_image', 'ami-11111',
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 65dcf51eec..53fb2df944 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -50,7 +50,7 @@ def init_host():
     # forwarding entries and a default DNAT entry.
     _confirm_rule("-t nat -A nova_prerouting -s 0.0.0.0/0 "
              "-d 169.254.169.254/32 -p tcp -m tcp --dport 80 -j DNAT "
-             "--to-destination %s:%s" % (FLAGS.cc_ip, FLAGS.cc_port))
+             "--to-destination %s:%s" % (FLAGS.cc_host, FLAGS.cc_port))
 
     # NOTE(devcamcar): Cloud public SNAT entries and the default
     # SNAT rule for outbound traffic.