From 6cda0639c35d1a94ff23d703fd71d3f134a5be86 Mon Sep 17 00:00:00 2001
From: gengjh <gengjh@cn.ibm.com>
Date: Mon, 25 Nov 2013 16:09:26 +0800
Subject: [PATCH] Support neutron configuration

Since in OpenStack Havana release the Quantum project was renamed to the
Neutron, for the cookbooks we also need do the same things to support
the Neutron. I do the %s/Quantum/Neutron/g in all the files under
cookbook-openstack-netwrok. It will effect other cookbooks:
openstack-compute, openstack-ops-database which should be covered in
others patches.

Implemented: blueprint neutron-support

Change-Id: I59f3f2d8dfad678f70b97d4cbc4e10dfa163e9b2
---
 CHANGELOG.md                                  |   3 +
 README.md                                     |   4 +-
 attributes/default.rb                         | 232 +++++++++---------
 .../rootwrap.d/debug.filters                  |   2 +-
 .../rootwrap.d/dhcp.filters                   |   8 +-
 .../rootwrap.d/iptables-firewall.filters      |   6 +-
 .../rootwrap.d/l3.filters                     |   6 +-
 .../rootwrap.d/lbaas-haproxy.filters          |   2 +-
 .../rootwrap.d/linuxbridge-plugin.filters     |   2 +-
 .../rootwrap.d/nec-plugin.filters             |   4 +-
 .../rootwrap.d/openvswitch-plugin.filters     |   2 +-
 .../rootwrap.d/ryu-plugin.filters             |   6 +-
 ...{quantum-ha-tool.py => neutron-ha-tool.py} |  42 ++--
 metadata.rb                                   |   6 +-
 recipes/balancer.rb                           |   8 +-
 recipes/build_openvswitch_source.rb           |   2 +-
 recipes/common.rb                             | 122 ++++-----
 recipes/dhcp_agent.rb                         |  22 +-
 recipes/l3_agent.rb                           |  14 +-
 recipes/linuxbridge.rb                        |   6 +-
 recipes/metadata_agent.rb                     |  10 +-
 recipes/openvswitch.rb                        |  22 +-
 recipes/server.rb                             |  30 +--
 spec/balancer_spec.rb                         |  18 +-
 spec/build_openvswitch_source_spec.rb         |   4 +-
 spec/common_spec.rb                           |  12 +-
 spec/dhcp_agent-opensuse_spec.rb              |  24 +-
 spec/dhcp_agent_spec.rb                       |  30 +--
 spec/identity_registration_spec.rb            |  14 +-
 spec/l3_agent_spec.rb                         |  20 +-
 spec/linuxbridge-opensuse_spec.rb             |  12 +-
 spec/linuxbridge-redhat_spec.rb               |  12 +-
 spec/linuxbridge_spec.rb                      |  21 +-
 spec/metadata_agent_spec.rb                   |  18 +-
 spec/openvswitch-opensuse_spec.rb             |   6 +-
 spec/openvswitch_spec.rb                      |  16 +-
 spec/server-opensuse_spec.rb                  |  34 +--
 spec/server-redhat_spec.rb                    |  20 +-
 spec/server_spec.rb                           |  60 ++---
 spec/spec_helper.rb                           |   8 +-
 templates/default/api-paste.ini.erb           |  26 +-
 templates/default/dhcp_agent.ini.erb          |  10 +-
 templates/default/l3_agent.ini.erb            |   8 +-
 templates/default/lbaas_agent.ini.erb         |   8 +-
 templates/default/metadata_agent.ini.erb      |   6 +-
 ...{quantum-server.erb => neutron-server.erb} |   6 +-
 .../{quantum.conf.erb => neutron.conf.erb}    |  39 ++-
 ...um.sysconfig.erb => neutron.sysconfig.erb} |   2 +-
 .../plugins/bigswitch/restproxy.ini.erb       |   4 +-
 .../default/plugins/brocade/brocade.ini.erb   |   4 +-
 .../plugins/cisco/cisco_plugins.ini.erb       |   4 +-
 ....ini.erb => hyperv_neutron_plugin.ini.erb} |   4 +-
 .../linuxbridge/linuxbridge_conf.ini.erb      |   8 +-
 .../plugins/metaplugin/metaplugin.ini.erb     |   6 +-
 .../default/plugins/midonet/midonet.ini.erb   |   4 +-
 templates/default/plugins/nec/nec.ini.erb     |  10 +-
 templates/default/plugins/nicira/nvp.ini.erb  |   8 +-
 ...gin.ini.erb => ovs_neutron_plugin.ini.erb} |  12 +-
 .../default/plugins/plumgrid/plumgrid.ini.erb |   4 +-
 templates/default/plugins/ryu/ryu.ini.erb     |   4 +-
 templates/default/rootwrap.conf.erb           |   2 +-
 61 files changed, 536 insertions(+), 533 deletions(-)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/debug.filters (86%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/dhcp.filters (85%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/iptables-firewall.filters (79%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/l3.filters (87%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/lbaas-haproxy.filters (93%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/linuxbridge-plugin.filters (89%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/nec-plugin.filters (82%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/openvswitch-plugin.filters (93%)
 rename files/default/etc/{quantum => neutron}/rootwrap.d/ryu-plugin.filters (79%)
 rename files/default/{quantum-ha-tool.py => neutron-ha-tool.py} (94%)
 rename templates/default/{quantum-server.erb => neutron-server.erb} (59%)
 rename templates/default/{quantum.conf.erb => neutron.conf.erb} (92%)
 rename templates/default/{quantum.sysconfig.erb => neutron.sysconfig.erb} (51%)
 rename templates/default/plugins/hyperv/{hyperv_quantum_plugin.ini.erb => hyperv_neutron_plugin.ini.erb} (95%)
 rename templates/default/plugins/openvswitch/{ovs_quantum_plugin.ini.erb => ovs_neutron_plugin.ini.erb} (94%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 710090c4..9f8a7e50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This file is used to list changes made in each version of cookbook-openstack-network.
 
+## 8.0.0:
+* Support neutron deployment by search and replace quantum with neutron
+
 ## 7.1.1
 * fixing rpc_backend for qpid
 
diff --git a/README.md b/README.md
index 2f143402..7737e7b0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Description
 ===========
 
-This cookbook installs the **OpenStack Network** service (formerly project-named Quantum)
+This cookbook installs the **OpenStack Network** service (formerly project-named Quantum, current name is Neutron)
 as part of a Chef reference deployment of OpenStack.
 
 More information about the OpenStack Network service is available
@@ -84,7 +84,7 @@ Templates
 =========
 
 * `api-paste.ini.erb` - Paste config for OpenStack Network server
-* `quantum.conf.erb` - Config file for OpenStack Network server
+* `neutron.conf.erb` - Config file for OpenStack Network server
 * `policy.json.erb` - Configuration of ACLs for glance API server
 
 Testing
diff --git a/attributes/default.rb b/attributes/default.rb
index f6af40a0..5bdcbf3e 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -29,9 +29,9 @@ default["openstack"]["network"]["debug"] = "False"
 
 # Gets set in the Network Endpoint when registering with Keystone
 default["openstack"]["network"]["region"] = "RegionOne"
-default["openstack"]["network"]["service_user"] = "quantum"
+default["openstack"]["network"]["service_user"] = "neutron"
 default["openstack"]["network"]["service_role"] = "admin"
-default["openstack"]["network"]["service_name"] = "quantum"
+default["openstack"]["network"]["service_name"] = "neutron"
 default["openstack"]["network"]["service_type"] = "network"
 default["openstack"]["network"]["description"] = "OpenStack Networking service"
 
@@ -46,8 +46,8 @@ default["openstack"]["network"]["rabbit"]["port"] = 5672
 default["openstack"]["network"]["rabbit"]["host"] = "127.0.0.1"
 default["openstack"]["network"]["rabbit"]["ha"] = false
 
-# The database username for the quantum database
-default["openstack"]["network"]["db"]["username"] = "quantum"
+# The database username for the neutron database
+default["openstack"]["network"]["db"]["username"] = "neutron"
 
 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
@@ -71,7 +71,7 @@ default['openstack']['network']['db']['sql_idle_timeout'] = 3600
 
 # Used in the Keystone authtoken middleware configuration
 default["openstack"]["network"]["service_tenant_name"] = "service"
-default["openstack"]["network"]["service_user"] = "quantum"
+default["openstack"]["network"]["service_user"] = "neutron"
 default["openstack"]["network"]["service_role"] = "admin"
 
 # The maximum number of seconds we will wait for an agent to checkin
@@ -81,12 +81,12 @@ default["openstack"]["network"]["api"]["agent"]["agent_down_time"] = 15
 default["openstack"]["network"]["api"]["agent"]["agent_report_interval"] = 4
 
 # The agent signing directory for api server
-default["openstack"]["network"]["api"]["agent"]["signing_dir"] = "/var/lib/quantum/keystone-signing"
+default["openstack"]["network"]["api"]["agent"]["signing_dir"] = "/var/lib/neutron/keystone-signing"
 
 # Keystone PKI signing directory.
-default["openstack"]["network"]["api"]["auth"]["cache_dir"] = "/var/cache/quantum/api"
+default["openstack"]["network"]["api"]["auth"]["cache_dir"] = "/var/cache/neutron/api"
 
-# If bind_interface is set, the quantum API service will bind to the
+# If bind_interface is set, the neutron API service will bind to the
 # address on this interface and use the port in bind_port. Otherwise,
 # it will bind to the API endpoint's host.
 default["openstack"]["network"]["api"]["bind_interface"] = nil
@@ -116,12 +116,12 @@ default["openstack"]["network"]["mq"]["qpid"]["tcp_nodelay"] = true
 default["openstack"]["network"]["syslog"]["use"] = false
 
 # The driver for Quota management in Neutron. Possible values:
-#  quantum.quota.ConfDriver (default)
-#  quantum.quota.DbDriver
+#  neutron.quota.ConfDriver (default)
+#  neutron.quota.DbDriver
 #
 # Note: set this to the DbDriver if you want to be able to update
 # quotas for networks/subnets/security groups!
-default["openstack"]["network"]["quota"]["driver"] = "quantum.quota.ConfDriver"
+default["openstack"]["network"]["quota"]["driver"] = "neutron.quota.ConfDriver"
 
 # default quotas will be used when no more specific tenant entry exists
 # when using the DBDriver - override them below to adjust the default
@@ -159,31 +159,31 @@ default["openstack"]["network"]["quota"]["security_group_rule"] = 100
 # or nicira plugins are crashing the sdn routers
 default['openstack']['network']['disable_offload'] = false
 
-# configure quantum ha tool installation parameters
-default["openstack"]["network"]["quantum_ha_cmd_cron"] = false
-default["openstack"]["network"]["quantum_ha_cmd"] = "/usr/local/bin/quantum-ha-tool.py"
+# configure neutron ha tool installation parameters
+default["openstack"]["network"]["neutron_ha_cmd_cron"] = false
+default["openstack"]["network"]["neutron_ha_cmd"] = "/usr/local/bin/neutron-ha-tool.py"
 default["openstack"]["network"]["cron_l3_healthcheck"] = "*/1"
 default["openstack"]["network"]["cron_replicate_dhcp"] = "*/1"
 
 # the plugins to install on the server.  this will be
-# quantum-plugin-%plugin% and the first plugin in the
+# neutron-plugin-%plugin% and the first plugin in the
 # list should match the core plugin below
 # N.B. this will be ignored on SUSE as all plugins are installed by
-# default by the main openstack-quantum package
+# default by the main openstack-neutron package
 default["openstack"]["network"]["plugins"] = ['openvswitch', 'openvswitch-agent' ]
 
-# the core plugin to use for quantum
-default["openstack"]["network"]["core_plugin"] = "quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
+# the core plugin to use for neutron
+default["openstack"]["network"]["core_plugin"] = "neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
 
 # The bridging interface driver.
 #
 # Options are:
 #
-#   - quantum.agent.linux.interface.OVSInterfaceDriver
-#   - quantum.agent.linux.interface.BridgeInterfaceDriver
+#   - neutron.agent.linux.interface.OVSInterfaceDriver
+#   - neutron.agent.linux.interface.BridgeInterfaceDriver
 #
 
-default["openstack"]["network"]["interface_driver"] = 'quantum.agent.linux.interface.OVSInterfaceDriver'
+default["openstack"]["network"]["interface_driver"] = 'neutron.agent.linux.interface.OVSInterfaceDriver'
 
 # maps the above driver to a plugin name
 default["openstack"]["network"]["interface_driver_map"] = {
@@ -192,13 +192,13 @@ default["openstack"]["network"]["interface_driver_map"] = {
 }
 
 default["openstack"]["network"]["plugin_conf_map"] = {
-  'ovsinterfacedriver' => 'openvswitch/ovs_quantum_plugin.ini',
+  'ovsinterfacedriver' => 'openvswitch/ovs_neutron_plugin.ini',
   'bridgeinterfacedriver' => 'linuxbridge/linuxbridge_conf.ini'
 }
 
 # The agent can use other DHCP drivers.  Dnsmasq is the simplest and requires
 # no additional setup of the DHCP server.
-default["openstack"]["network"]["dhcp_driver"] = 'quantum.agent.linux.dhcp.Dnsmasq'
+default["openstack"]["network"]["dhcp_driver"] = 'neutron.agent.linux.dhcp.Dnsmasq'
 
 # Use namespaces and optionally allow overlapping IPs. You
 # must enable namespaces to use overlapping ips.  Also,
@@ -207,13 +207,13 @@ default["openstack"]["network"]["dhcp_driver"] = 'quantum.agent.linux.dhcp.Dnsma
 default["openstack"]["network"]["use_namespaces"] = "True"
 default["openstack"]["network"]["allow_overlapping_ips"] = "False"
 
-# use quantum root wrap
+# use neutron root wrap
 default["openstack"]["network"]["use_rootwrap"] = true
 
 # ============================= DHCP Agent Configuration ===================
 
 # The scheduler class to use for scheduling to DHCP agents
-default["openstack"]["network"]["dhcp"]["scheduler"] = "quantum.scheduler.dhcp_agent_scheduler.ChanceScheduler"
+default["openstack"]["network"]["dhcp"]["scheduler"] = "neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler"
 
 # Override the default mtu setting given to virtual machines
 # to 1454 to allow for tunnel and other encapsulation overhead.  You
@@ -221,7 +221,7 @@ default["openstack"]["network"]["dhcp"]["scheduler"] = "quantum.scheduler.dhcp_a
 # of the default guest MTU.
 default["openstack"]["network"]["dhcp"]["dhcp-option"] = "26,1454"
 
-# Number of seconds between sync of DHCP agent with Quantum API server
+# Number of seconds between sync of DHCP agent with Neutron API server
 default["openstack"]["network"]["dhcp"]["resync_interval"] = 5
 
 # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
@@ -237,7 +237,7 @@ default["openstack"]["network"]["dhcp"]["enable_isolated_metadata"] = "False"
 
 # Allows for serving metadata requests coming from a dedicated metadata
 # access network whose cidr is 169.254.169.254/16 (or larger prefix), and
-# is connected to a Quantum router from which the VMs send metadata
+# is connected to a Neutron router from which the VMs send metadata
 # request. In this case DHCP Option 121 will not be injected in VMs, as
 # they will be able to reach 169.254.169.254 through a router.
 # This option requires enable_isolated_metadata = True
@@ -284,7 +284,7 @@ default["openstack"]["network"]["dhcp"]["default_domain"] = "openstacklocal"
 # ============================= L3 Agent Configuration =====================
 
 # The scheduler class to use for scheduling routers to L3 agents
-default["openstack"]["network"]["l3"]["scheduler"] = "quantum.scheduler.l3_agent_scheduler.ChanceScheduler"
+default["openstack"]["network"]["l3"]["scheduler"] = "neutron.scheduler.l3_agent_scheduler.ChanceScheduler"
 
 # If use_namespaces is set as False then the agent can only configure one router.
 # This is done by setting the specific router_id.
@@ -298,7 +298,7 @@ default["openstack"]["network"]["l3"]["gateway_external_network_id"] = nil
 
 # Indicates that this L3 agent should also handle routers that do not have
 # an external network gateway configured.  This option should be True only
-# for a single agent in a Quantum deployment, and may be False for all agents
+# for a single agent in a Neutron deployment, and may be False for all agents
 # if all routers must have an external network gateway
 default["openstack"]["network"]["l3"]["handle_internal_only_routers"] = "True"
 
@@ -309,7 +309,7 @@ default["openstack"]["network"]["l3"]["external_network_bridge"] = "br-ex"
 # Interface to use for external bridge.
 default["openstack"]["network"]["l3"]["external_network_bridge_interface"] = "eth1"
 
-# TCP Port used by Quantum metadata server
+# TCP Port used by Neutron metadata server
 default["openstack"]["network"]["l3"]["metadata_port"] = 9697
 
 # Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
@@ -330,18 +330,18 @@ default["openstack"]["network"]["metadata"]["nova_metadata_ip"] = "127.0.0.1"
 default["openstack"]["network"]["metadata"]["nova_metadata_port"] = 8775
 
 # The name of the secret databag containing the metadata secret
-default["openstack"]["network"]["metadata"]["secret_name"] = "quantum_metadata_secret"
+default["openstack"]["network"]["metadata"]["secret_name"] = "neutron_metadata_secret"
 
 
 # ============================= LBaaS Agent Configuration ==================
 
-# Enable or disable quantum loadbalancer
-default["openstack"]["network"]["quantum_loadbalancer"] = false
+# Enable or disable neutron loadbalancer
+default["openstack"]["network"]["neutron_loadbalancer"] = false
 
 # Plugin configuration path
-default["openstack"]["network"]["lbaas_config_path"] = "/etc/quantum/plugins/services/agent_loadbalancer"
+default["openstack"]["network"]["lbaas_config_path"] = "/etc/neutron/plugins/services/agent_loadbalancer"
 
-# Number of seconds between sync of LBaaS agent with Quantum API server
+# Number of seconds between sync of LBaaS agent with Neutron API server
 default["openstack"]["network"]["lbaas"]["periodic_interval"] = 10
 
 # Set lbaas plugin
@@ -417,8 +417,8 @@ default["openstack"]["network"]["openvswitch"]["local_ip_interface"] = nil
 # Example: bridge_mappings = physnet1:br-eth1
 default["openstack"]["network"]["openvswitch"]["bridge_mappings"] = nil
 
-# Firewall driver for realizing quantum security group function
-default["openstack"]["network"]["openvswitch"]["fw_driver"] = "quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
+# Firewall driver for realizing neutron security group function
+default["openstack"]["network"]["openvswitch"]["fw_driver"] = "neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
 
 # The newest version of OVS which comes with 12.04 Precise is 1.4.0
 # Which is legacy. Should we compile a newer version from source?
@@ -523,10 +523,10 @@ default["openstack"]["network"]["brocade"]["physical_interface_mappings"] = ""
 # ============================= Cisco Plugin Configuration =================
 
 # The module and class name path for the nexus plugin
-default["openstack"]["network"]["cisco"]["nexus_plugin"] = "quantum.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin"
+default["openstack"]["network"]["cisco"]["nexus_plugin"] = "neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin"
 
 # The module and class name path for the vswitch plugin
-default["openstack"]["network"]["cisco"]["vswitch_plugin"] = "quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2"
+default["openstack"]["network"]["cisco"]["vswitch_plugin"] = "neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
 
 # Start of the tenant VLAN range
 default["openstack"]["network"]["cisco"]["vlan_start"] = 100
@@ -546,13 +546,13 @@ default["openstack"]["network"]["cisco"]["max_port_profiles"] = 65568
 default["openstack"]["network"]["cisco"]["max_networks"] = 65568
 
 # Module and class path for switch model
-default["openstack"]["network"]["cisco"]["model_class"] = "quantum.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2"
+default["openstack"]["network"]["cisco"]["model_class"] = "neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2"
 
 # Module and class path for VLAN network manager
-default["openstack"]["network"]["cisco"]["manager_class"] = "quantum.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr"
+default["openstack"]["network"]["cisco"]["manager_class"] = "neutron.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr"
 
 # Module and class path for the Nexus driver
-default["openstack"]["network"]["cisco"]["nexus_driver"] = "quantum.plugins.cisco.tests.unit.v2.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver"
+default["openstack"]["network"]["cisco"]["nexus_driver"] = "neutron.plugins.cisco.tests.unit.v2.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver"
 
 # For each Nexus switch, add a hash to the
 # node["openstack"]["network"]["cisco"]["nexus_switches"] Hash,
@@ -626,10 +626,10 @@ default["openstack"]["network"]["hyperv"]["local_network_vswitch"] = "private"
 
 # ============================= Metaplugin Plugin Configuration ============
 
-## This is list of flavor:quantum_plugins
+## This is list of flavor:neutron_plugins
 # extension method is used in the order of this list
-default["openstack"]["network"]["metaplugin"]["plugin_list"] = "openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
-default["openstack"]["network"]["metaplugin"]["l3_plugin_list"] = "openvswitch:quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2,linuxbridge:quantum.plugins.linuxbridge.lb_quantum_plugin.LinuxBridgePluginV2"
+default["openstack"]["network"]["metaplugin"]["plugin_list"] = "openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"
+default["openstack"]["network"]["metaplugin"]["l3_plugin_list"] = "openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2"
 
 # Default "flavor" for L2 and L3
 default["openstack"]["network"]["metaplugin"]["default_flavor"] = "openvswitch"
@@ -667,14 +667,14 @@ default["openstack"]["network"]["nec"]["integration_bridge"] = "br-int"
 # Agent's polling interval in seconds
 default["openstack"]["network"]["nec"]["polling_interval"] = 2
 
-# Firewall driver for realizing quantum security group function
-default["openstack"]["network"]["nec"]["firewall_driver"] = "quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
+# Firewall driver for realizing neutron security group function
+default["openstack"]["network"]["nec"]["firewall_driver"] = "neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
 
 # Specify OpenFlow Controller Host, Port and Driver to connect.
 default["openstack"]["network"]["nec"]["ofc_host"] = "127.0.0.1"
 default["openstack"]["network"]["nec"]["ofc_port"] = 8888
 
-# Drivers are in quantum/plugins/nec/drivers/ .
+# Drivers are in neutron/plugins/nec/drivers/ .
 default["openstack"]["network"]["nec"]["ofc_driver"] = "trema"
 
 # PacketFilter is available when it's enabled in this configuration
@@ -707,7 +707,7 @@ default["openstack"]["network"]["nicira"]["redirects"] = 2
 default["openstack"]["network"]["nicira"]["nvp_controllers"] = "xx.yy.zz.ww:443, aa.bb.cc.dd, ee.ff.gg.hh.ee:80"
 
 # UUID of the pre-existing default NVP Transport zone to be used for creating
-# tunneled isolated "Quantum" networks. This option MUST be specified, e.g.:
+# tunneled isolated "Neutron" networks. This option MUST be specified, e.g.:
 default["openstack"]["network"]["nicira"]["default_tz_uuid"] = "1e8e52cf-fa7f-46b0-a14a-f99835a9cb53"
 
 # (Optional) UUID of the cluster in NVP.  It can be retrieved from NVP management
@@ -741,7 +741,7 @@ default["openstack"]["network"]["nicira"]["concurrent_connections"] = 3
 
 # Acceptable values for 'metadata_mode' are:
 #   - 'access_network': this enables a dedicated connection to the metadata
-#     proxy for metadata server access via Quantum router.
+#     proxy for metadata server access via Neutron router.
 #   - 'dhcp_host_route': this enables host route injection via the dhcp agent.
 # This option is only useful if running on a host that does not support
 # namespaces otherwise access_network should be used.
@@ -802,8 +802,8 @@ default["openstack"]["network"]["ryu"]["ovsdb_port"] = 6634
 default["openstack"]["network"]["ryu"]["ovsdb_ip"] = ""
 default["openstack"]["network"]["ryu"]["ovsdb_interface"] = "eth0"
 
-# Firewall driver for realizing quantum security group function
-default["openstack"]["network"]["ryu"]["firewall_driver"] = "quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
+# Firewall driver for realizing neutron security group function
+default["openstack"]["network"]["ryu"]["firewall_driver"] = "neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
 
 # Agent's polling interval in seconds
 default["openstack"]["network"]["ryu"]["polling_interval"] = 2
@@ -812,87 +812,87 @@ default["openstack"]["network"]["ryu"]["polling_interval"] = 2
 case platform
 when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
   default["openstack"]["network"]["platform"] = {
-    "user" => "quantum",
-    "group" => "quantum",
+    "user" => "neutron",
+    "group" => "neutron",
     "mysql_python_packages" => [ "MySQL-python" ],
     "postgresql_python_packages" => ["python-psycopg2"],
     "nova_network_packages" => [ "openstack-nova-network" ],
-    "quantum_packages" => [ "openstack-quantum" ],
-    "quantum_client_packages" => [],
-    "quantum_dhcp_packages" => [ "openstack-quantum" ],
-    "quantum_dhcp_build_packages" => [],
-    "quantum_l3_packages" => [ "quantum-l3-agent" ],
-    "quantum_openvswitch_packages" => ["openvswitch"],
-    "quantum_openvswitch_agent_packages" => ["openstack-quantum-openvswitch-agent"],
-    "quantum_linuxbridge_agent_packages" => ["openstack-quantum-linuxbridge"],
-    "quantum_metadata_agent_packages" => [],
-    "quantum_plugin_package" => "openstack-quantum-%plugin%",
-    "quantum_server_packages" => [],
-    "quantum_dhcp_agent_service" => "quantum-dhcp-agent",
-    "quantum_l3_agent_service" => "quantum-l3-agent",
-    "quantum_metadata_agent_service" => "quantum-metadata-agent",
-    "quantum_openvswitch_service" => "openvswitch",
-    "quantum_openvswitch_agent_service" => "openstack-quantum-openvswitch-agent",
-    "quantum_linuxbridge_agent_service" => "quantum-linuxbridge-agent",
-    "quantum_server_service" => "quantum-server",
+    "neutron_packages" => [ "openstack-neutron" ],
+    "neutron_client_packages" => [],
+    "neutron_dhcp_packages" => [ "openstack-neutron" ],
+    "neutron_dhcp_build_packages" => [],
+    "neutron_l3_packages" => [ "neutron-l3-agent" ],
+    "neutron_openvswitch_packages" => ["openvswitch"],
+    "neutron_openvswitch_agent_packages" => ["openstack-neutron-openvswitch-agent"],
+    "neutron_linuxbridge_agent_packages" => ["openstack-neutron-linuxbridge"],
+    "neutron_metadata_agent_packages" => [],
+    "neutron_plugin_package" => "openstack-neutron-%plugin%",
+    "neutron_server_packages" => [],
+    "neutron_dhcp_agent_service" => "neutron-dhcp-agent",
+    "neutron_l3_agent_service" => "neutron-l3-agent",
+    "neutron_metadata_agent_service" => "neutron-metadata-agent",
+    "neutron_openvswitch_service" => "openvswitch",
+    "neutron_openvswitch_agent_service" => "openstack-neutron-openvswitch-agent",
+    "neutron_linuxbridge_agent_service" => "neutron-linuxbridge-agent",
+    "neutron_server_service" => "neutron-server",
     "package_overrides" => ""
   }
 when "suse"
   default["openstack"]["network"]["platform"] = {
-    "user" => "openstack-quantum",
-    "group" => "openstack-quantum",
+    "user" => "openstack-neutron",
+    "group" => "openstack-neutron",
     "mysql_python_packages" => ["python-mysql"],
     "postgresql_python_packages" => ["python-psycopg2"],
     "nova_network_packages" => ["openstack-nova-network"],
-    "quantum_packages" => ["openstack-quantum"],
-    "quantum_client_packages" => [],
-    "quantum_dhcp_packages" => ["openstack-quantum-dhcp-agent"],
-    "quantum_dhcp_build_packages" => [],
-    "quantum_l3_packages" => ["openstack-quantum-l3-agent"],
-    # plugins are installed by the main openstack-quantum package on SUSE
-    "quantum_plugin_package" => "",
-    "quantum_metadata_agent_packages" => ["openstack-quantum-metadata-agent"],
-    "quantum_openvswitch_packages" => ["openvswitch-switch"],
-    "quantum_openvswitch_agent_packages" => ["openstack-quantum-openvswitch-agent"],
-    "quantum_linuxbridge_agent_packages" => ["openstack-quantum-linuxbridge-agent"],
-    "quantum_metadata_agent_packages" => ["openstack-quantum-metadata-agent"],
-    "quantum_server_packages" => [],
-    "quantum_dhcp_agent_service" => "openstack-quantum-dhcp-agent",
-    "quantum_l3_agent_service" => "openstack-quantum-l3-agent",
-    "quantum_metadata_agent_service" => "openstack-quantum-metadata-agent",
-    "quantum_openvswitch_service" => "openvswitch-switch",
-    "quantum_openvswitch_agent_service" => "openstack-quantum-openvswitch-agent",
-    "quantum_linuxbridge_agent_service" => "openstack-quantum-linuxbridge-agent",
-    "quantum_server_service" => "openstack-quantum",
+    "neutron_packages" => ["openstack-neutron"],
+    "neutron_client_packages" => [],
+    "neutron_dhcp_packages" => ["openstack-neutron-dhcp-agent"],
+    "neutron_dhcp_build_packages" => [],
+    "neutron_l3_packages" => ["openstack-neutron-l3-agent"],
+    # plugins are installed by the main openstack-neutron package on SUSE
+    "neutron_plugin_package" => "",
+    "neutron_metadata_agent_packages" => ["openstack-neutron-metadata-agent"],
+    "neutron_openvswitch_packages" => ["openvswitch-switch"],
+    "neutron_openvswitch_agent_packages" => ["openstack-neutron-openvswitch-agent"],
+    "neutron_linuxbridge_agent_packages" => ["openstack-neutron-linuxbridge-agent"],
+    "neutron_metadata_agent_packages" => ["openstack-neutron-metadata-agent"],
+    "neutron_server_packages" => [],
+    "neutron_dhcp_agent_service" => "openstack-neutron-dhcp-agent",
+    "neutron_l3_agent_service" => "openstack-neutron-l3-agent",
+    "neutron_metadata_agent_service" => "openstack-neutron-metadata-agent",
+    "neutron_openvswitch_service" => "openvswitch-switch",
+    "neutron_openvswitch_agent_service" => "openstack-neutron-openvswitch-agent",
+    "neutron_linuxbridge_agent_service" => "openstack-neutron-linuxbridge-agent",
+    "neutron_server_service" => "openstack-neutron",
     "package_overrides" => ""
   }
 when "ubuntu"
   default["openstack"]["network"]["platform"] = {
-    "user" => "quantum",
-    "group" => "quantum",
+    "user" => "neutron",
+    "group" => "neutron",
     "mysql_python_packages" => [ "python-mysqldb" ],
     "postgresql_python_packages" => [ "python-psycopg2" ],
     "nova_network_packages" => [ "nova-network" ],
-    "quantum_lb_packages" => ["quantum-lbaas-agent", "haproxy"],
-    "quantum_packages" => [ "quantum-common", "python-pyparsing", "python-cliff" ],
-    "quantum_client_packages" => [ "python-quantumclient", "python-pyparsing" ],
-    "quantum_dhcp_packages" => [ "quantum-dhcp-agent" ],
-    "quantum_dhcp_build_packages" => [ "build-essential", "pkg-config", "libidn11-dev", "libdbus-1-dev", "libnetfilter-conntrack-dev", "gettext" ],
-    "quantum_l3_packages" => [ "quantum-l3-agent" ],
-    "quantum_openvswitch_packages" => [ "openvswitch-switch", "openvswitch-datapath-dkms", "bridge-utils" ],
-    "quantum_openvswitch_build_packages" => [ "build-essential", "pkg-config", "fakeroot", "libssl-dev", "openssl", "debhelper", "autoconf", "dkms", "python-all", "python-qt4", "python-zopeinterface", "python-twisted-conch" ],
-    "quantum_openvswitch_agent_packages" => [ "quantum-plugin-openvswitch", "quantum-plugin-openvswitch-agent" ],
-    "quantum_linuxbridge_agent_packages" => [ "quantum-plugin-linuxbridge", "quantum-plugin-linuxbridge-agent" ],
-    "quantum_metadata_agent_packages" => [ "quantum-metadata-agent" ],
-    "quantum_plugin_package" => "quantum-plugin-%plugin%",
-    "quantum_server_packages" => ["quantum-server"],
-    "quantum_dhcp_agent_service" => "quantum-dhcp-agent",
-    "quantum_l3_agent_service" => "quantum-l3-agent",
-    "quantum_metadata_agent_service" => "quantum-metadata-agent",
-    "quantum_openvswitch_service" => "openvswitch-switch",
-    "quantum_openvswitch_agent_service" => "quantum-plugin-openvswitch-agent",
-    "quantum_linuxbridge_agent_service" => "quantum-plugin-linuxbridge-agent",
-    "quantum_server_service" => "quantum-server",
+    "neutron_lb_packages" => ["neutron-lbaas-agent", "haproxy"],
+    "neutron_packages" => [ "neutron-common", "python-pyparsing", "python-cliff" ],
+    "neutron_client_packages" => [ "python-neutronclient", "python-pyparsing" ],
+    "neutron_dhcp_packages" => [ "neutron-dhcp-agent" ],
+    "neutron_dhcp_build_packages" => [ "build-essential", "pkg-config", "libidn11-dev", "libdbus-1-dev", "libnetfilter-conntrack-dev", "gettext" ],
+    "neutron_l3_packages" => [ "neutron-l3-agent" ],
+    "neutron_openvswitch_packages" => [ "openvswitch-switch", "openvswitch-datapath-dkms", "bridge-utils" ],
+    "neutron_openvswitch_build_packages" => [ "build-essential", "pkg-config", "fakeroot", "libssl-dev", "openssl", "debhelper", "autoconf", "dkms", "python-all", "python-qt4", "python-zopeinterface", "python-twisted-conch" ],
+    "neutron_openvswitch_agent_packages" => [ "neutron-plugin-openvswitch", "neutron-plugin-openvswitch-agent" ],
+    "neutron_linuxbridge_agent_packages" => [ "neutron-plugin-linuxbridge", "neutron-plugin-linuxbridge-agent" ],
+    "neutron_metadata_agent_packages" => [ "neutron-metadata-agent" ],
+    "neutron_plugin_package" => "neutron-plugin-%plugin%",
+    "neutron_server_packages" => ["neutron-server"],
+    "neutron_dhcp_agent_service" => "neutron-dhcp-agent",
+    "neutron_l3_agent_service" => "neutron-l3-agent",
+    "neutron_metadata_agent_service" => "neutron-metadata-agent",
+    "neutron_openvswitch_service" => "openvswitch-switch",
+    "neutron_openvswitch_agent_service" => "neutron-plugin-openvswitch-agent",
+    "neutron_linuxbridge_agent_service" => "neutron-plugin-linuxbridge-agent",
+    "neutron_server_service" => "neutron-server",
     "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
   }
 end
diff --git a/files/default/etc/quantum/rootwrap.d/debug.filters b/files/default/etc/neutron/rootwrap.d/debug.filters
similarity index 86%
rename from files/default/etc/quantum/rootwrap.d/debug.filters
rename to files/default/etc/neutron/rootwrap.d/debug.filters
index 6dbb4d7d..ca465e32 100644
--- a/files/default/etc/quantum/rootwrap.d/debug.filters
+++ b/files/default/etc/neutron/rootwrap.d/debug.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
diff --git a/files/default/etc/quantum/rootwrap.d/dhcp.filters b/files/default/etc/neutron/rootwrap.d/dhcp.filters
similarity index 85%
rename from files/default/etc/quantum/rootwrap.d/dhcp.filters
rename to files/default/etc/neutron/rootwrap.d/dhcp.filters
index 89abb02a..913f357d 100644
--- a/files/default/etc/quantum/rootwrap.d/dhcp.filters
+++ b/files/default/etc/neutron/rootwrap.d/dhcp.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
@@ -14,7 +14,7 @@ dnsmasq: DnsmasqFilter, /sbin/dnsmasq, root
 dnsmasq_usr: DnsmasqFilter, /usr/sbin/dnsmasq, root
 # dhcp-agent uses kill as well, that's handled by the generic KillFilter
 # it looks like these are the only signals needed, per
-# quantum/agent/linux/dhcp.py
+# neutron/agent/linux/dhcp.py
 kill_dnsmasq: KillFilter, root, /sbin/dnsmasq, -9, -HUP
 kill_dnsmasq_usr: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP
 
@@ -26,10 +26,10 @@ ovs-vsctl_sbin: CommandFilter, /sbin/ovs-vsctl, root
 ovs-vsctl_sbin_usr: CommandFilter, /usr/sbin/ovs-vsctl, root
 
 # metadata proxy
-metadata_proxy: CommandFilter, /usr/bin/quantum-ns-metadata-proxy, root
+metadata_proxy: CommandFilter, /usr/bin/neutron-ns-metadata-proxy, root
 # If installed from source (say, by devstack), the prefix will be
 # /usr/local instead of /usr/bin.
-metadata_proxy_local: CommandFilter, /usr/local/bin/quantum-ns-metadata-proxy, root
+metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root
 kill_metadata7: KillFilter, root, /usr/bin/python2.7, -9
 kill_metadata6: KillFilter, root, /usr/bin/python2.6, -9
 
diff --git a/files/default/etc/quantum/rootwrap.d/iptables-firewall.filters b/files/default/etc/neutron/rootwrap.d/iptables-firewall.filters
similarity index 79%
rename from files/default/etc/quantum/rootwrap.d/iptables-firewall.filters
rename to files/default/etc/neutron/rootwrap.d/iptables-firewall.filters
index 2049e0e9..ca0b5833 100644
--- a/files/default/etc/quantum/rootwrap.d/iptables-firewall.filters
+++ b/files/default/etc/neutron/rootwrap.d/iptables-firewall.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
@@ -8,14 +8,14 @@
 
 [Filters]
 
-# quantum/agent/linux/iptables_manager.py
+# neutron/agent/linux/iptables_manager.py
 #   "iptables-save", ...
 iptables-save: CommandFilter, /sbin/iptables-save, root
 iptables-restore: CommandFilter, /sbin/iptables-restore, root
 ip6tables-save: CommandFilter, /sbin/ip6tables-save, root
 ip6tables-restore: CommandFilter, /sbin/ip6tables-restore, root
 
-# quantum/agent/linux/iptables_manager.py
+# neutron/agent/linux/iptables_manager.py
 #   "iptables", "-A", ...
 iptables: CommandFilter, /sbin/iptables, root
 ip6tables: CommandFilter, /sbin/ip6tables, root
diff --git a/files/default/etc/quantum/rootwrap.d/l3.filters b/files/default/etc/neutron/rootwrap.d/l3.filters
similarity index 87%
rename from files/default/etc/quantum/rootwrap.d/l3.filters
rename to files/default/etc/neutron/rootwrap.d/l3.filters
index ec08d595..32175eb9 100644
--- a/files/default/etc/quantum/rootwrap.d/l3.filters
+++ b/files/default/etc/neutron/rootwrap.d/l3.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
@@ -17,10 +17,10 @@ sysctl: CommandFilter, /sbin/sysctl, root
 route: CommandFilter, /sbin/route, root
 
 # metadata proxy
-metadata_proxy: CommandFilter, /usr/bin/quantum-ns-metadata-proxy, root
+metadata_proxy: CommandFilter, /usr/bin/neutron-ns-metadata-proxy, root
 # If installed from source (say, by devstack), the prefix will be
 # /usr/local instead of /usr/bin.
-metadata_proxy_local: CommandFilter, /usr/local/bin/quantum-ns-metadata-proxy, root
+metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root
 kill_metadata7: KillFilter, root, /usr/bin/python2.7, -9
 kill_metadata6: KillFilter, root, /usr/bin/python2.6, -9
 
diff --git a/files/default/etc/quantum/rootwrap.d/lbaas-haproxy.filters b/files/default/etc/neutron/rootwrap.d/lbaas-haproxy.filters
similarity index 93%
rename from files/default/etc/quantum/rootwrap.d/lbaas-haproxy.filters
rename to files/default/etc/neutron/rootwrap.d/lbaas-haproxy.filters
index e00a7197..3256aff5 100644
--- a/files/default/etc/quantum/rootwrap.d/lbaas-haproxy.filters
+++ b/files/default/etc/neutron/rootwrap.d/lbaas-haproxy.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
diff --git a/files/default/etc/quantum/rootwrap.d/linuxbridge-plugin.filters b/files/default/etc/neutron/rootwrap.d/linuxbridge-plugin.filters
similarity index 89%
rename from files/default/etc/quantum/rootwrap.d/linuxbridge-plugin.filters
rename to files/default/etc/neutron/rootwrap.d/linuxbridge-plugin.filters
index 301280cb..79d362fd 100644
--- a/files/default/etc/quantum/rootwrap.d/linuxbridge-plugin.filters
+++ b/files/default/etc/neutron/rootwrap.d/linuxbridge-plugin.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
diff --git a/files/default/etc/quantum/rootwrap.d/nec-plugin.filters b/files/default/etc/neutron/rootwrap.d/nec-plugin.filters
similarity index 82%
rename from files/default/etc/quantum/rootwrap.d/nec-plugin.filters
rename to files/default/etc/neutron/rootwrap.d/nec-plugin.filters
index 6d8f9c2a..9a91c024 100644
--- a/files/default/etc/quantum/rootwrap.d/nec-plugin.filters
+++ b/files/default/etc/neutron/rootwrap.d/nec-plugin.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
@@ -8,7 +8,7 @@
 
 [Filters]
 
-# nec_quantum_agent
+# nec_neutron_agent
 ovs-vsctl: CommandFilter, /bin/ovs-vsctl, root
 ovs-vsctl_usr: CommandFilter, /usr/bin/ovs-vsctl, root
 ovs-vsctl_sbin: CommandFilter, /sbin/ovs-vsctl, root
diff --git a/files/default/etc/quantum/rootwrap.d/openvswitch-plugin.filters b/files/default/etc/neutron/rootwrap.d/openvswitch-plugin.filters
similarity index 93%
rename from files/default/etc/quantum/rootwrap.d/openvswitch-plugin.filters
rename to files/default/etc/neutron/rootwrap.d/openvswitch-plugin.filters
index c3164480..1fbeaffc 100644
--- a/files/default/etc/quantum/rootwrap.d/openvswitch-plugin.filters
+++ b/files/default/etc/neutron/rootwrap.d/openvswitch-plugin.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
diff --git a/files/default/etc/quantum/rootwrap.d/ryu-plugin.filters b/files/default/etc/neutron/rootwrap.d/ryu-plugin.filters
similarity index 79%
rename from files/default/etc/quantum/rootwrap.d/ryu-plugin.filters
rename to files/default/etc/neutron/rootwrap.d/ryu-plugin.filters
index 696c7d39..3e85df1c 100644
--- a/files/default/etc/quantum/rootwrap.d/ryu-plugin.filters
+++ b/files/default/etc/neutron/rootwrap.d/ryu-plugin.filters
@@ -1,4 +1,4 @@
-# quantum-rootwrap command filters for nodes on which quantum is
+# neutron-rootwrap command filters for nodes on which neutron is
 # expected to control network
 #
 # This file should be owned by (and only-writeable by) the root user
@@ -12,14 +12,14 @@
 # unclear whether both variants are necessary, but I'm transliterating
 # from the old mechanism
 
-# quantum/plugins/ryu/agent/ryu_quantum_agent.py:
+# neutron/plugins/ryu/agent/ryu_neutron_agent.py:
 #   "ovs-vsctl", "--timeout=2", ...
 ovs-vsctl: CommandFilter, /bin/ovs-vsctl, root
 ovs-vsctl_usr: CommandFilter, /usr/bin/ovs-vsctl, root
 ovs-vsctl_sbin: CommandFilter, /sbin/ovs-vsctl, root
 ovs-vsctl_sbin_usr: CommandFilter, /usr/sbin/ovs-vsctl, root
 
-# quantum/plugins/ryu/agent/ryu_quantum_agent.py:
+# neutron/plugins/ryu/agent/ryu_neutron_agent.py:
 #   "xe", "vif-param-get", ...
 xe: CommandFilter, /bin/xe, root
 xe_usr: CommandFilter, /usr/bin/xe, root
diff --git a/files/default/quantum-ha-tool.py b/files/default/neutron-ha-tool.py
similarity index 94%
rename from files/default/quantum-ha-tool.py
rename to files/default/neutron-ha-tool.py
index fdb68ac3..e59a6045 100755
--- a/files/default/quantum-ha-tool.py
+++ b/files/default/neutron-ha-tool.py
@@ -27,12 +27,12 @@ import time
 from logging.handlers import SysLogHandler
 from collections import OrderedDict
 from random import choice
-from quantumclient.quantum import client
+from neutronclient.neutron import client
 
-LOG = logging.getLogger('quantum-ha-tool')
+LOG = logging.getLogger('neutron-ha-tool')
 LOG_FORMAT='%(asctime)s %(name)-12s %(levelname)-8s %(message)s'
 LOG_DATE = '%m-%d %H:%M'
-DESCRIPTION = "Quantum High Availability Tool"
+DESCRIPTION = "neutron High Availability Tool"
 TAKEOVER_DELAY = int(random.random()*30+30)
 
 
@@ -102,14 +102,14 @@ def l3_agent_rebalance(qclient, noop=False):
     on each l3 agent will be as close as possible which should help
     distribute load as new l3 agents come online.
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param noop: Optional noop flag
     """
 
-    # {u'binary': u'quantum-l3-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True, u'topic':
+    # {u'binary': u'neutron-l3-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True, u'topic':
     # u'l3_agent', u'host': u'o3r3.int.san3.attcompute.com', u'agent_type': u'L3 agent', u'created_at': u'2013-07-02 14:50:58', u'started_at': u'2013-07-02 18:00:55',
     # u'id': u'6efe494a-616c-41ea-9c8f-2c592f4d46ff', u'configurations': {u'router_id': u'', u'gateway_external_network_id': u'', u'handle_internal_only_routers': True,
-    # u'use_namespaces': True, u'routers': 5, u'interfaces': 3, u'floating_ips': 9, u'interface_driver': u'quantum.agent.linux.interface.OVSInterfaceDriver', u'ex_gw_ports': 3}},
+    # u'use_namespaces': True, u'routers': 5, u'interfaces': 3, u'floating_ips': 9, u'interface_driver': u'neutron.agent.linux.interface.OVSInterfaceDriver', u'ex_gw_ports': 3}},
 
     l3_agent_dict={}
     agents = list_agents(qclient, agent_type='L3 agent')
@@ -162,7 +162,7 @@ def l3_agent_check(qclient, noop=False):
     Walk the l3 agents searching for agents that are offline.  Show routers
     that are offline and where we would migrate them too.
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param noop: Optional noop flag
 
     """
@@ -196,7 +196,7 @@ def l3_agent_migrate(qclient, noop=False):
     offline, we will retrieve a list of routers on them and migrate them to a
     random l3 agent that is online.
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param noop: Optional noop flag
 
     """
@@ -256,7 +256,7 @@ def replicate_dhcp(qclient, noop=False):
     Retrieve a network list and then probe each DHCP agent to ensure they have that
     network assigned.
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param noop: Optional noop flag
     """
 
@@ -287,13 +287,13 @@ def migrate_router(qclient, router_id, agent_id, target_id):
     """
     Returns nothing, and raises on exception
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param router_id: The id of the router to migrate
     :param agent_id: The id of the l3 agent to migrate from
     :param target_id: The id of the l3 agent to migrate to
     """
 
-    # N.B. The quantum API will return "success" even when there is a subsequent
+    # N.B. The neutron API will return "success" even when there is a subsequent
     # failure during the add or remove process so we must check to ensure the
     # router has been added or removed
 
@@ -318,7 +318,7 @@ def list_networks(qclient):
     """
     Return a list of network objects
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     """
 
     resp = qclient.list_networks()
@@ -329,7 +329,7 @@ def list_dhcp_agent_networks(qclient, agent_id):
     """
     Return a list of network ids assigned to a particular DHCP agent
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     :param agent_id: A DHCP agent id
     """
 
@@ -343,7 +343,7 @@ def list_routers(qclient):
     """
     Return a list of router objects
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
 
     # {'routers': [{u'status': u'ACTIVE', u'external_gateway_info': {u'network_id': u'b970297c-d80e-4527-86d7-e49d2da9fdef'}, u'name': u'router1',
     # u'admin_state_up': True, u'tenant_id': u'5603b97ee7f047ea999e25492c7fcb23', u'routes': [], u'id': u'0a122e5c-1623-412e-8c53-a1e21d1daff8'},
@@ -358,7 +358,7 @@ def list_routers_on_l3_agent(qclient, agent_id):
     """
     Return a list of router ids on an agent
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
     """
 
     resp = qclient.list_routers_on_l3_agent(agent_id)
@@ -369,27 +369,27 @@ def list_agents(qclient, agent_type=None):
     """
     Return a list of agent objects
 
-    :param qclient: A quantumclient
+    :param qclient: A neutronclient
 
     # openvswitch
     #
-    # {u'agents': [{u'binary': u'quantum-openvswitch-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:25'
+    # {u'agents': [{u'binary': u'neutron-openvswitch-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:25'
     # u'alive': True, u'topic': u'N/A', u'host': u'o3r3.int.san3.attcompute.com', u'agent_type': u'Open vSwitch agent', u'created_at': u'2013-07-02 14:50:57',
     # u'started_at': u'2013-07-02 14:50:57', u'id': u'3a577f1d-d86e-4f1a-a395-8d4c8e4df1e2', u'configurations': {u'devices': 10}},
     #
     # dhcp
     #
-    # {u'binary': u'quantum-dhcp-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True,
+    # {u'binary': u'neutron-dhcp-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True,
     # u'topic': u'dhcp_agent', u'host': u'o5r4.int.san3.attcompute.com', u'agent_type': u'DHCP agent', u'created_at': u'2013-06-26 16:21:02', u'started_at':
     #  u'2013-06-28 13:32:52', u'id': u'3e8be28e-05a0-472b-9288-a59f8d8d2271', u'configurations': {u'subnets': 4, u'use_namespaces': True, u'dhcp_driver':
-    # u'quantum.agent.linux.dhcp.Dnsmasq', u'networks': 4, u'dhcp_lease_time': 120, u'ports': 38}},
+    # u'neutron.agent.linux.dhcp.Dnsmasq', u'networks': 4, u'dhcp_lease_time': 120, u'ports': 38}},
     #
     # l3
     #
-    # {u'binary': u'quantum-l3-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True, u'topic':
+    # {u'binary': u'neutron-l3-agent', u'description': None, u'admin_state_up': True, u'heartbeat_timestamp': u'2013-07-02 22:20:23', u'alive': True, u'topic':
     # u'l3_agent', u'host': u'o3r3.int.san3.attcompute.com', u'agent_type': u'L3 agent', u'created_at': u'2013-07-02 14:50:58', u'started_at': u'2013-07-02 18:00:55',
     # u'id': u'6efe494a-616c-41ea-9c8f-2c592f4d46ff', u'configurations': {u'router_id': u'', u'gateway_external_network_id': u'', u'handle_internal_only_routers': True,
-    # u'use_namespaces': True, u'routers': 5, u'interfaces': 3, u'floating_ips': 9, u'interface_driver': u'quantum.agent.linux.interface.OVSInterfaceDriver', u'ex_gw_ports': 3}},
+    # u'use_namespaces': True, u'routers': 5, u'interfaces': 3, u'floating_ips': 9, u'interface_driver': u'neutron.agent.linux.interface.OVSInterfaceDriver', u'ex_gw_ports': 3}},
     """
 
     resp = qclient.list_agents()
diff --git a/metadata.rb b/metadata.rb
index 1d709dee..94a3054c 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer        "Jay Pipes <jaypipes@gmail.com>"
 license           "Apache 2.0"
 description       "Installs and configures the OpenStack Network API Service and various agents and plugins"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "7.1.1"
+version           "8.0.0"
 recipe            "openstack-network::server", "Installs packages required for a OpenStack Network server"
 recipe            "openstack-network::openvswitch", "Installs packages required for OVS"
 recipe            "openstack-network::metadata_agent", "Installs packages required for a OpenStack Network Metadata Agent"
@@ -13,7 +13,7 @@ recipe            "openstack-network::identity_registration", "Registers OpenSta
   supports os
 end
 
-depends           "openstack-identity", "~> 7.0"
-depends           "openstack-common", "~> 0.4.0"
+depends           "openstack-identity", "~> 8.0"
+depends           "openstack-common", "~> 8.0"
 depends           "mysql"
 depends           "postgresql"
diff --git a/recipes/balancer.rb b/recipes/balancer.rb
index ea81c71a..af2b1bd0 100644
--- a/recipes/balancer.rb
+++ b/recipes/balancer.rb
@@ -24,14 +24,14 @@
 
 platform_options = node["openstack"]["network"]["platform"]
 
-service "quantum-server" do
-  service_name platform_options["quantum_server_service"]
+service "neutron-server" do
+  service_name platform_options["neutron_server_service"]
   supports :status => true, :restart => true
 
   action :nothing
 end
 
-platform_options["quantum_lb_packages"].each do |pkg|
+platform_options["neutron_lb_packages"].each do |pkg|
    package pkg do
      action :install
    end
@@ -46,5 +46,5 @@ end
 
 template "#{node["openstack"]["network"]["lbaas_config_path"]}/lbaas_agent.ini" do
   source "lbaas_agent.ini.erb"
-  notifies :restart, "service[quantum-server]", :immediately
+  notifies :restart, "service[neutron-server]", :immediately
 end
diff --git a/recipes/build_openvswitch_source.rb b/recipes/build_openvswitch_source.rb
index 0a1b2afe..a6c935ee 100644
--- a/recipes/build_openvswitch_source.rb
+++ b/recipes/build_openvswitch_source.rb
@@ -21,7 +21,7 @@
 
 platform_options = node["openstack"]["network"]["platform"]
 
-platform_options["quantum_openvswitch_build_packages"].each do |pkg|
+platform_options["neutron_openvswitch_build_packages"].each do |pkg|
   package pkg do
     action :install
   end
diff --git a/recipes/common.rb b/recipes/common.rb
index 546ef902..7880737a 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -42,13 +42,13 @@ platform_options["nova_network_packages"].each do |pkg|
   end
 end
 
-platform_options["quantum_packages"].each do |pkg|
+platform_options["neutron_packages"].each do |pkg|
   package pkg do
     action :install
   end
 end
 
-directory "/etc/quantum/plugins" do
+directory "/etc/neutron/plugins" do
   recursive true
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
@@ -56,7 +56,7 @@ directory "/etc/quantum/plugins" do
   action :create
 end
 
-directory "/var/cache/quantum" do
+directory "/var/cache/neutron" do
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode 00700
@@ -72,28 +72,28 @@ directory ::File.dirname node["openstack"]["network"]["api"]["auth"]["cache_dir"
 end
 
 # This will copy recursively all the files in
-# /files/default/etc/quantum/rootwrap.d
-remote_directory "/etc/quantum/rootwrap.d" do
-  source "etc/quantum/rootwrap.d"
+# /files/default/etc/neutron/rootwrap.d
+remote_directory "/etc/neutron/rootwrap.d" do
+  source "etc/neutron/rootwrap.d"
   files_owner node["openstack"]["network"]["platform"]["user"]
   files_group node["openstack"]["network"]["platform"]["group"]
   files_mode 00700
 end
 
-template "/etc/quantum/rootwrap.conf" do
+template "/etc/neutron/rootwrap.conf" do
   source "rootwrap.conf.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode 00644
 end
 
-template "/etc/quantum/policy.json" do
+template "/etc/neutron/policy.json" do
   source "policy.json.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode 00644
 
-  notifies :restart, "service[quantum-server]", :delayed
+  notifies :restart, "service[neutron-server]", :delayed
 end
 
 if node["openstack"]["network"]["mq"]["service_type"] == "rabbitmq"
@@ -109,7 +109,7 @@ identity_admin_endpoint = endpoint "identity-admin"
 auth_uri = ::URI.decode identity_endpoint.to_s
 
 db_user = node["openstack"]["network"]["db"]["username"]
-db_pass = db_password "quantum"
+db_pass = db_password "neutron"
 sql_connection = db_uri("network", db_user, db_pass)
 
 api_endpoint = endpoint "network-api"
@@ -132,7 +132,7 @@ else
   local_ip = address_for node["openstack"]["network"]["openvswitch"]["local_ip_interface"]
 end
 
-platform_options["quantum_client_packages"].each do |pkg|
+platform_options["neutron_client_packages"].each do |pkg|
   package pkg do
     action :upgrade
     options platform_options["package_overrides"]
@@ -142,17 +142,17 @@ end
 # all recipes include common.rb, and some servers
 # may just be running a subset of agents (like l3_agent)
 # and not the api server components, so we ignore restart
-# failures here as there may be no quantum-server process
-service "quantum-server" do
-  service_name platform_options["quantum_server_service"]
+# failures here as there may be no neutron-server process
+service "neutron-server" do
+  service_name platform_options["neutron_server_service"]
   supports :status => true, :restart => true
   ignore_failure true
 
   action :nothing
 end
 
-template "/etc/quantum/quantum.conf" do
-  source "quantum.conf.erb"
+template "/etc/neutron/neutron.conf" do
+  source "neutron.conf.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode   00644
@@ -166,10 +166,10 @@ template "/etc/quantum/quantum.conf" do
     :service_pass => service_pass
   )
 
-  notifies :restart, "service[quantum-server]", :delayed
+  notifies :restart, "service[neutron-server]", :delayed
 end
 
-template "/etc/quantum/api-paste.ini" do
+template "/etc/neutron/api-paste.ini" do
   source "api-paste.ini.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
@@ -181,10 +181,10 @@ template "/etc/quantum/api-paste.ini" do
     "service_pass" => service_pass
   )
 
-  notifies :restart, "service[quantum-server]", :delayed
+  notifies :restart, "service[neutron-server]", :delayed
 end
 
-directory "/etc/quantum/plugins/#{main_plugin}" do
+directory "/etc/neutron/plugins/#{main_plugin}" do
   recursive true
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
@@ -192,7 +192,7 @@ directory "/etc/quantum/plugins/#{main_plugin}" do
 end
 
 # For several plugins, the plugin configuration
-# is required by both the quantum-server and
+# is required by both the neutron-server and
 # ancillary services that may be on different
 # physical servers like the l3 agent, so we assume
 # the plugin configuration is a "common" file
@@ -202,8 +202,8 @@ template_file = nil
 case main_plugin
 when "bigswitch"
 
-  template_file =  "/etc/quantum/plugins/bigswitch/restproxy.ini"
-  template "/etc/quantum/plugins/bigswitch/restproxy.ini" do
+  template_file =  "/etc/neutron/plugins/bigswitch/restproxy.ini"
+  template "/etc/neutron/plugins/bigswitch/restproxy.ini" do
     source "plugins/bigswitch/restproxy.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -212,13 +212,13 @@ when "bigswitch"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "brocade"
 
-  template_file = "/etc/quantum/plugins/brocade/brocade.ini"
-  template "/etc/quantum/plugins/brocade/brocade.ini" do
+  template_file = "/etc/neutron/plugins/brocade/brocade.ini"
+  template "/etc/neutron/plugins/brocade/brocade.ini" do
     source "plugins/brocade/brocade.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -227,13 +227,13 @@ when "brocade"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "cisco"
 
-  template_file = "/etc/quantum/plugins/cisco/cisco_plugins.ini"
-  template "/etc/quantum/plugins/cisco/cisco_plugins.ini" do
+  template_file = "/etc/neutron/plugins/cisco/cisco_plugins.ini"
+  template "/etc/neutron/plugins/cisco/cisco_plugins.ini" do
     source "plugins/cisco/cisco_plugins.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -242,14 +242,14 @@ when "cisco"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "hyperv"
 
-  template_file = "/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini.erb"
-  template "/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini.erb" do
-    source "plugins/hyperv/hyperv_quantum_plugin.ini.erb"
+  template_file = "/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini.erb"
+  template "/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini.erb" do
+    source "plugins/hyperv/hyperv_neutron_plugin.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
     mode 00644
@@ -257,13 +257,13 @@ when "hyperv"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "linuxbridge"
 
-  template_file = "/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini"
-  template "/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini" do
+  template_file = "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini"
+  template "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" do
     source "plugins/linuxbridge/linuxbridge_conf.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -272,13 +272,13 @@ when "linuxbridge"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "midonet"
 
-  template_file = "/etc/quantum/plugins/metaplugin/metaplugin.ini"
-  template "/etc/quantum/plugins/metaplugin/metaplugin.ini" do
+  template_file = "/etc/neutron/plugins/metaplugin/metaplugin.ini"
+  template "/etc/neutron/plugins/metaplugin/metaplugin.ini" do
     source "plugins/metaplugin/metaplugin.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -287,13 +287,13 @@ when "midonet"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "nec"
 
-  template_file = "/etc/quantum/plugins/nec/nec.ini"
-  template "/etc/quantum/plugins/nec/nec.ini" do
+  template_file = "/etc/neutron/plugins/nec/nec.ini"
+  template "/etc/neutron/plugins/nec/nec.ini" do
     source "plugins/nec/nec.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -302,13 +302,13 @@ when "nec"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "nicira"
 
-  template_file = "/etc/quantum/plugins/nicira/nvp.ini"
-  template "/etc/quantum/plugins/nicira/nvp.ini" do
+  template_file = "/etc/neutron/plugins/nicira/nvp.ini"
+  template "/etc/neutron/plugins/nicira/nvp.ini" do
     source "plugins/nicira/nvp.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -317,20 +317,20 @@ when "nicira"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "openvswitch"
 
-  template_file = "/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini"
+  template_file = "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
 
-  service "quantum-plugin-openvswitch-agent" do
-    service_name platform_options["quantum_openvswitch_agent_service"]
+  service "neutron-plugin-openvswitch-agent" do
+    service_name platform_options["neutron_openvswitch_agent_service"]
     action :nothing
   end
 
-  template "/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini" do
-    source "plugins/openvswitch/ovs_quantum_plugin.ini.erb"
+  template "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" do
+    source "plugins/openvswitch/ovs_neutron_plugin.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
     mode 00644
@@ -338,17 +338,17 @@ when "openvswitch"
       :sql_connection => sql_connection,
       :local_ip => local_ip
     )
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
     if node.run_list.expand(node.chef_environment).recipes.include?("openstack-network::openvswitch")
-      notifies :restart, "service[quantum-plugin-openvswitch-agent]", :delayed
+      notifies :restart, "service[neutron-plugin-openvswitch-agent]", :delayed
     end
   end
 
 
 when "plumgrid"
 
-  template_file = "/etc/quantum/plugins/plumgrid/plumgrid.ini"
-  template "/etc/quantum/plugins/plumgrid/plumgrid.ini" do
+  template_file = "/etc/neutron/plugins/plumgrid/plumgrid.ini"
+  template "/etc/neutron/plugins/plumgrid/plumgrid.ini" do
     source "plugins/plumgrid/plumgrid.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -357,13 +357,13 @@ when "plumgrid"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 when "ryu"
 
-  template_file = "/etc/quantum/plugins/ryu/ryu.ini"
-  template "/etc/quantum/plugins/ryu/ryu.ini" do
+  template_file = "/etc/neutron/plugins/ryu/ryu.ini"
+  template "/etc/neutron/plugins/ryu/ryu.ini" do
     source "plugins/ryu/ryu.ini.erb"
     owner node["openstack"]["network"]["platform"]["user"]
     group node["openstack"]["network"]["platform"]["group"]
@@ -372,13 +372,13 @@ when "ryu"
       :sql_connection => sql_connection
     )
 
-    notifies :restart, "service[quantum-server]", :delayed
+    notifies :restart, "service[neutron-server]", :delayed
   end
 
 end
 
-template "/etc/default/quantum-server" do
-  source "quantum-server.erb"
+template "/etc/default/neutron-server" do
+  source "neutron-server.erb"
   owner "root"
   group "root"
   mode 00644
diff --git a/recipes/dhcp_agent.rb b/recipes/dhcp_agent.rb
index 4602222a..c4422e60 100644
--- a/recipes/dhcp_agent.rb
+++ b/recipes/dhcp_agent.rb
@@ -25,15 +25,15 @@ platform_options = node["openstack"]["network"]["platform"]
 driver_name = node["openstack"]["network"]["interface_driver"].split('.').last.downcase
 main_plugin = node["openstack"]["network"]["interface_driver_map"][driver_name]
 
-platform_options["quantum_dhcp_packages"].each do |pkg|
+platform_options["neutron_dhcp_packages"].each do |pkg|
   package pkg do
     options platform_options["package_overrides"]
     action :install
   end
 end
 
-service "quantum-dhcp-agent" do
-  service_name platform_options["quantum_dhcp_agent_service"]
+service "neutron-dhcp-agent" do
+  service_name platform_options["neutron_dhcp_agent_service"]
   supports :status => true, :restart => true
 
   action :enable
@@ -41,31 +41,31 @@ end
 
 # Some plugins have DHCP functionality, so we install the plugin
 # Python package and include the plugin-specific recipe here...
-package platform_options["quantum_plugin_package"].gsub("%plugin%", main_plugin) do
+package platform_options["neutron_plugin_package"].gsub("%plugin%", main_plugin) do
   options platform_options["package_overrides"]
   action :install
-  # plugins are installed by the main openstack-quantum package on SUSE
+  # plugins are installed by the main openstack-neutron package on SUSE
   not_if { platform_family? "suse" }
 end
 
-execute "quantum-dhcp-setup --plugin #{main_plugin}" do
+execute "neutron-dhcp-setup --plugin #{main_plugin}" do
   only_if { platform?(%w(fedora redhat centos)) } # :pragma-foodcritic: ~FC024 - won't fix this
 end
 
-template "/etc/quantum/dnsmasq.conf" do
+template "/etc/neutron/dnsmasq.conf" do
   source "dnsmasq.conf.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode   00644
-  notifies :restart, "service[quantum-dhcp-agent]", :delayed
+  notifies :restart, "service[neutron-dhcp-agent]", :delayed
 end
 
-template "/etc/quantum/dhcp_agent.ini" do
+template "/etc/neutron/dhcp_agent.ini" do
   source "dhcp_agent.ini.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode   00644
-  notifies :restart, "service[quantum-dhcp-agent]", :immediately
+  notifies :restart, "service[neutron-dhcp-agent]", :immediately
 end
 
 # Deal with ubuntu precise dnsmasq 2.59 version by custom
@@ -81,7 +81,7 @@ end
 # has no plans to fix
 if node['lsb'] && node['lsb']['codename'] == "precise"
 
-  platform_options["quantum_dhcp_build_packages"].each do |pkg|
+  platform_options["neutron_dhcp_build_packages"].each do |pkg|
     package pkg do
       action :install
     end
diff --git a/recipes/l3_agent.rb b/recipes/l3_agent.rb
index 6a08d344..87c186e1 100644
--- a/recipes/l3_agent.rb
+++ b/recipes/l3_agent.rb
@@ -25,7 +25,7 @@ platform_options = node["openstack"]["network"]["platform"]
 driver_name = node["openstack"]["network"]["interface_driver"].split('.').last.downcase
 main_plugin = node["openstack"]["network"]["interface_driver_map"][driver_name]
 
-platform_options["quantum_l3_packages"].each do |pkg|
+platform_options["neutron_l3_packages"].each do |pkg|
   package pkg do
     options platform_options["package_overrides"]
     action :install
@@ -34,30 +34,30 @@ platform_options["quantum_l3_packages"].each do |pkg|
   end
 end
 
-service "quantum-l3-agent" do
-  service_name platform_options["quantum_l3_agent_service"]
+service "neutron-l3-agent" do
+  service_name platform_options["neutron_l3_agent_service"]
   supports :status => true, :restart => true
 
   action :enable
 end
 
-execute "quantum-l3-setup --plugin #{main_plugin}" do
+execute "neutron-l3-setup --plugin #{main_plugin}" do
   only_if {
     platform?(%w(fedora redhat centos)) and not # :pragma-foodcritic: ~FC024 - won't fix this
     ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
   }
 end
 
-template "/etc/quantum/l3_agent.ini" do
+template "/etc/neutron/l3_agent.ini" do
   source "l3_agent.ini.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
   mode   00644
-  notifies :restart, "service[quantum-l3-agent]", :immediately
+  notifies :restart, "service[neutron-l3-agent]", :immediately
 end
 
 if not ["nicira", "plumgrid", "bigswitch", "linuxbridge"].include?(main_plugin)
-  # See http://docs.openstack.org/trunk/openstack-network/admin/content/install_quantum-l3.html
+  # See http://docs.openstack.org/trunk/openstack-network/admin/content/install_neutron-l3.html
   ext_bridge = node["openstack"]["network"]["l3"]["external_network_bridge"]
   ext_bridge_iface = node["openstack"]["network"]["l3"]["external_network_bridge_interface"]
   execute "create external network bridge" do
diff --git a/recipes/linuxbridge.rb b/recipes/linuxbridge.rb
index 5ec5c863..1e3bfacb 100644
--- a/recipes/linuxbridge.rb
+++ b/recipes/linuxbridge.rb
@@ -23,15 +23,15 @@ include_recipe "openstack-network::common"
 
 platform_options = node["openstack"]["network"]["platform"]
 
-platform_options["quantum_linuxbridge_agent_packages"].each do |pkg|
+platform_options["neutron_linuxbridge_agent_packages"].each do |pkg|
   package pkg do
     options platform_options["package_overrides"]
     action :install
   end
 end
 
-service "quantum-plugin-linuxbridge-agent" do
-  service_name platform_options["quantum_linuxbridge_agent_service"]
+service "neutron-plugin-linuxbridge-agent" do
+  service_name platform_options["neutron_linuxbridge_agent_service"]
   supports :status => true, :restart => true
   action :enable
 end
diff --git a/recipes/metadata_agent.rb b/recipes/metadata_agent.rb
index 38a3063b..90ceaa62 100644
--- a/recipes/metadata_agent.rb
+++ b/recipes/metadata_agent.rb
@@ -29,7 +29,7 @@ identity_endpoint = endpoint "identity-api"
 service_pass = service_password "openstack-network"
 metadata_secret = secret "secrets", node["openstack"]["network"]["metadata"]["secret_name"]
 
-template "/etc/quantum/metadata_agent.ini" do
+template "/etc/neutron/metadata_agent.ini" do
   source "metadata_agent.ini.erb"
   owner node["openstack"]["network"]["platform"]["user"]
   group node["openstack"]["network"]["platform"]["group"]
@@ -39,19 +39,19 @@ template "/etc/quantum/metadata_agent.ini" do
     :metadata_secret => metadata_secret,
     :service_pass => service_pass
   )
-  notifies :restart, "service[quantum-metadata-agent]", :immediately
+  notifies :restart, "service[neutron-metadata-agent]", :immediately
   action :create
 end
 
-platform_options["quantum_metadata_agent_packages"].each do |pkg|
+platform_options["neutron_metadata_agent_packages"].each do |pkg|
   package pkg do
     action :install
     options platform_options["package_overrides"]
   end
 end
 
-service "quantum-metadata-agent" do
-  service_name platform_options["quantum_metadata_agent_service"]
+service "neutron-metadata-agent" do
+  service_name platform_options["neutron_metadata_agent_service"]
   supports :status => true, :restart => true
   action :enable
 end
diff --git a/recipes/openvswitch.rb b/recipes/openvswitch.rb
index bf515686..20694e1c 100644
--- a/recipes/openvswitch.rb
+++ b/recipes/openvswitch.rb
@@ -49,41 +49,41 @@ if node['openstack']['network']['openvswitch']['use_source_version']
     include_recipe "openstack-network::build_openvswitch_source"
   end
 else
-  platform_options["quantum_openvswitch_packages"].each do |pkg|
+  platform_options["neutron_openvswitch_packages"].each do |pkg|
     package pkg do
       action :install
     end
   end
 end
 
-service "quantum-openvswitch-switch" do
-  service_name platform_options["quantum_openvswitch_service"]
+service "neutron-openvswitch-switch" do
+  service_name platform_options["neutron_openvswitch_service"]
   supports :status => true, :restart => true
   action :enable
 end
 
 if node.run_list.expand(node.chef_environment).recipes.include?("openstack-network::server")
-  service "quantum-server" do
-    service_name platform_options["quantum_server_service"]
+  service "neutron-server" do
+    service_name platform_options["neutron_server_service"]
     supports :status => true, :restart => true
     action :nothing
   end
 end
 
-platform_options["quantum_openvswitch_agent_packages"].each do |pkg|
+platform_options["neutron_openvswitch_agent_packages"].each do |pkg|
   package pkg do
     action :install
     options platform_options["package_overrides"]
   end
 end
 
-service "quantum-plugin-openvswitch-agent" do
-  service_name platform_options["quantum_openvswitch_agent_service"]
+service "neutron-plugin-openvswitch-agent" do
+  service_name platform_options["neutron_openvswitch_agent_service"]
   supports :status => true, :restart => true
   action :enable
 end
 
-execute "quantum-node-setup --plugin openvswitch" do
+execute "neutron-node-setup --plugin openvswitch" do
   only_if { platform?(%w(fedora redhat centos)) } # :pragma-foodcritic: ~FC024 - won't fix this
 end
 
@@ -94,7 +94,7 @@ if not ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
     command "ovs-vsctl add-br #{int_bridge}"
     action :run
     not_if "ovs-vsctl show | grep 'Bridge #{int_bridge}'"
-    notifies :restart, "service[quantum-plugin-openvswitch-agent]", :delayed
+    notifies :restart, "service[neutron-plugin-openvswitch-agent]", :delayed
   end
 end
 
@@ -105,7 +105,7 @@ if not ["nicira", "plumgrid", "bigswitch"].include?(main_plugin)
     command "ovs-vsctl add-br #{tun_bridge}"
     action :run
     not_if "ovs-vsctl show | grep 'Bridge #{tun_bridge}'"
-    notifies :restart, "service[quantum-plugin-openvswitch-agent]", :delayed
+    notifies :restart, "service[neutron-plugin-openvswitch-agent]", :delayed
   end
 end
 
diff --git a/recipes/server.rb b/recipes/server.rb
index bc474e92..01fba046 100644
--- a/recipes/server.rb
+++ b/recipes/server.rb
@@ -33,28 +33,28 @@ core_plugin = node["openstack"]["network"]["core_plugin"]
 
 platform_options = node["openstack"]["network"]["platform"]
 
-platform_options["quantum_server_packages"].each do |pkg|
+platform_options["neutron_server_packages"].each do |pkg|
   package pkg do
     options platform_options["package_overrides"]
     action :install
   end
 end
 
-service "quantum-server" do
-  service_name platform_options["quantum_server_service"]
+service "neutron-server" do
+  service_name platform_options["neutron_server_service"]
   supports :status => true, :restart => true
   action :enable
 end
 
-cookbook_file "quantum-ha-tool" do
-  source "quantum-ha-tool.py"
-  path node["openstack"]["network"]["quantum_ha_cmd"]
+cookbook_file "neutron-ha-tool" do
+  source "neutron-ha-tool.py"
+  path node["openstack"]["network"]["neutron_ha_cmd"]
   owner "root"
   group "root"
   mode 00755
 end
 
-if node["openstack"]["network"]["quantum_ha_cmd_cron"]
+if node["openstack"]["network"]["neutron_ha_cmd_cron"]
   # ensure period checks are offset between multiple l3 agent nodes
   # and assumes splay will remain constant (i.e. based on hostname)
   # Generate a uniformly distributed unique number to sleep.
@@ -62,27 +62,27 @@ if node["openstack"]["network"]["quantum_ha_cmd_cron"]
   splay = node['chef_client']['splay'].to_i || 3000
   sleep_time = checksum.to_s.hex % splay
 
-  cron "quantum-ha-healthcheck" do
+  cron "neutron-ha-healthcheck" do
     minute node["openstack"]["network"]["cron_l3_healthcheck"]
-    command "sleep #{sleep_time} ; . /root/openrc && #{node["openstack"]["network"]["quantum_ha_cmd"]} --l3-agent-migrate > /dev/null 2>&1"
+    command "sleep #{sleep_time} ; . /root/openrc && #{node["openstack"]["network"]["neutron_ha_cmd"]} --l3-agent-migrate > /dev/null 2>&1"
   end
 
-  cron "quantum-ha-replicate-dhcp" do
+  cron "neutron-ha-replicate-dhcp" do
     minute node["openstack"]["network"]["cron_replicate_dhcp"]
-    command "sleep #{sleep_time} ; . /root/openrc && #{node["openstack"]["network"]["quantum_ha_cmd"]} --replicate-dhcp > /dev/null 2>&1"
+    command "sleep #{sleep_time} ; . /root/openrc && #{node["openstack"]["network"]["neutron_ha_cmd"]} --replicate-dhcp > /dev/null 2>&1"
   end
 end
 
 # the default SUSE initfile uses this sysconfig file to determine the
-# quantum plugin to use
-template "/etc/sysconfig/quantum" do
+# neutron plugin to use
+template "/etc/sysconfig/neutron" do
   only_if { platform? "suse" }
-  source "quantum.sysconfig.erb"
+  source "neutron.sysconfig.erb"
   owner "root"
   group "root"
   mode 00644
   variables(
     :plugin_conf => node["openstack"]["network"]["plugin_conf_map"][driver_name]
   )
-  notifies :restart, "service[quantum-server]"
+  notifies :restart, "service[neutron-server]"
 end
diff --git a/spec/balancer_spec.rb b/spec/balancer_spec.rb
index 3d9dd5c6..6fe1edc0 100644
--- a/spec/balancer_spec.rb
+++ b/spec/balancer_spec.rb
@@ -5,36 +5,36 @@ describe 'openstack-network::balancer' do
   describe "ubuntu" do
 
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::balancer"
     end
 
-    it "does not install quantum-lbaas-agent when nova networking." do
+    it "does not install neutron-lbaas-agent when nova networking." do
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       node = @chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       @chef_run.converge "openstack-network::balancer"
-      expect(@chef_run).to_not install_package "quantum-lbaas-agent"
+      expect(@chef_run).to_not install_package "neutron-lbaas-agent"
     end
 
-    ['haproxy', 'quantum-lbaas-agent'].each do |pack|
+    ['haproxy', 'neutron-lbaas-agent'].each do |pack|
       it "installs #{pack} package" do
         expect(@chef_run).to install_package pack
       end
     end
 
-    it 'creates directory /etc/quantum/plugins/services/agent_loadbalancer' do
-      expect(@chef_run).to create_directory '/etc/quantum/plugins/services/agent_loadbalancer'
+    it 'creates directory /etc/neutron/plugins/services/agent_loadbalancer' do
+      expect(@chef_run).to create_directory '/etc/neutron/plugins/services/agent_loadbalancer'
     end
 
     it 'balancer config' do
-      configf = "/etc/quantum/plugins/services/agent_loadbalancer/lbaas_agent.ini"
+      configf = "/etc/neutron/plugins/services/agent_loadbalancer/lbaas_agent.ini"
       expect(@chef_run).to create_file configf
       expect(@chef_run).to create_file_with_content configf, /periodic_interval = 10/
-      expect(@chef_run).to create_file_with_content configf, /interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver/
+      expect(@chef_run).to create_file_with_content configf, /interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver/
     end
 
   end
diff --git a/spec/build_openvswitch_source_spec.rb b/spec/build_openvswitch_source_spec.rb
index a0a68efc..4a05f376 100644
--- a/spec/build_openvswitch_source_spec.rb
+++ b/spec/build_openvswitch_source_spec.rb
@@ -2,9 +2,9 @@ require_relative 'spec_helper'
 
 describe "openvswitch::build_openvswitch_source" do
   before do
-    quantum_stubs
+    neutron_stubs
     @chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
     @chef_run.converge "openstack-network::openvswitch"
     @chef_run.converge "openstack-network::build_openvswitch_source"
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index 7901f750..d8972292 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -3,23 +3,23 @@ require_relative 'spec_helper'
 describe "openstack-network::common" do
   describe "ubuntu" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::common"
     end
 
-    it "does not install python-quantumclient when nova networking" do
+    it "does not install python-neutronclient when nova networking" do
       chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::common"
-      expect(chef_run).to_not install_package "python-quantumclient"
+      expect(chef_run).to_not install_package "python-neutronclient"
     end
 
-    it "upgrades python quantumclient" do
-      expect(@chef_run).to upgrade_package "python-quantumclient"
+    it "upgrades python neutronclient" do
+      expect(@chef_run).to upgrade_package "python-neutronclient"
     end
 
     it "upgrades python pyparsing" do
diff --git a/spec/dhcp_agent-opensuse_spec.rb b/spec/dhcp_agent-opensuse_spec.rb
index 58a0da52..ecbb122b 100644
--- a/spec/dhcp_agent-opensuse_spec.rb
+++ b/spec/dhcp_agent-opensuse_spec.rb
@@ -5,23 +5,23 @@ describe 'openstack-network::dhcp_agent' do
   describe "opensuse" do
 
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::dhcp_agent"
     end
 
-    it "does not install openstack-quantum-dhcp-agent when nova networking" do
+    it "does not install openstack-neutron-dhcp-agent when nova networking" do
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       node = @chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       @chef_run.converge "openstack-network::dhcp_agent"
-      expect(@chef_run).to_not install_package "openstack-quantum-dhcp-agent"
+      expect(@chef_run).to_not install_package "openstack-neutron-dhcp-agent"
     end
 
     it "installs quamtum dhcp package" do
-      expect(@chef_run).to install_package "openstack-quantum-dhcp-agent"
+      expect(@chef_run).to install_package "openstack-neutron-dhcp-agent"
     end
 
     it "installs plugin packages" do
@@ -31,17 +31,17 @@ describe 'openstack-network::dhcp_agent' do
 
     it "starts the dhcp agent on boot" do
       expect(@chef_run).to(
-        set_service_to_start_on_boot "openstack-quantum-dhcp-agent")
+        set_service_to_start_on_boot "openstack-neutron-dhcp-agent")
     end
 
-    it "/etc/quantum/dhcp_agent.ini has the proper owner" do
-      expect(@chef_run.template "/etc/quantum/dhcp_agent.ini").to(
-        be_owned_by "openstack-quantum", "openstack-quantum")
+    it "/etc/neutron/dhcp_agent.ini has the proper owner" do
+      expect(@chef_run.template "/etc/neutron/dhcp_agent.ini").to(
+        be_owned_by "openstack-neutron", "openstack-neutron")
     end
 
-    it "/etc/quantum/dnsmasq.conf has the proper owner" do
-      expect(@chef_run.template "/etc/quantum/dnsmasq.conf").to(
-        be_owned_by "openstack-quantum", "openstack-quantum")
+    it "/etc/neutron/dnsmasq.conf has the proper owner" do
+      expect(@chef_run.template "/etc/neutron/dnsmasq.conf").to(
+        be_owned_by "openstack-neutron", "openstack-neutron")
     end
   end
 end
diff --git a/spec/dhcp_agent_spec.rb b/spec/dhcp_agent_spec.rb
index 01ce63f5..c8119a25 100644
--- a/spec/dhcp_agent_spec.rb
+++ b/spec/dhcp_agent_spec.rb
@@ -5,9 +5,9 @@ describe 'openstack-network::dhcp_agent' do
   describe "ubuntu" do
 
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::dhcp_agent"
     end
@@ -29,42 +29,42 @@ describe 'openstack-network::dhcp_agent' do
     end
 
     it "installs quamtum dhcp package" do
-      expect(@chef_run).to install_package "quantum-dhcp-agent"
+      expect(@chef_run).to install_package "neutron-dhcp-agent"
     end
 
     it "installs plugin packages" do
-      expect(@chef_run).to install_package "quantum-plugin-openvswitch"
+      expect(@chef_run).to install_package "neutron-plugin-openvswitch"
     end
 
     it "starts the dhcp agent on boot" do
-      expect(@chef_run).to set_service_to_start_on_boot "quantum-dhcp-agent"
+      expect(@chef_run).to set_service_to_start_on_boot "neutron-dhcp-agent"
     end
 
-    describe "/etc/quantum/plugins" do
+    describe "/etc/neutron/plugins" do
       before do
-        @file = @chef_run.directory "/etc/quantum/plugins"
+        @file = @chef_run.directory "/etc/neutron/plugins"
       end
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
       it "has proper modes" do
         expect(sprintf("%o", @file.mode)).to eq "700"
       end
     end
 
-    describe "/etc/quantum/dhcp_agent.ini" do
+    describe "/etc/neutron/dhcp_agent.ini" do
       before do
-        @file = @chef_run.template "/etc/quantum/dhcp_agent.ini"
+        @file = @chef_run.template "/etc/neutron/dhcp_agent.ini"
       end
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
       it "has proper modes" do
         expect(sprintf("%o", @file.mode)).to eq "644"
       end
       it "uses ovs driver" do
         expect(@chef_run).to create_file_with_content @file.name,
-          "interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver"
+          "interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver"
       end
       it "uses namespaces" do
         expect(@chef_run).to create_file_with_content @file.name,
@@ -76,12 +76,12 @@ describe 'openstack-network::dhcp_agent' do
       end
     end
 
-    describe "/etc/quantum/dnsmasq.conf" do
+    describe "/etc/neutron/dnsmasq.conf" do
       before do
-        @file = @chef_run.template "/etc/quantum/dnsmasq.conf"
+        @file = @chef_run.template "/etc/neutron/dnsmasq.conf"
       end
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
       it "has proper modes" do
         expect(sprintf("%o", @file.mode)).to eq "644"
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 8bab7fdb..ca169efe 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -2,9 +2,9 @@ require_relative "spec_helper"
 
 describe "openstack-network::identity_registration" do
   before do
-    quantum_stubs
+    neutron_stubs
     @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
     @chef_run.converge "openstack-network::identity_registration"
   end
@@ -74,15 +74,15 @@ describe "openstack-network::identity_registration" do
   it "registers service user" do
     resource = @chef_run.find_resource(
       "openstack-identity_register",
-      "Register quantum User"
+      "Register neutron User"
     ).to_hash
 
     expect(resource).to include(
       :auth_uri => "http://127.0.0.1:35357/v2.0",
       :bootstrap_token => "bootstrap-token",
       :tenant_name => "service",
-      :user_name => "quantum",
-      :user_pass => "quantum-pass",
+      :user_name => "neutron",
+      :user_pass => "neutron-pass",
       :action => [:create_user]
     )
   end
@@ -90,7 +90,7 @@ describe "openstack-network::identity_registration" do
   it "grants admin role to service user for service tenant" do
     resource = @chef_run.find_resource(
       "openstack-identity_register",
-      "Grant 'admin' Role to quantum User for service Tenant"
+      "Grant 'admin' Role to neutron User for service Tenant"
     ).to_hash
 
     expect(resource).to include(
@@ -98,7 +98,7 @@ describe "openstack-network::identity_registration" do
       :bootstrap_token => "bootstrap-token",
       :tenant_name => "service",
       :role_name => "admin",
-      :user_name => "quantum",
+      :user_name => "neutron",
       :action => [:grant_role]
     )
   end
diff --git a/spec/l3_agent_spec.rb b/spec/l3_agent_spec.rb
index c431192b..b0206334 100644
--- a/spec/l3_agent_spec.rb
+++ b/spec/l3_agent_spec.rb
@@ -5,33 +5,33 @@ describe 'openstack-network::l3_agent' do
   describe "ubuntu" do
 
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::l3_agent"
     end
 
-    it "does not install quantum l3 package when nova networking" do
+    it "does not install neutron l3 package when nova networking" do
       chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::l3_agent"
-      expect(chef_run).to_not install_package "quantum-l3-agent"
+      expect(chef_run).to_not install_package "neutron-l3-agent"
     end
 
     it "installs quamtum l3 package" do
-      expect(@chef_run).to install_package "quantum-l3-agent"
+      expect(@chef_run).to install_package "neutron-l3-agent"
     end
 
     describe "l3_agent.ini" do
 
       before do
-        @file = @chef_run.template "/etc/quantum/l3_agent.ini"
+        @file = @chef_run.template "/etc/neutron/l3_agent.ini"
       end
 
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
 
       it "has proper modes" do
@@ -40,7 +40,7 @@ describe 'openstack-network::l3_agent' do
 
       it "it has ovs driver" do
         expect(@chef_run).to create_file_with_content @file.name,
-          "interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver"
+          "interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver"
       end
 
       it "sets fuzzy delay to default" do
@@ -61,10 +61,10 @@ describe 'openstack-network::l3_agent' do
 
     describe "create ovs bridges" do
       before do
-        quantum_stubs
+        neutron_stubs
         opts = ::UBUNTU_OPTS.merge(:evaluate_guards => true)
         @chef_run = ::ChefSpec::ChefRunner.new opts do |n|
-          n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+          n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
         end
       end
 
diff --git a/spec/linuxbridge-opensuse_spec.rb b/spec/linuxbridge-opensuse_spec.rb
index 717fcf6b..b5988e42 100644
--- a/spec/linuxbridge-opensuse_spec.rb
+++ b/spec/linuxbridge-opensuse_spec.rb
@@ -4,10 +4,10 @@ describe 'openstack-network::linuxbridge' do
 
   describe "opensuse" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
-        n.set["openstack"]["network"]["interface_driver"] = "quantum.agent.linux.interface.BridgeInterfaceDriver"
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["network"]["interface_driver"] = "neutron.agent.linux.interface.BridgeInterfaceDriver"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::linuxbridge"
     end
@@ -17,15 +17,15 @@ describe 'openstack-network::linuxbridge' do
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::linuxbridge"
-      expect(chef_run).to_not install_package "openstack-quantum-linuxbridge-agent"
+      expect(chef_run).to_not install_package "openstack-neutron-linuxbridge-agent"
     end
 
     it "installs linuxbridge agent" do
-      expect(@chef_run).to install_package "openstack-quantum-linuxbridge-agent"
+      expect(@chef_run).to install_package "openstack-neutron-linuxbridge-agent"
     end
 
     it "sets the linuxbridge service to start on boot" do
-      expect(@chef_run).to set_service_to_start_on_boot "openstack-quantum-linuxbridge-agent"
+      expect(@chef_run).to set_service_to_start_on_boot "openstack-neutron-linuxbridge-agent"
     end
 
   end
diff --git a/spec/linuxbridge-redhat_spec.rb b/spec/linuxbridge-redhat_spec.rb
index 54cf8a3a..21f138f6 100644
--- a/spec/linuxbridge-redhat_spec.rb
+++ b/spec/linuxbridge-redhat_spec.rb
@@ -4,10 +4,10 @@ describe 'openstack-network::linuxbridge' do
 
   describe "redhat" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS do |n|
-        n.set["openstack"]["network"]["interface_driver"] = "quantum.agent.linux.interface.BridgeInterfaceDriver"
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["network"]["interface_driver"] = "neutron.agent.linux.interface.BridgeInterfaceDriver"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::linuxbridge"
     end
@@ -17,15 +17,15 @@ describe 'openstack-network::linuxbridge' do
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::linuxbridge"
-      expect(chef_run).to_not install_package "openstack-quantum-linuxbridge"
+      expect(chef_run).to_not install_package "openstack-neutron-linuxbridge"
     end
 
     it "installs linuxbridge agent" do
-      expect(@chef_run).to install_package "openstack-quantum-linuxbridge"
+      expect(@chef_run).to install_package "openstack-neutron-linuxbridge"
     end
 
     it "sets the linuxbridge service to start on boot" do
-      expect(@chef_run).to set_service_to_start_on_boot "quantum-linuxbridge-agent"
+      expect(@chef_run).to set_service_to_start_on_boot "neutron-linuxbridge-agent"
     end
 
   end
diff --git a/spec/linuxbridge_spec.rb b/spec/linuxbridge_spec.rb
index 1a6b720e..53c29246 100644
--- a/spec/linuxbridge_spec.rb
+++ b/spec/linuxbridge_spec.rb
@@ -4,10 +4,11 @@ describe 'openstack-network::linuxbridge' do
 
   describe "ubuntu" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["network"]["interface_driver"] = "quantum.agent.linux.interface.BridgeInterfaceDriver"
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["network"]["interface_driver"] = "neutron.agent.linux.interface.BridgeInterfaceDriver"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
+        n.set["openstack"]["db"]["network"]["db_name"] = "neutron"
       end
       @chef_run.converge "openstack-network::linuxbridge"
     end
@@ -17,25 +18,25 @@ describe 'openstack-network::linuxbridge' do
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::linuxbridge"
-      expect(chef_run).to_not install_package "quantum-plugin-linuxbridge-agent"
+      expect(chef_run).to_not install_package "neutron-plugin-linuxbridge-agent"
     end
 
     it "installs linuxbridge agent" do
-      expect(@chef_run).to install_package "quantum-plugin-linuxbridge-agent"
+      expect(@chef_run).to install_package "neutron-plugin-linuxbridge-agent"
     end
 
     it "sets the linuxbridge service to start on boot" do
-      expect(@chef_run).to set_service_to_start_on_boot "quantum-plugin-linuxbridge-agent"
+      expect(@chef_run).to set_service_to_start_on_boot "neutron-plugin-linuxbridge-agent"
     end
 
-    describe "/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini" do
+    describe "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" do
       before do
         @file = @chef_run.template(
-          "/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini")
+          "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
       end
 
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
 
       it "has proper modes" do
@@ -44,7 +45,7 @@ describe 'openstack-network::linuxbridge' do
 
       it "has a correct sql_connection value" do
         expect(@chef_run).to create_file_with_content(
-          @file.name, "mysql://quantum:quantum-pass@127.0.0.1:3306/quantum")
+          @file.name, "mysql://neutron:neutron-pass@127.0.0.1:3306/neutron")
       end
 
       it "sets sqlalchemy attributes" do
diff --git a/spec/metadata_agent_spec.rb b/spec/metadata_agent_spec.rb
index c0c9eda9..cf965c51 100644
--- a/spec/metadata_agent_spec.rb
+++ b/spec/metadata_agent_spec.rb
@@ -5,9 +5,9 @@ describe 'openstack-network::metadata_agent' do
   describe "ubuntu" do
 
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @chef_run.converge "openstack-network::metadata_agent"
     end
@@ -17,21 +17,21 @@ describe 'openstack-network::metadata_agent' do
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::metadata_agent"
-      expect(chef_run).to_not install_package "quantum-metadata-agent"
+      expect(chef_run).to_not install_package "neutron-metadata-agent"
     end
 
     it "installs quamtum metadata agent" do
-      expect(@chef_run).to install_package "quantum-metadata-agent"
+      expect(@chef_run).to install_package "neutron-metadata-agent"
     end
 
     describe "metadata_agent.ini" do
 
       before do
-       @file = @chef_run.template "/etc/quantum/metadata_agent.ini"
+       @file = @chef_run.template "/etc/neutron/metadata_agent.ini"
       end
 
       it "has proper owner" do
-        expect(@file).to be_owned_by "quantum", "quantum"
+        expect(@file).to be_owned_by "neutron", "neutron"
       end
 
       it "has proper modes" do
@@ -52,11 +52,11 @@ describe 'openstack-network::metadata_agent' do
       end
       it "sets admin user" do
         expect(@chef_run).to create_file_with_content @file.name,
-          "admin_user = quantum"
+          "admin_user = neutron"
       end
       it "sets admin password" do
         expect(@chef_run).to create_file_with_content @file.name,
-          "admin_password = quantum-pass"
+          "admin_password = neutron-pass"
       end
       it "sets nova metadata ip correctly" do
         expect(@chef_run).to create_file_with_content @file.name,
@@ -66,7 +66,7 @@ describe 'openstack-network::metadata_agent' do
         expect(@chef_run).to create_file_with_content @file.name,
           "nova_metadata_port = 8775"
       end
-      it "sets quantum secret correctly" do
+      it "sets neutron secret correctly" do
         expect(@chef_run).to create_file_with_content @file.name,
           "metadata_proxy_shared_secret = metadata-secret"
       end
diff --git a/spec/openvswitch-opensuse_spec.rb b/spec/openvswitch-opensuse_spec.rb
index a52b5651..842dfe93 100644
--- a/spec/openvswitch-opensuse_spec.rb
+++ b/spec/openvswitch-opensuse_spec.rb
@@ -3,10 +3,10 @@ require_relative "spec_helper"
 describe 'openstack-network::openvswitch' do
   describe "opensuse" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
         n.set["chef_client"]["splay"] = 300
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @node = @chef_run.node
       @chef_run.converge "openstack-network::openvswitch"
@@ -25,7 +25,7 @@ describe 'openstack-network::openvswitch' do
     end
 
     it "installs the openvswitch-agent package" do
-      expect(@chef_run).to install_package "openstack-quantum-openvswitch-agent"
+      expect(@chef_run).to install_package "openstack-neutron-openvswitch-agent"
     end
 
     it "starts the openvswitch-switch service" do
diff --git a/spec/openvswitch_spec.rb b/spec/openvswitch_spec.rb
index 4c6443bb..4c02ca8a 100644
--- a/spec/openvswitch_spec.rb
+++ b/spec/openvswitch_spec.rb
@@ -2,11 +2,11 @@ require_relative 'spec_helper'
 
 describe 'openstack-network::openvswitch' do
   before do
-    quantum_stubs
+    neutron_stubs
     @chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
       n.automatic_attrs["kernel"]["release"] = "1.2.3"
       n.set["openstack"]["network"]["local_ip_interface"] = "eth0"
-      n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+      n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
     end
     @chef_run.converge "openstack-network::openvswitch"
   end
@@ -40,11 +40,11 @@ describe 'openstack-network::openvswitch' do
   end
 
   it "installs openvswitch agent" do
-    expect(@chef_run).to install_package "quantum-plugin-openvswitch-agent"
+    expect(@chef_run).to install_package "neutron-plugin-openvswitch-agent"
   end
 
   it "sets the openvswitch service to start on boot" do
-    expect(@chef_run).to set_service_to_start_on_boot "quantum-plugin-openvswitch-agent"
+    expect(@chef_run).to set_service_to_start_on_boot "neutron-plugin-openvswitch-agent"
   end
 
   describe "ovs-dpctl-top" do
@@ -70,13 +70,13 @@ describe 'openstack-network::openvswitch' do
     end
   end
 
-  describe "ovs_quantum_plugin.ini" do
+  describe "ovs_neutron_plugin.ini" do
     before do
-      @file = @chef_run.template "/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini"
+      @file = @chef_run.template "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
     end
 
     it "has proper owner" do
-      expect(@file).to be_owned_by "quantum", "quantum"
+      expect(@file).to be_owned_by "neutron", "neutron"
     end
 
     it "has proper modes" do
@@ -115,7 +115,7 @@ describe 'openstack-network::openvswitch' do
 
     it "it has firewall driver" do
       expect(@chef_run).to create_file_with_content @file.name,
-        "firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
+        "firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver"
     end
 
     it "it uses local_ip from eth0 when local_ip_interface is set" do
diff --git a/spec/server-opensuse_spec.rb b/spec/server-opensuse_spec.rb
index 49768dcc..6bc1b68f 100644
--- a/spec/server-opensuse_spec.rb
+++ b/spec/server-opensuse_spec.rb
@@ -3,45 +3,45 @@ require_relative "spec_helper"
 describe 'openstack-network::server' do
   describe "opensuse" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
         n.set["chef_client"]["splay"] = 300
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @node = @chef_run.node
       @chef_run.converge "openstack-network::server"
     end
 
-  it "does not install openstack-quantum when nova networking" do
+  it "does not install openstack-neutron when nova networking" do
     chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
     node = chef_run.node
     node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
     chef_run.converge "openstack-network::server"
-    expect(chef_run).to_not install_package "openstack-quantum"
+    expect(chef_run).to_not install_package "openstack-neutron"
   end
 
-    it "installs openstack-quantum packages" do
-      expect(@chef_run).to install_package "openstack-quantum"
+    it "installs openstack-neutron packages" do
+      expect(@chef_run).to install_package "openstack-neutron"
     end
 
-    it "enables openstack-quantum service" do
-      expect(@chef_run).to enable_service "openstack-quantum"
+    it "enables openstack-neutron service" do
+      expect(@chef_run).to enable_service "openstack-neutron"
     end
 
     it "does not install openvswitch package" do
       opts = ::OPENSUSE_OPTS.merge(:evaluate_guards => true)
       chef_run = ::ChefSpec::ChefRunner.new opts do |n|
         n.set["chef_client"]["splay"] = 300
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       chef_run.converge "openstack-network::server"
 
-      expect(chef_run).not_to install_package "openstack-quantum-openvswitch"
+      expect(chef_run).not_to install_package "openstack-neutron-openvswitch"
     end
 
-    describe "/etc/sysconfig/quantum" do
+    describe "/etc/sysconfig/neutron" do
       before do
-        @file = @chef_run.template("/etc/sysconfig/quantum")
+        @file = @chef_run.template("/etc/sysconfig/neutron")
       end
 
       it "has proper owner" do
@@ -54,19 +54,19 @@ describe 'openstack-network::server' do
 
       it "has the correct plugin config location - ovs by default" do
         expect(@chef_run).to create_file_with_content(
-          @file.name, "/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini")
+          @file.name, "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
       end
 
       it "uses linuxbridge when configured to use it" do
         chef_run = ::ChefSpec::ChefRunner.new ::OPENSUSE_OPTS do |n|
-          n.set["openstack"]["network"]["interface_driver"] = "quantum.agent.linux.interface.BridgeInterfaceDriver"
-          n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+          n.set["openstack"]["network"]["interface_driver"] = "neutron.agent.linux.interface.BridgeInterfaceDriver"
+          n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
         end
         chef_run.converge "openstack-network::server"
 
         expect(chef_run).to create_file_with_content(
-          "/etc/sysconfig/quantum",
-          "/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini"
+          "/etc/sysconfig/neutron",
+          "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini"
           )
       end
     end
diff --git a/spec/server-redhat_spec.rb b/spec/server-redhat_spec.rb
index a1e1d5cc..0f6f1336 100644
--- a/spec/server-redhat_spec.rb
+++ b/spec/server-redhat_spec.rb
@@ -3,38 +3,38 @@ require_relative "spec_helper"
 describe 'openstack-network::server' do
   describe "redhat" do
     before do
-      quantum_stubs
+      neutron_stubs
       @chef_run = ::ChefSpec::ChefRunner.new ::REDHAT_OPTS do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       @node = @chef_run.node
       @chef_run.converge "openstack-network::server"
     end
 
-    it "does not install openstack-quantum when nova networking" do
+    it "does not install openstack-neutron when nova networking" do
       chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
       node = chef_run.node
       node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
       chef_run.converge "openstack-network::server"
-      expect(chef_run).to_not install_package "openstack-quantum"
+      expect(chef_run).to_not install_package "openstack-neutron"
     end
 
-    it "installs openstack-quantum packages" do
-      expect(@chef_run).to install_package "openstack-quantum"
+    it "installs openstack-neutron packages" do
+      expect(@chef_run).to install_package "openstack-neutron"
     end
 
-    it "enables openstack-quantum server service" do
-      expect(@chef_run).to enable_service "quantum-server"
+    it "enables openstack-neutron server service" do
+      expect(@chef_run).to enable_service "neutron-server"
     end
 
     it "does not install openvswitch package" do
       opts = ::REDHAT_OPTS.merge(:evaluate_guards => true)
       chef_run = ::ChefSpec::ChefRunner.new opts do |n|
-        n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+        n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       end
       chef_run.converge "openstack-network::server"
       expect(chef_run).not_to install_package "openvswitch"
-      expect(chef_run).not_to enable_service "openstack-quantum-openvswitch-agent"
+      expect(chef_run).not_to enable_service "openstack-neutron-openvswitch-agent"
     end
   end
 end
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index ea6aa991..be17def2 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -2,9 +2,9 @@ require_relative 'spec_helper'
 
 describe 'openstack-network::server' do
   before do
-    quantum_stubs
+    neutron_stubs
     @chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS do |n|
-      n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+      n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
       n.set["openstack"]["mq"]["host"] = "127.0.0.1"
       n.set["chef_client"]["splay"] = 300
       n.set["openstack"]["network"]["quota"]["driver"] = "my.quota.Driver"
@@ -12,28 +12,28 @@ describe 'openstack-network::server' do
     @chef_run.converge "openstack-network::server"
   end
 
-  it "does not install quantum-server when nova networking" do
+  it "does not install neutron-server when nova networking" do
     chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
     node = chef_run.node
     node.set["openstack"]["compute"]["network"]["service_type"] = "nova"
     chef_run.converge "openstack-network::server"
-    expect(chef_run).to_not install_package "quantum-server"
+    expect(chef_run).to_not install_package "neutron-server"
   end
 
   describe "package and services" do
 
-    it "installs quantum packages" do
-      expect(@chef_run).to install_package "quantum-server"
+    it "installs neutron packages" do
+      expect(@chef_run).to install_package "neutron-server"
     end
 
     it "starts server service" do
-      expect(@chef_run).to enable_service "quantum-server"
+      expect(@chef_run).to enable_service "neutron-server"
     end
 
     it "does not install openvswitch package or the agent" do
       expect(@chef_run).not_to install_package "openvswitch"
-      expect(@chef_run).not_to install_package "quantum-plugin-openvswitch-agent"
-      expect(@chef_run).not_to enable_service "quantum-plugin-openvswitch-agent"
+      expect(@chef_run).not_to install_package "neutron-plugin-openvswitch-agent"
+      expect(@chef_run).not_to enable_service "neutron-plugin-openvswitch-agent"
     end
 
   end
@@ -41,20 +41,20 @@ describe 'openstack-network::server' do
   describe "api-paste.ini" do
 
     before do
-     @file = @chef_run.template "/etc/quantum/api-paste.ini"
+     @file = @chef_run.template "/etc/neutron/api-paste.ini"
     end
 
     it "has proper owner" do
-      expect(@file).to be_owned_by "quantum", "quantum"
+      expect(@file).to be_owned_by "neutron", "neutron"
     end
 
     it "has proper modes" do
      expect(sprintf("%o", @file.mode)).to eq "640"
     end
 
-    it "has quantum pass" do
+    it "has neutron pass" do
       expect(@chef_run).to create_file_with_content @file.name,
-        "admin_password = quantum-pass"
+        "admin_password = neutron-pass"
     end
 
     it "has auth_uri" do
@@ -78,18 +78,18 @@ describe 'openstack-network::server' do
     end
   end
 
-  it "should create quantum-ha-tool.py script" do
-    expect(@chef_run).to create_cookbook_file "/usr/local/bin/quantum-ha-tool.py"
+  it "should create neutron-ha-tool.py script" do
+    expect(@chef_run).to create_cookbook_file "/usr/local/bin/neutron-ha-tool.py"
   end
 
-  describe "quantum.conf" do
+  describe "neutron.conf" do
 
     before do
-     @file = @chef_run.template "/etc/quantum/quantum.conf"
+     @file = @chef_run.template "/etc/neutron/neutron.conf"
     end
 
     it "has proper owner" do
-      expect(@file).to be_owned_by "quantum", "quantum"
+      expect(@file).to be_owned_by "neutron", "neutron"
     end
 
     it "has proper modes" do
@@ -108,7 +108,7 @@ describe 'openstack-network::server' do
 
     it "it sets root_helper" do
       expect(@chef_run).to create_file_with_content @file.name,
-        'root_helper = "sudo quantum-rootwrap /etc/quantum/rootwrap.conf"'
+        'root_helper = "sudo neutron-rootwrap /etc/neutron/rootwrap.conf"'
     end
 
     it "binds to appropriate api ip" do
@@ -133,7 +133,7 @@ describe 'openstack-network::server' do
 
     it "has appropriate admin password for agents"  do
       expect(@chef_run).to create_file_with_content @file.name,
-        "admin_password = quantum-pass"
+        "admin_password = neutron-pass"
     end
 
     it "has rabbit_host" do
@@ -173,7 +173,7 @@ describe 'openstack-network::server' do
 
     describe "qpid" do
       before do
-        @file = @chef_run.template "/etc/quantum/quantum.conf"
+        @file = @chef_run.template "/etc/neutron/neutron.conf"
         @chef_run.node.set['openstack']['network']['mq']['service_type'] = "qpid"
       end
 
@@ -255,9 +255,9 @@ describe 'openstack-network::server' do
 
     it "it has correct default scheduler classes" do
       expect(@chef_run).to create_file_with_content @file.name,
-        "network_scheduler_driver = quantum.scheduler.dhcp_agent_scheduler.ChanceScheduler"
+        "network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler"
       expect(@chef_run).to create_file_with_content @file.name,
-        "router_scheduler_driver = quantum.scheduler.l3_agent_scheduler.ChanceScheduler"
+        "router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler"
     end
 
     it "has the overridable default quota values" do
@@ -282,13 +282,13 @@ describe 'openstack-network::server' do
         "quota_driver = my.quota.Driver"
     end
 
-    describe "quantum.conf with rabbit ha" do
+    describe "neutron.conf with rabbit ha" do
 
       before do
         @chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
           n.set["openstack"]["network"]["rabbit"]["ha"] = true
           n.set["chef_client"]["splay"] = 300
-          n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+          n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
         end
         @chef_run.converge "openstack-network::server"
       end
@@ -314,10 +314,10 @@ describe 'openstack-network::server' do
       end
     end
 
-    describe "/etc/default/quantum-server" do
+    describe "/etc/default/neutron-server" do
       before do
         @file = @chef_run.template(
-          "/etc/default/quantum-server")
+          "/etc/default/neutron-server")
       end
 
       it "has proper owner" do
@@ -330,18 +330,18 @@ describe 'openstack-network::server' do
 
       it "has a correct plugin config path" do
         expect(@chef_run).to create_file_with_content(
-          @file.name, "/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini")
+          @file.name, "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
       end
     end
 
     it "does not install sysconfig template" do
       chef_run = ::ChefSpec::ChefRunner.new(
         ::UBUNTU_OPTS.merge(:evaluate_guards => true)) do |n|
-          n.set["openstack"]["compute"]["network"]["service_type"] = "quantum"
+          n.set["openstack"]["compute"]["network"]["service_type"] = "neutron"
         end
       chef_run.stub_command(/python/, true)
       chef_run.converge "openstack-network::server"
-      expect(chef_run).not_to create_file "/etc/sysconfig/quantum"
+      expect(chef_run).not_to create_file "/etc/sysconfig/neutron"
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01776493..64798600 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -43,7 +43,7 @@ MOCK_NODE_NETWORK_DATA =
     }
   }
 
-def quantum_stubs
+def neutron_stubs
 
   ::Chef::Recipe.any_instance.stub(:rabbit_servers).
     and_return "1.1.1.1:5672,2.2.2.2:5672"
@@ -56,14 +56,14 @@ def quantum_stubs
   ::Chef::Recipe.any_instance.stub(:secret).
     with("secrets", "openstack_identity_bootstrap_token").
     and_return "bootstrap-token"
-  ::Chef::Recipe.any_instance.stub(:db_password).and_return "quantum-pass"
+  ::Chef::Recipe.any_instance.stub(:db_password).and_return "neutron-pass"
   ::Chef::Recipe.any_instance.stub(:secret).
-    with("secrets", "quantum_metadata_secret").
+    with("secrets", "neutron_metadata_secret").
     and_return "metadata-secret"
   ::Chef::Recipe.any_instance.stub(:user_password).and_return String.new
   ::Chef::Recipe.any_instance.stub(:service_password).and_return String.new
   ::Chef::Recipe.any_instance.stub(:service_password).with("openstack-network").
-    and_return "quantum-pass"
+    and_return "neutron-pass"
   ::Chef::Recipe.any_instance.stub(:user_password).with("guest").
     and_return("rabbit-password")
   ::Chef::Application.stub(:fatal!)
diff --git a/templates/default/api-paste.ini.erb b/templates/default/api-paste.ini.erb
index d99b0987..77035234 100644
--- a/templates/default/api-paste.ini.erb
+++ b/templates/default/api-paste.ini.erb
@@ -1,26 +1,26 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
 
-[composite:quantum]
+[composite:neutron]
 use = egg:Paste#urlmap
-/: quantumversions
-/v2.0: quantumapi_v2_0
+/: neutronversions
+/v2.0: neutronapi_v2_0
 
-[composite:quantumapi_v2_0]
-use = call:quantum.auth:pipeline_factory
-noauth = extensions quantumapiapp_v2_0
-keystone = authtoken keystonecontext extensions quantumapiapp_v2_0
+[composite:neutronapi_v2_0]
+use = call:neutron.auth:pipeline_factory
+noauth = extensions neutronapiapp_v2_0
+keystone = authtoken keystonecontext extensions neutronapiapp_v2_0
 
 [filter:keystonecontext]
-paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory
+paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory
 
 [filter:extensions]
-paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory
+paste.filter_factory = neutron.api.extensions:plugin_aware_extension_middleware_factory
 
-[app:quantumversions]
-paste.app_factory = quantum.api.versions:Versions.factory
+[app:neutronversions]
+paste.app_factory = neutron.api.versions:Versions.factory
 
-[app:quantumapiapp_v2_0]
-paste.app_factory = quantum.api.v2.router:APIRouter.factory
+[app:neutronapiapp_v2_0]
+paste.app_factory = neutron.api.v2.router:APIRouter.factory
 
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
diff --git a/templates/default/dhcp_agent.ini.erb b/templates/default/dhcp_agent.ini.erb
index 202ec1f6..ada17049 100644
--- a/templates/default/dhcp_agent.ini.erb
+++ b/templates/default/dhcp_agent.ini.erb
@@ -4,7 +4,7 @@
 # Show debugging output in log (sets DEBUG log level output)
 debug = <%= node["openstack"]["network"]["debug"] %>
 
-# The DHCP agent will resync its state with Quantum to recover from any
+# The DHCP agent will resync its state with Neutron to recover from any
 # transient notification or rpc errors. The interval is number of
 # seconds between attempts.
 resync_interval = <%= node["openstack"]["network"]["dhcp"]["resync_interval"] %>
@@ -13,9 +13,9 @@ resync_interval = <%= node["openstack"]["network"]["dhcp"]["resync_interval"] %>
 # matches your plugin.
 
 # OVS based plugins (OVS, Ryu, NEC, NVP, BigSwitch/Floodlight)
-# interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
+# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # LinuxBridge
-#interface_driver = quantum.agent.linux.interface.BridgeInterfaceDriver
+#interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 interface_driver = <%= node["openstack"]["network"]["interface_driver"] %>
 
 # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
@@ -39,7 +39,7 @@ enable_isolated_metadata = <%= node["openstack"]["network"]["dhcp"]["enable_isol
 
 # Allows for serving metadata requests coming from a dedicated metadata
 # access network whose cidr is 169.254.169.254/16 (or larger prefix), and
-# is connected to a Quantum router from which the VMs send metadata
+# is connected to a Neutron router from which the VMs send metadata
 # request. In this case DHCP Option 121 will not be injected in VMs, as
 # they will be able to reach 169.254.169.254 through a router.
 # This option requires enable_isolated_metadata = True
@@ -51,5 +51,5 @@ dhcp_domain = <%= node["openstack"]["network"]["dhcp"]["default_domain"] %>
 
 # Pass a config file to dnsmasq so we can override settings
 # like the mtu passed to the virtual machine
-dnsmasq_config_file = /etc/quantum/dnsmasq.conf
+dnsmasq_config_file = /etc/neutron/dnsmasq.conf
 
diff --git a/templates/default/l3_agent.ini.erb b/templates/default/l3_agent.ini.erb
index da9edfa2..62e20f06 100644
--- a/templates/default/l3_agent.ini.erb
+++ b/templates/default/l3_agent.ini.erb
@@ -8,9 +8,9 @@ debug = <%= node["openstack"]["network"]["debug"] %>
 # matches your plugin.
 
 # OVS based plugins (OVS, Ryu, NEC, NVP, BigSwitch/Floodlight)
-# interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
+# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # LinuxBridge
-# interface_driver = quantum.agent.linux.interface.BridgeInterfaceDriver
+# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 interface_driver = <%= node["openstack"]["network"]["interface_driver"] %>
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
@@ -35,7 +35,7 @@ gateway_external_network_id = <%= node["openstack"]["network"]["l3"]["gateway_ex
 
 # Indicates that this L3 agent should also handle routers that do not have
 # an external network gateway configured.  This option should be True only
-# for a single agent in a Quantum deployment, and may be False for all agents
+# for a single agent in a Neutron deployment, and may be False for all agents
 # if all routers must have an external network gateway
 handle_internal_only_routers = <%= node["openstack"]["network"]["l3"]["handle_internal_only_routers"] %>
 
@@ -43,7 +43,7 @@ handle_internal_only_routers = <%= node["openstack"]["network"]["l3"]["handle_in
 # empty value for the linux bridge
 external_network_bridge = <%= node["openstack"]["network"]["l3"]["external_network_bridge"] %>
 
-# TCP Port used by Quantum metadata server
+# TCP Port used by Neutron metadata server
 metadata_port = <%= node["openstack"]["network"]["l3"]["metadata_port"] %>
 
 # Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
diff --git a/templates/default/lbaas_agent.ini.erb b/templates/default/lbaas_agent.ini.erb
index b6e3913f..653eb6f6 100644
--- a/templates/default/lbaas_agent.ini.erb
+++ b/templates/default/lbaas_agent.ini.erb
@@ -4,7 +4,7 @@
 # Show debugging output in log (sets DEBUG log level output)
 debug = <%= node["openstack"]["network"]["debug"] %>
 
-# The LBaaS agent will resync its state with Quantum to recover from any
+# The LBaaS agent will resync its state with Neutron to recover from any
 # transient notification or rpc errors. The interval is number of
 # seconds between attempts.
 periodic_interval = <%= node["openstack"]["network"]["lbaas"]["periodic_interval"] %>
@@ -12,13 +12,13 @@ periodic_interval = <%= node["openstack"]["network"]["lbaas"]["periodic_interval
 <% case node["openstack"]["network"]["lbaas_plugin"]
 when "ovs" %>
 # OVS based plugins(OVS, Ryu, NEC, NVP, BigSwitch/Floodlight)
-interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
 # as OpenFlow switch and check port status
 #ovs_use_veth = True
 <% when "linuxbridge" %>
 # LinuxBridge
-interface_driver = quantum.agent.linux.interface.BridgeInterfaceDriver
+interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 <% else %>
 # LBaaS currently supports openvswitch and linuxbridge drivers only.
 # Please use one of them.
@@ -27,7 +27,7 @@ interface_driver =
 
 # The agent requires a driver to manage the loadbalancer.  HAProxy is the
 # opensource version.
-device_driver = quantum.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
+device_driver = neutron.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
 
 # Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and
 # iproute2 package that supports namespaces).
diff --git a/templates/default/metadata_agent.ini.erb b/templates/default/metadata_agent.ini.erb
index a020b34d..69eef723 100644
--- a/templates/default/metadata_agent.ini.erb
+++ b/templates/default/metadata_agent.ini.erb
@@ -4,7 +4,7 @@
 # Show debugging output in log (sets DEBUG log level output)
 debug = <%= node["openstack"]["network"]["debug"] %>
 
-# The Quantum user information for accessing the Quantum API.
+# The Neutron user information for accessing the Neutron API.
 auth_url = <%= @identity_endpoint.to_s %>
 auth_region = <%= node["openstack"]["network"]["region"] %>
 admin_tenant_name = <%= node["openstack"]["network"]["service_tenant_name"] %>
@@ -23,8 +23,8 @@ nova_metadata_ip = <%= node["openstack"]["network"]["metadata"]["nova_metadata_i
 nova_metadata_port = <%= node["openstack"]["network"]["metadata"]["nova_metadata_port"] %>
 <% end -%>
 
-# When proxying metadata requests, Quantum signs the Instance-ID header with a
+# When proxying metadata requests, Neutron signs the Instance-ID header with a
 # shared secret to prevent spoofing.  You may select any string for a secret,
 # but it must match here and in the configuration used by the Nova Metadata
-# Server. NOTE: Nova uses a different key: quantum_metadata_proxy_shared_secret
+# Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret
 metadata_proxy_shared_secret = <%= @metadata_secret %>
diff --git a/templates/default/quantum-server.erb b/templates/default/neutron-server.erb
similarity index 59%
rename from templates/default/quantum-server.erb
rename to templates/default/neutron-server.erb
index a23d8d63..1996f211 100644
--- a/templates/default/quantum-server.erb
+++ b/templates/default/neutron-server.erb
@@ -1,6 +1,6 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
-# defaults for quantum-server
+# defaults for neutron-server
 
 # path to config file corresponding to the core_plugin specified in
-# quantum.conf
-QUANTUM_PLUGIN_CONFIG=<%= @plugin_config %>
+# neutron.conf
+NEUTRON_PLUGIN_CONFIG=<%= @plugin_config %>
diff --git a/templates/default/quantum.conf.erb b/templates/default/neutron.conf.erb
similarity index 92%
rename from templates/default/quantum.conf.erb
rename to templates/default/neutron.conf.erb
index 8230b9e8..d5fd3587 100644
--- a/templates/default/quantum.conf.erb
+++ b/templates/default/neutron.conf.erb
@@ -6,9 +6,9 @@
 debug = <%= node["openstack"]["network"]["debug"] %>
 verbose = <%= node["openstack"]["network"]["verbose"] %>
 
-# Where to store Quantum state files.  This directory must be writable by the
+# Where to store Neutron state files.  This directory must be writable by the
 # user executing the agent.
-# state_path = /var/lib/quantum
+# state_path = /var/lib/neutron
 
 # Where to store lock files
 lock_path = $state_path/lock
@@ -44,19 +44,19 @@ bind_port = <%= @bind_port %>
 # Path to the extensions.  Note that this can be a colon-separated list of
 # paths.  For example:
 # api_extensions_path = extensions:/path/to/more/extensions:/even/more/extensions
-# The __path__ of quantum.extensions is appended to this, so if your
+# The __path__ of neutron.extensions is appended to this, so if your
 # extensions are in there you don't need to specify them here
 # api_extensions_path =
 
-# Quantum plugin provider module
+# Neutron plugin provider module
 # core_plugin =
 core_plugin = <%= @core_plugin %>
 
 # Advanced service modules
 # service_plugins =
-<% if node["openstack"]["network"]["quantum_loadbalancer"] %>
+<% if node["openstack"]["network"]["neutron_loadbalancer"] %>
 # LoadBalancer plugin
-service_plugins = quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin
+service_plugins = neutron.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin
 <% end %>
 
 # Paste configuration file
@@ -90,7 +90,7 @@ api_paste_config = api-paste.ini
 # Enable or disable sorting
 # allow_sorting = False
 # Enable or disable overlapping IPs for subnets
-# Attention: the following parameter MUST be set to False if Quantum is
+# Attention: the following parameter MUST be set to False if Neutron is
 # being used in conjunction with nova security groups and/or metadata service.
 # allow_overlapping_ips = False
 # Ensure that configured gateway is on subnet
@@ -99,7 +99,7 @@ api_paste_config = api-paste.ini
 
 # RPC configuration options. Defined in rpc __init__
 # The messaging module to use, defaults to kombu.
-# rpc_backend = quantum.openstack.common.rpc.impl_kombu
+# rpc_backend = neutron.openstack.common.rpc.impl_kombu
 # Size of RPC thread pool
 # rpc_thread_pool_size = 64,
 # Size of RPC connection pool
@@ -110,9 +110,9 @@ api_paste_config = api-paste.ini
 # rpc_cast_timeout = 30
 # Modules of exceptions that are permitted to be recreated
 # upon receiving exception data from an rpc call.
-# allowed_rpc_exception_modules = quantum.openstack.common.exception, nova.exception
+# allowed_rpc_exception_modules = neutron.openstack.common.exception, nova.exception
 # AMQP exchange to connect to if using RabbitMQ or QPID
-control_exchange = quantum
+control_exchange = neutron
 
 # Configuration options if sending notifications via kombu rpc (these are
 # the defaults)
@@ -151,7 +151,7 @@ rabbit_port=<%= node["openstack"]["network"]["rabbit"]["port"] %>
 
 <% if node["openstack"]["network"]["mq"]["service_type"] == "qpid"  %>
 ##### QPID #####
-rpc_backend=quantum.openstack.common.rpc.impl_qpid
+rpc_backend=neutron.openstack.common.rpc.impl_qpid
 qpid_hostname=<%= node["openstack"]["network"]["mq"]["qpid"]["host"] %>
 qpid_port=<%= node["openstack"]["network"]["mq"]["qpid"]["port"] %>
 
@@ -171,9 +171,8 @@ qpid_tcp_nodelay=<%= node["openstack"]["network"]["mq"]["qpid"]["tcp_nodelay"] %
 
 <% end %>
 
-
 # ZMQ
-# rpc_backend=quantum.openstack.common.rpc.impl_zmq
+# rpc_backend=neutron.openstack.common.rpc.impl_zmq
 # ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
 # The "host" option should point or resolve to this address.
 # rpc_zmq_bind_address = *
@@ -187,11 +186,11 @@ qpid_tcp_nodelay=<%= node["openstack"]["network"]["mq"]["qpid"]["tcp_nodelay"] %
 
 # Notification_driver can be defined multiple times
 # Do nothing driver
-# notification_driver = quantum.openstack.common.notifier.no_op_notifier
+# notification_driver = neutron.openstack.common.notifier.no_op_notifier
 # Logging driver
-# notification_driver = quantum.openstack.common.notifier.log_notifier
+# notification_driver = neutron.openstack.common.notifier.log_notifier
 # RPC driver. DHCP agents needs it.
-notification_driver = quantum.openstack.common.notifier.rpc_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 
 # default_notification_level is used to form actual topic name(s) or to set logging level
 default_notification_level = INFO
@@ -234,11 +233,11 @@ router_scheduler_driver = <%= node["openstack"]["network"]["l3"]["scheduler"] %>
 
 # Allow auto scheduling networks to DHCP agent. It will schedule non-hosted
 # networks to first DHCP agent which sends get_active_networks message to
-# quantum server
+# neutron server
 # network_auto_schedule = True
 
 # Allow auto scheduling routers to L3 agent. It will schedule non-hosted
-# routers to first L3 agent which sends sync_routers message to quantum server
+# routers to first L3 agent which sends sync_routers message to neutron server
 # router_auto_schedule = True
 # ===========  end of items for agent scheduler extension =====
 
@@ -303,12 +302,12 @@ quota_driver = <%= node["openstack"]["network"]["quota"]["driver"] %>
 # <service>:<plugin>[:driver]
 
 [AGENT]
-# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
+# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
 # root filter facility.
 # Change to "sudo" to skip the filtering and just run the comand directly
 # root_helper = sudo
 <% if node["openstack"]["network"]["use_rootwrap"] %>
-root_helper = "sudo quantum-rootwrap /etc/quantum/rootwrap.conf"
+root_helper = "sudo neutron-rootwrap /etc/neutron/rootwrap.conf"
 <% end -%>
 
 # =========== items for agent management extension =============
diff --git a/templates/default/quantum.sysconfig.erb b/templates/default/neutron.sysconfig.erb
similarity index 51%
rename from templates/default/quantum.sysconfig.erb
rename to templates/default/neutron.sysconfig.erb
index f6408ce3..88393560 100644
--- a/templates/default/quantum.sysconfig.erb
+++ b/templates/default/neutron.sysconfig.erb
@@ -2,4 +2,4 @@
 #
 # location of the plugin configuration file
 
-QUANTUM_PLUGIN_CONF="/etc/quantum/plugins/<%= @plugin_conf %>"
\ No newline at end of file
+NEUTRON_PLUGIN_CONF="/etc/neutron/plugins/<%= @plugin_conf %>"
\ No newline at end of file
diff --git a/templates/default/plugins/bigswitch/restproxy.ini.erb b/templates/default/plugins/bigswitch/restproxy.ini.erb
index 708f1843..f3515a8a 100644
--- a/templates/default/plugins/bigswitch/restproxy.ini.erb
+++ b/templates/default/plugins/bigswitch/restproxy.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
+# sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
diff --git a/templates/default/plugins/brocade/brocade.ini.erb b/templates/default/plugins/brocade/brocade.ini.erb
index cc0f4b36..d3d1f4c4 100644
--- a/templates/default/plugins/brocade/brocade.ini.erb
+++ b/templates/default/plugins/brocade/brocade.ini.erb
@@ -28,7 +28,7 @@ ostype = <%= node["openstack"]["network"]["brocade"]["switch_ostype"] %>
 # sql_idle_timeout = 3600
 #
 # Example:
-# sql_connection = mysql://root:pass@localhost/brcd_quantum?charset=utf8
+# sql_connection = mysql://root:pass@localhost/brcd_neutron?charset=utf8
 sql_connection = <%= @sql_connection %>
 
 [PHYSICAL_INTERFACE]
@@ -47,7 +47,7 @@ network_vlan_ranges = <%= node["openstack"]["network"]["brocade"]["network_vlan_
 
 [AGENT]
 # Example:
-# root_helper = sudo /usr/local/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
+# root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 
 [LINUX_BRIDGE]
 # physical_interface_mappings = <physical network name>:<local interface>
diff --git a/templates/default/plugins/cisco/cisco_plugins.ini.erb b/templates/default/plugins/cisco/cisco_plugins.ini.erb
index 656d9de6..67da3588 100644
--- a/templates/default/plugins/cisco/cisco_plugins.ini.erb
+++ b/templates/default/plugins/cisco/cisco_plugins.ini.erb
@@ -29,8 +29,8 @@ password = <%= @info["password"] %>
 #
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://quantum:password@127.0.0.1:3306/cisco_quantum
+# sql_connection = mysql://neutron:password@127.0.0.1:3306/cisco_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 #
 sql_connection = <%= @sql_connection %>
diff --git a/templates/default/plugins/hyperv/hyperv_quantum_plugin.ini.erb b/templates/default/plugins/hyperv/hyperv_neutron_plugin.ini.erb
similarity index 95%
rename from templates/default/plugins/hyperv/hyperv_quantum_plugin.ini.erb
rename to templates/default/plugins/hyperv/hyperv_neutron_plugin.ini.erb
index 947e048d..c1abdb7e 100644
--- a/templates/default/plugins/hyperv/hyperv_quantum_plugin.ini.erb
+++ b/templates/default/plugins/hyperv/hyperv_neutron_plugin.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://quantum:password@127.0.0.1:3306/hyperv_quantum
+# sql_connection = mysql://neutron:password@127.0.0.1:3306/hyperv_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
diff --git a/templates/default/plugins/linuxbridge/linuxbridge_conf.ini.erb b/templates/default/plugins/linuxbridge/linuxbridge_conf.ini.erb
index 34a89d9f..943ae004 100644
--- a/templates/default/plugins/linuxbridge/linuxbridge_conf.ini.erb
+++ b/templates/default/plugins/linuxbridge/linuxbridge_conf.ini.erb
@@ -26,9 +26,9 @@ network_vlan_ranges = <%= node["openstack"]["network"]["linuxbridge"]["network_v
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
+# sql_connection = mysql://root:nova@127.0.0.1:3306/neutron_linux_bridge
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 
 # Database reconnection retry times - in event connectivity is lost
@@ -69,5 +69,5 @@ physical_interface_mappings = <%= node["openstack"]["network"]["linuxbridge"]["p
 polling_interval = 2
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
-firewall_driver = quantum.agent.linux.iptables_firewall.IptablesFirewallDriver
+# Firewall driver for realizing neutron security group function
+firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
diff --git a/templates/default/plugins/metaplugin/metaplugin.ini.erb b/templates/default/plugins/metaplugin/metaplugin.ini.erb
index 9582a92a..9abd9979 100644
--- a/templates/default/plugins/metaplugin/metaplugin.ini.erb
+++ b/templates/default/plugins/metaplugin/metaplugin.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 
 # Database reconnection retry times - in event connectivity is lost
@@ -25,7 +25,7 @@ reconnect_interval = 2
 # sql_idle_timeout = 3600
 
 [META]
-## This is list of flavor:quantum_plugins
+## This is list of flavor:neutron_plugins
 # extension method is used in the order of this list
 plugin_list = <%= node["openstack"]["network"]["metaplugin"]["plugin_list"] %>
 l3_plugin_list = <%= node["openstack"]["network"]["metaplugin"]["l3_plugin_list"] %>
diff --git a/templates/default/plugins/midonet/midonet.ini.erb b/templates/default/plugins/midonet/midonet.ini.erb
index cc21d04a..e53967ce 100644
--- a/templates/default/plugins/midonet/midonet.ini.erb
+++ b/templates/default/plugins/midonet/midonet.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
+# sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
diff --git a/templates/default/plugins/nec/nec.ini.erb b/templates/default/plugins/nec/nec.ini.erb
index 5cebcac8..010d6c9f 100644
--- a/templates/default/plugins/nec/nec.ini.erb
+++ b/templates/default/plugins/nec/nec.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
@@ -34,13 +34,13 @@ integration_bridge = <%= node["openstack"]["network"]["nec"]["integration_bridge
 # Agent's polling interval in seconds
 polling_interval = <%= node["openstack"]["network"]["nec"]["polling_interval"] %>
 
-# Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real
+# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
 # root filter facility.
 # Change to "sudo" to skip the filtering and just run the comand directly
 root_helper = sudo
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
+# Firewall driver for realizing neutron security group function
 firewall_driver = <%= node["openstack"]["network"]["nec"]["firewall_driver"] %>
 
 [OFC]
@@ -48,7 +48,7 @@ firewall_driver = <%= node["openstack"]["network"]["nec"]["firewall_driver"] %>
 host = <%= node["openstack"]["network"]["nec"]["ofc_host"] %>
 port = <%= node["openstack"]["network"]["nec"]["ofc_port"] %>
 
-# Drivers are in quantum/plugins/nec/drivers/ .
+# Drivers are in neutron/plugins/nec/drivers/ .
 driver = <%= node["openstack"]["network"]["nec"]["ofc_driver"] %>
 
 # PacketFilter is available when it's enabled in this configuration
diff --git a/templates/default/plugins/nicira/nvp.ini.erb b/templates/default/plugins/nicira/nvp.ini.erb
index df58c041..3276709f 100644
--- a/templates/default/plugins/nicira/nvp.ini.erb
+++ b/templates/default/plugins/nicira/nvp.ini.erb
@@ -42,7 +42,7 @@ redirects = <%= node["openstack"]["network"]["nicira"]["redirects"] %>
 nvp_controllers = <%= node["openstack"]["network"]["nicira"]["nvp_controllers"] %>
 
 # UUID of the pre-existing default NVP Transport zone to be used for creating
-# tunneled isolated "Quantum" networks. This option MUST be specified, e.g.:
+# tunneled isolated "Neutron" networks. This option MUST be specified, e.g.:
 default_tz_uuid = <%= node["openstack"]["network"]["nicira"]["default_tz_uuid"] %>
 
 # (Optional) UUID of the cluster in NVP.  It can be retrieved from NVP management
@@ -66,9 +66,9 @@ default_iface_name = <%= node["openstack"]["network"]["nicira"]["default_iface_n
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
+# sql_connection = mysql://root:neutron@127.0.0.1:3306/nvp_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 
 # Number of reconnection attempts to the DB; Set to -1 to try indefinitely
@@ -109,7 +109,7 @@ concurrent_connections = <%= node["openstack"]["network"]["nicira"]["concurrent_
 
 # Acceptable values for 'metadata_mode' are:
 #   - 'access_network': this enables a dedicated connection to the metadata
-#     proxy for metadata server access via Quantum router.
+#     proxy for metadata server access via Neutron router.
 #   - 'dhcp_host_route': this enables host route injection via the dhcp agent.
 # This option is only useful if running on a host that does not support
 # namespaces otherwise access_network should be used.
diff --git a/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb b/templates/default/plugins/openvswitch/ovs_neutron_plugin.ini.erb
similarity index 94%
rename from templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb
rename to templates/default/plugins/openvswitch/ovs_neutron_plugin.ini.erb
index c8964ea7..3f54aa5e 100644
--- a/templates/default/plugins/openvswitch/ovs_quantum_plugin.ini.erb
+++ b/templates/default/plugins/openvswitch/ovs_neutron_plugin.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # Replace 127.0.0.1 above with the IP address of the database used by the
-# main quantum server. (Leave it as is if the database runs on this host.)
+# main neutron server. (Leave it as is if the database runs on this host.)
 sql_connection = <%= @sql_connection %>
 
 # Database reconnection retry times - in event connectivity is lost
@@ -129,8 +129,8 @@ bridge_mappings = <%= node["openstack"]["network"]["openvswitch"]["bridge_mappin
 polling_interval = 2
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
-# Default: firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+# Firewall driver for realizing neutron security group function
+# Default: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 <% if node["openstack"]["network"]["openvswitch"]["fw_driver"] -%>
 firewall_driver = <%= node["openstack"]["network"]["openvswitch"]["fw_driver"] %>
 <% end -%>
@@ -141,7 +141,7 @@ firewall_driver = <%= node["openstack"]["network"]["openvswitch"]["fw_driver"] %
 #
 # 1. With VLANs on eth1.
 # [DATABASE]
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges = default:2000:3999
 # tunnel_id_ranges =
@@ -152,7 +152,7 @@ firewall_driver = <%= node["openstack"]["network"]["openvswitch"]["fw_driver"] %
 #
 # 2. With tunneling.
 # [DATABASE]
-# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
+# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
 # [OVS]
 # network_vlan_ranges =
 # tunnel_id_ranges = 1:1000
diff --git a/templates/default/plugins/plumgrid/plumgrid.ini.erb b/templates/default/plugins/plumgrid/plumgrid.ini.erb
index 4d9945e7..05ba17a3 100644
--- a/templates/default/plugins/plumgrid/plumgrid.ini.erb
+++ b/templates/default/plugins/plumgrid/plumgrid.ini.erb
@@ -2,9 +2,9 @@
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
 # Example:
-# sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
+# sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_neutron
 # Replace <host> above with the IP address of the database used by the
-# main quantum server.
+# main neutron server.
 sql_connection = <%= @sql_connection %>
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
diff --git a/templates/default/plugins/ryu/ryu.ini.erb b/templates/default/plugins/ryu/ryu.ini.erb
index 8915d796..d93f9030 100644
--- a/templates/default/plugins/ryu/ryu.ini.erb
+++ b/templates/default/plugins/ryu/ryu.ini.erb
@@ -1,7 +1,7 @@
 <%= node["openstack"]["network"]["custom_template_banner"] %>
 [DATABASE]
 # This line MUST be changed to actually run the plugin.
-# Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
+# Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_neutron
 sql_connection = <%= @sql_connection %>
 # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size,
 # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled.
@@ -50,7 +50,7 @@ ovsdb_ip = <%= node["openstack"]["network"]["ryu"]["ovsdb_ip"] %>
 ovsdb_interface = <%= node["openstack"]["network"]["ryu"]["ovsdb_interface"] %>
 
 [SECURITYGROUP]
-# Firewall driver for realizing quantum security group function
+# Firewall driver for realizing neutron security group function
 firewall_driver = <%= node["openstack"]["network"]["ryu"]["firewall_driver"] %>
 
 [AGENT]
diff --git a/templates/default/rootwrap.conf.erb b/templates/default/rootwrap.conf.erb
index 234d2814..e278b4ad 100644
--- a/templates/default/rootwrap.conf.erb
+++ b/templates/default/rootwrap.conf.erb
@@ -3,4 +3,4 @@
 [DEFAULT]
 # List of directories to load filter definitions from (separated by ',').
 # These directories MUST all be only writeable by root !
-filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap
+filters_path=/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap