diff --git a/nova/compute/api.py b/nova/compute/api.py
index 5470f40dc4..8f58036499 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -614,14 +614,14 @@ class API(base.Base):
         output = self._call_compute_message('get_vnc_console',
                                             context,
                                             instance_id)
-        rpc.cast(context, '%s' % FLAGS.vnc_console_proxy_topic,
+        rpc.cast(context, '%s' % FLAGS.vncproxy_topic,
                  {'method': 'authorize_vnc_console',
                   'args': {'token': output['token'],
                            'host': output['host'],
                            'port': output['port']}})
 
         return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % (
-                       FLAGS.vnc_console_proxy_url,
+                       FLAGS.vncproxy_url,
                        output['token'],
                        'hostignore',
                        'portignore')}
diff --git a/nova/flags.py b/nova/flags.py
index b5c0cd3802..b0c116f6b6 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -281,13 +281,13 @@ DEFINE_string('ajax_console_proxy_url',
                in the form "http://127.0.0.1:8000"')
 DEFINE_string('ajax_console_proxy_port',
                8000, 'port that ajax_console_proxy binds')
-DEFINE_string('vnc_console_proxy_topic', 'vncproxy',
+DEFINE_string('vncproxy_topic', 'vncproxy',
               'the topic vnc proxy nodes listen on')
-DEFINE_string('vnc_console_proxy_url',
+DEFINE_string('vncproxy_url',
               'http://127.0.0.1:6080',
               'location of vnc console proxy, \
                in the form "http://127.0.0.1:6080"')
-DEFINE_string('vnc_server_host', '0.0.0.0',
+DEFINE_string('vncserver_host', '0.0.0.0',
               'the host interface on which vnc server should listen')
 DEFINE_bool('vnc_enabled', True,
             'enable vnc related features')
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index c492e488c5..cf6bed5301 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -104,8 +104,8 @@
             <target port='0'/>
         </serial>
 
-#if $getVar('vnc_server_host', False)
-        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vnc_server_host}'/>
+#if $getVar('vncserver_host', False)
+        <graphics type='vnc' port='-1' autoport='yes' keymap='en-us' listen='${vncserver_host}'/>
 #end if
     </devices>
 </domain>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 41adbfe272..ec09aca28d 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -885,7 +885,7 @@ class LibvirtConnection(driver.ComputeDriver):
                     'nics': nics}
 
         if FLAGS.vnc_enabled:
-            xml_info['vnc_server_host'] = FLAGS.vnc_server_host
+            xml_info['vncserver_host'] = FLAGS.vncserver_host
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"
diff --git a/nova/vnc/auth.py b/nova/vnc/auth.py
index 105b68fe22..45f77dd594 100644
--- a/nova/vnc/auth.py
+++ b/nova/vnc/auth.py
@@ -51,7 +51,7 @@ class VNCNovaAuthMiddleware(object):
             return self.token_cache[token]
 
         rval = rpc.call(context.get_admin_context(),
-                        FLAGS.vnc_console_proxy_topic,
+                        FLAGS.vncproxy_topic,
                         {"method": "check_token", "args": {'token': token}})
         if rval:
             self.token_cache[token] = rval