diff --git a/docs/ci.md b/docs/ci.md
index 45adc1e8a..a20016695 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -27,7 +27,7 @@ Jenkins
  * bootstrap VM via image-build chain (archive bm-cloud.qcow2).
 
         disk-image-create vm base glance nova-bm swift mysql haproxy-api \
-        haproxy-mysql cinder quantum rabbitmq -o bootstrap-prod
+        haproxy-mysql cinder neutron rabbitmq -o bootstrap-prod
 
  * baremetal SPOF node build (archive the resulting image).
 
@@ -36,7 +36,7 @@ Jenkins
 
  * baremetal demo node build (archive the resulting image).
 
-        disk-image-create base vm glance nova-bm swift cinder quantum \
+        disk-image-create base vm glance nova-bm swift cinder neutron \
         -o bootstrap-prod
 
  * ramdisk deploy image build
diff --git a/elements/boot-stack/README.md b/elements/boot-stack/README.md
index 0500c0b57..2f37ec61a 100644
--- a/elements/boot-stack/README.md
+++ b/elements/boot-stack/README.md
@@ -48,7 +48,7 @@ Utilities
 The following utilities are available in the running boot-stack machine:
 
 `wipe-openstack` - Clear all openstack databases, and return
-                   nova/keystone/quantum/etc. to their default states.
+                   nova/keystone/neutron/etc. to their default states.
 
 `boot-stack-logs` - Start a screen session which tails important logs.
 
diff --git a/elements/boot-stack/bin/init-keystone b/elements/boot-stack/bin/init-keystone
index 2b5cf03df..d964eb91b 100755
--- a/elements/boot-stack/bin/init-keystone
+++ b/elements/boot-stack/bin/init-keystone
@@ -28,8 +28,8 @@
 # * ADMIN_PASSWORD is used to set the password for the admin and demo accounts.
 # * SERVICE_PASSWORD is used to set the password for the service accounts.
 #
-# Enable the Swift and Quantum accounts by setting ENABLE_SWIFT and/or
-# ENABLE_QUANTUM environment variables.
+# Enable the Swift and Neutron accounts by setting ENABLE_SWIFT and/or
+# ENABLE_NEUTRON environment variables.
 #
 # Enable creation of endpoints by setting ENABLE_ENDPOINTS environment variable.
 # Works with Catalog SQL backend. Do not use with Catalog Templated backend
@@ -43,7 +43,7 @@
 # admin                admin     admin
 # service              glance    admin
 # service              nova      admin
-# service              quantum   admin        # if enabled
+# service              neutron   admin        # if enabled
 # service              swift     admin        # if enabled
 # demo                 admin     admin
 # demo                 demo      Member,sysadmin,netadmin
@@ -69,7 +69,7 @@ CONTROLLER_INTERNAL_ADDRESS=$BOOTSTRAP_IP
 source /root/stackrc
 
 ENABLE_ENDPOINTS=yes
-ENABLE_QUANTUM=yes
+ENABLE_NEUTRON=yes
 ENABLE_SWIFT=yes
 ENABLE_HEAT=yes
 
@@ -242,20 +242,20 @@ if [[ -n "$ENABLE_SWIFT" ]]; then
     fi
 fi
 
-if [[ -n "$ENABLE_QUANTUM" ]]; then
-    QUANTUM_SERVICE=$(get_id \
-    keystone service-create --name=quantum \
+if [[ -n "$ENABLE_NEUTRON" ]]; then
+    NEUTRON_SERVICE=$(get_id \
+    keystone service-create --name=neutron \
                             --type=network \
-                            --description="Quantum Service")
-    QUANTUM_USER=$(get_id keystone user-create --name=quantum \
+                            --description="Neutron Service")
+    NEUTRON_USER=$(get_id keystone user-create --name=neutron \
                                                --pass="$SERVICE_PASSWORD" \
                                                --tenant-id $SERVICE_TENANT \
-                                               --email=quantum@example.com)
+                                               --email=neutron@example.com)
     keystone user-role-add --tenant-id $SERVICE_TENANT \
-                           --user-id $QUANTUM_USER \
+                           --user-id $NEUTRON_USER \
                            --role-id $ADMIN_ROLE
     if [[ -n "$ENABLE_ENDPOINTS" ]]; then
-        keystone endpoint-create --region RegionOne --service-id $QUANTUM_SERVICE \
+        keystone endpoint-create --region RegionOne --service-id $NEUTRON_SERVICE \
             --publicurl   "http://$CONTROLLER_PUBLIC_ADDRESS:9696" \
             --adminurl    "http://$CONTROLLER_ADMIN_ADDRESS:9696" \
             --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9696"
diff --git a/elements/boot-stack/bin/init-quantum b/elements/boot-stack/bin/init-neutron
similarity index 71%
rename from elements/boot-stack/bin/init-quantum
rename to elements/boot-stack/bin/init-neutron
index 1f773fc9b..ca0b7b446 100755
--- a/elements/boot-stack/bin/init-quantum
+++ b/elements/boot-stack/bin/init-neutron
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Initialise the quantum server configuration.
+# Initialise the neutron server configuration.
 #
-# This creates initial networks for quantum based on heat metadata and local
+# This creates initial networks for neutron based on heat metadata and local
 # network configuration.
 #
 # It is not idempotent.
@@ -13,14 +13,14 @@ set -o pipefail
 PATH=/usr/local/bin:$PATH
 source /root/stackrc
 
-PHYSICAL_NETWORK=$(os-config-applier --type raw --key quantum.ovs.physical_network --key-default '')
-ALLOCATION_START=$(os-config-applier --type netaddress --key quantum.ovs.fixed_range.start --key-default '')
-ALLOCATION_END=$(os-config-applier --type netaddress --key quantum.ovs.fixed_range.end --key-default '')
-NETWORK=$(os-config-applier --type netaddress --key quantum.ovs.ovs_range --key-default 'unset')
+PHYSICAL_NETWORK=$(os-config-applier --type raw --key neutron.ovs.physical_network --key-default '')
+ALLOCATION_START=$(os-config-applier --type netaddress --key neutron.ovs.fixed_range.start --key-default '')
+ALLOCATION_END=$(os-config-applier --type netaddress --key neutron.ovs.fixed_range.end --key-default '')
+NETWORK=$(os-config-applier --type netaddress --key neutron.ovs.ovs_range --key-default 'unset')
 
 if [ "$NETWORK" == "unset" ] ; then
     # undercloud / seed cloud - lookup the network device
-    BRIDGE=$(os-config-applier --type raw --key quantum.ovs.physical_bridge)
+    BRIDGE=$(os-config-applier --type raw --key neutron.ovs.physical_bridge)
     # NB: assumes only one network on the device
     NETWORK=$(ip addr show dev $BRIDGE | grep ' inet ' | awk '{print $2}')
     # Route traffic to this machine
@@ -33,7 +33,7 @@ if [ -n "$ALLOCATION_START" -a -n "$ALLOCATION_END" ] ; then
 fi
 
 # Hackish: ensure the server is running. XXX: Test without this.
-service quantum-server restart
+service neutron-server restart
 
 TENANT_ID=$(keystone tenant-list | grep ' admin ' | awk '{print $2}')
 
@@ -46,8 +46,8 @@ if [ -n "$PHYSICAL_NETWORK" ] ; then
    SUBNET_EXTRA="--tenant_id $TENANT_ID"
 fi
 
-# quantum-server might not be fully started yet, so we're going to
-# call `quantum net-create` in a loop until it returns true
+# neutron-server might not be fully started yet, so we're going to
+# call `neutron net-create` in a loop until it returns true
 t=0
 while ! NET_ID=$(neutron net-create $NET_NAME $NET_EXTRA | grep ' id ' | awk '{print $4}'); do
     if [ $t -eq 10 ]; then
diff --git a/elements/boot-stack/bin/reset-db b/elements/boot-stack/bin/reset-db
index 3b120fcd7..d90361493 100755
--- a/elements/boot-stack/bin/reset-db
+++ b/elements/boot-stack/bin/reset-db
@@ -28,5 +28,5 @@ $venvs/glance/bin/glance-manage db_sync
 os-db-create heat heat $db_pass
 $venvs/heat/bin/heat-manage db_sync
 
-os-db-create ovs_quantum quantum $db_pass
+os-db-create ovs_neutron neutron $db_pass
 
diff --git a/elements/boot-stack/bin/wipe-openstack b/elements/boot-stack/bin/wipe-openstack
index fb4d825f2..f749d71b1 100755
--- a/elements/boot-stack/bin/wipe-openstack
+++ b/elements/boot-stack/bin/wipe-openstack
@@ -17,5 +17,5 @@ init-nova
 # Reentering into os-refresh-config is a little terrifying : later refactoring
 # should remove this.
 os-refresh-config
-init-quantum
+init-neutron
 
diff --git a/elements/boot-stack/element-deps b/elements/boot-stack/element-deps
index e0d732371..c54d26b47 100644
--- a/elements/boot-stack/element-deps
+++ b/elements/boot-stack/element-deps
@@ -6,6 +6,6 @@ nova-api
 nova-compute
 openstack-clients
 os-refresh-config
-quantum-openvswitch-agent
-quantum-server
+neutron-openvswitch-agent
+neutron-server
 rabbitmq-server
diff --git a/elements/quantum-network-node/README.md b/elements/neutron-network-node/README.md
similarity index 69%
rename from elements/quantum-network-node/README.md
rename to elements/neutron-network-node/README.md
index 4beee5202..af2ef7a3d 100644
--- a/elements/quantum-network-node/README.md
+++ b/elements/neutron-network-node/README.md
@@ -1,12 +1,12 @@
-Install components for Quantum network node.
+Install components for Neutron network node.
 
 Configuration
 -------------
 
-The configuration path quantum.ovs.public\_interface will be added
+The configuration path neutron.ovs.public\_interface will be added
 to br-ex.
 
-  quantum:
+  neutron:
     ovs:
       public_interface: eth1
 
@@ -14,7 +14,7 @@ In the example above, eth1 will be added as a port for br-ex.
 
 An external network is configured with details gotten from heat.
 
-  quantum:
+  neutron:
     floatingip_range: a.b.c.d/24
     floatingip_start: a.b.c.3
     floatingip_end: a.b.c.54
diff --git a/elements/neutron-network-node/element-deps b/elements/neutron-network-node/element-deps
new file mode 100644
index 000000000..663b89ca9
--- /dev/null
+++ b/elements/neutron-network-node/element-deps
@@ -0,0 +1,2 @@
+neutron
+neutron-openvswitch-agent
diff --git a/elements/quantum-network-node/install.d/80-arping b/elements/neutron-network-node/install.d/80-arping
similarity index 100%
rename from elements/quantum-network-node/install.d/80-arping
rename to elements/neutron-network-node/install.d/80-arping
diff --git a/elements/neutron-network-node/install.d/80-neutron-networking b/elements/neutron-network-node/install.d/80-neutron-networking
new file mode 100755
index 000000000..0af5d16fb
--- /dev/null
+++ b/elements/neutron-network-node/install.d/80-neutron-networking
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -eux
+
+os-svc-daemon -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
+os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
+os-svc-daemon -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
+
+# This has to be on the path of the agent that runs it http://pad.lv/1182704
+ln -sf /opt/stack/venvs/neutron/bin/neutron-ns-metadata-proxy /usr/bin
diff --git a/elements/quantum-network-node/os-refresh-config/post-configure.d/80-quantum-networking b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
similarity index 82%
rename from elements/quantum-network-node/os-refresh-config/post-configure.d/80-quantum-networking
rename to elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
index 73a3881c5..a62549479 100755
--- a/elements/quantum-network-node/os-refresh-config/post-configure.d/80-quantum-networking
+++ b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
@@ -4,7 +4,7 @@ set -o pipefail
 
 . /root/stackrc
 
-PUBLIC_INTERFACE=$(os-config-applier --key quantum.ovs.public_interface --key-default '')
+PUBLIC_INTERFACE=$(os-config-applier --key neutron.ovs.public_interface --key-default '')
 
 ovs-vsctl --no-wait -- --may-exist add-br br-ex
 ovs-vsctl --no-wait br-set-external-id br-ex bridge-id br-ex
@@ -32,7 +32,7 @@ find_cidr() {
     echo $id
 }
 
-FIXED_RANGE=$(os-config-applier --key quantum.ovs.fixed_range --key-default '' --type netaddress)
+FIXED_RANGE=$(os-config-applier --key neutron.ovs.fixed_range --key-default '' --type netaddress)
 
 # Determine subnet ID
 id=$(find_cidr $FIXED_RANGE)
@@ -53,7 +53,7 @@ if ! neutron router-port-list default-router -f csv -F fixed_ips | grep -q "$id"
 fi
 
 # Ensure defined floating ip range exists
-FLOATING_RANGE=$(os-config-applier --key quantum.floatingip_range --type netaddress --key-default '')
+FLOATING_RANGE=$(os-config-applier --key neutron.floatingip_range --type netaddress --key-default '')
 if [ -n "$FLOATING_RANGE" ] ; then
     # External net?
     if ! neutron net-show ext-net >/dev/null 2>&1 ; then
@@ -62,8 +62,8 @@ if [ -n "$FLOATING_RANGE" ] ; then
     id=$(find_cidr $FLOATING_RANGE)
     if [ -z "$id" ] ; then
         # id is set by command below
-	POOL_START=$(os-config-applier --key quantum.floatingip_start --type netaddress)
-	POOL_END=$(os-config-applier --key quantum.floatingip_end --type netaddress)
+	POOL_START=$(os-config-applier --key neutron.floatingip_start --type netaddress)
+	POOL_END=$(os-config-applier --key neutron.floatingip_end --type netaddress)
         eval $(neutron subnet-create ext-net $FLOATING_RANGE --disable-dhcp \
 	    --allocation-pool start=$POOL_START,end=$POOL_END -f shell -c id|grep '^id=')
     fi
@@ -75,6 +75,6 @@ if [ -n "$FLOATING_RANGE" ] ; then
 fi
 
 
-service quantum-metadata-agent restart
-service quantum-l3-agent restart
-service quantum-dhcp-agent restart
+service neutron-metadata-agent restart
+service neutron-l3-agent restart
+service neutron-dhcp-agent restart
diff --git a/elements/quantum-openvswitch-agent/README.md b/elements/neutron-openvswitch-agent/README.md
similarity index 87%
rename from elements/quantum-openvswitch-agent/README.md
rename to elements/neutron-openvswitch-agent/README.md
index a2f110b50..4fe4c56c4 100644
--- a/elements/quantum-openvswitch-agent/README.md
+++ b/elements/neutron-openvswitch-agent/README.md
@@ -6,7 +6,7 @@ Configuration
 The physical interface and bridges to use to bridge traffic onto can be
 configured via Heat Metadata. For example:
 
-    quantum:
+    neutron:
       ovs:
         public_interface: eth2
         physical_bridge: br-ctlplane
@@ -19,10 +19,10 @@ configured via Heat Metadata. For example:
         ovs_range: 198.51.100.0/24
 
 If public\_interface and physical\_bridge are not set, no bridges will be
-connected directly. This is normal for quantum hosting virtual machines
+connected directly. This is normal for neutron hosting virtual machines
 when using an overlay network (e.g. GRE tunnelling). Some of the
 other fields will be ignored in this case. Most of them map 1:1 with their
-counterparts in the OVS section of ovs\_quantum\_plugin.ini
+counterparts in the OVS section of ovs\_neutron\_plugin.ini
 
 fixed\_range is used to create an allocation pool on the tenants network, and
 ovs\_range is used to create the tenants subnet, if set. If not set the subnet
diff --git a/elements/neutron-openvswitch-agent/element-deps b/elements/neutron-openvswitch-agent/element-deps
new file mode 100644
index 000000000..99d73a448
--- /dev/null
+++ b/elements/neutron-openvswitch-agent/element-deps
@@ -0,0 +1 @@
+neutron
diff --git a/elements/neutron-openvswitch-agent/install.d/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/install.d/80-neutron-openvswitch-agent
new file mode 100755
index 000000000..a8778d28d
--- /dev/null
+++ b/elements/neutron-openvswitch-agent/install.d/80-neutron-openvswitch-agent
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -eux
+install -m 0755 -o root -g root -t /usr/local/bin $(dirname $0)/../neutron-ovs-agent-bin/*
+os-svc-daemon neutron-openvswitch-agent neutron neutron-openvswitch-agent \
+    "--config-file /etc/neutron/neutron.conf  --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron"
diff --git a/elements/quantum-openvswitch-agent/quantum-ovs-agent-bin/init-quantum-ovs b/elements/neutron-openvswitch-agent/neutron-ovs-agent-bin/init-neutron-ovs
similarity index 95%
rename from elements/quantum-openvswitch-agent/quantum-ovs-agent-bin/init-quantum-ovs
rename to elements/neutron-openvswitch-agent/neutron-ovs-agent-bin/init-neutron-ovs
index 120efd038..3fa92631f 100755
--- a/elements/quantum-openvswitch-agent/quantum-ovs-agent-bin/init-quantum-ovs
+++ b/elements/neutron-openvswitch-agent/neutron-ovs-agent-bin/init-neutron-ovs
@@ -7,7 +7,7 @@
 # any device then it will be added to the public_interface device if one is
 # defined.
 #
-# An integration bridge for quantum-ovs-agent is created.
+# An integration bridge for neutron-ovs-agent is created.
 #
 # If no physical bridge is defined in metadata, the script will have no
 # further effect.
@@ -33,8 +33,8 @@ set -eux
 
 PATH=/usr/local/bin:$PATH
 
-EXTERNAL_BRIDGE=$(os-config-applier --key quantum.ovs.physical_bridge --type raw --key-default '')
-PHYSICAL_INTERFACE=$(os-config-applier --key quantum.ovs.public_interface --type raw  --key-default '')
+EXTERNAL_BRIDGE=$(os-config-applier --key neutron.ovs.physical_bridge --type raw --key-default '')
+PHYSICAL_INTERFACE=$(os-config-applier --key neutron.ovs.public_interface --type raw  --key-default '')
 PHYSICAL_INTERFACE_IP=$(os-config-applier --key bootstack.public_interface_ip --type netaddress  --key-default '')
 
 if [ -n "$PHYSICAL_INTERFACE_IP" -a -n "$PHYSICAL_INTERFACE" ] ; then
diff --git a/elements/quantum-openvswitch-agent/os-refresh-config/configure.d/80-quantum-openvswitch-agent b/elements/neutron-openvswitch-agent/os-refresh-config/configure.d/80-neutron-openvswitch-agent
similarity index 55%
rename from elements/quantum-openvswitch-agent/os-refresh-config/configure.d/80-quantum-openvswitch-agent
rename to elements/neutron-openvswitch-agent/os-refresh-config/configure.d/80-neutron-openvswitch-agent
index 065b797e4..07e2a49b7 100755
--- a/elements/quantum-openvswitch-agent/os-refresh-config/configure.d/80-quantum-openvswitch-agent
+++ b/elements/neutron-openvswitch-agent/os-refresh-config/configure.d/80-neutron-openvswitch-agent
@@ -1,3 +1,3 @@
 #!/bin/bash
 set -eux
-init-quantum-ovs
+init-neutron-ovs
diff --git a/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent
new file mode 100755
index 000000000..a75d67439
--- /dev/null
+++ b/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -eux
+service neutron-openvswitch-agent restart
diff --git a/elements/neutron-server/README.md b/elements/neutron-server/README.md
new file mode 100644
index 000000000..f1e1d9e3c
--- /dev/null
+++ b/elements/neutron-server/README.md
@@ -0,0 +1 @@
+Install and configure Neutron server components.
diff --git a/elements/neutron-server/element-deps b/elements/neutron-server/element-deps
new file mode 100644
index 000000000..99d73a448
--- /dev/null
+++ b/elements/neutron-server/element-deps
@@ -0,0 +1 @@
+neutron
diff --git a/elements/neutron-server/install.d/80-neutron-server b/elements/neutron-server/install.d/80-neutron-server
new file mode 100755
index 000000000..c19d52b10
--- /dev/null
+++ b/elements/neutron-server/install.d/80-neutron-server
@@ -0,0 +1,3 @@
+#!/bin/bash
+os-svc-daemon neutron-server neutron neutron-server \
+    "--config-file /etc/neutron/neutron.conf  --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron"
diff --git a/elements/neutron-server/os-refresh-config/post-configure.d/80-neutron-server b/elements/neutron-server/os-refresh-config/post-configure.d/80-neutron-server
new file mode 100755
index 000000000..e4a85a2a9
--- /dev/null
+++ b/elements/neutron-server/os-refresh-config/post-configure.d/80-neutron-server
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -eux
+service neutron-server restart
diff --git a/elements/neutron/README.md b/elements/neutron/README.md
new file mode 100644
index 000000000..f7696fce2
--- /dev/null
+++ b/elements/neutron/README.md
@@ -0,0 +1 @@
+Install neutron service from git.
diff --git a/elements/quantum/element-deps b/elements/neutron/element-deps
similarity index 100%
rename from elements/quantum/element-deps
rename to elements/neutron/element-deps
diff --git a/elements/neutron/install.d/76-neutron b/elements/neutron/install.d/76-neutron
new file mode 100755
index 000000000..fa02f597e
--- /dev/null
+++ b/elements/neutron/install.d/76-neutron
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -eux
+
+DISTRO=`lsb_release -si` || true
+
+install-packages openvswitch-switch openvswitch-datapath-dkms
+os-svc-install -n neutron -u neutron -r https://github.com/openstack/neutron.git
+
+mkdir -p /var/lib/neutron && chown -R neutron:neutron /var/lib/neutron
+
+ln -sf /opt/stack/venvs/neutron/bin/neutron-rootwrap /usr/bin/neutron-rootwrap
+ln -sf /opt/stack/venvs/neutron/etc/neutron/rootwrap.d /etc/neutron/rootwrap.d
+
+echo "neutron ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/neutron
+chmod 0440 /etc/sudoers.d/neutron
+visudo -c
+
+if [ $DISTRO = "Fedora" ]; then
+    systemctl enable openvswitch.service
+fi
+
diff --git a/elements/neutron/install.d/99-neutronclient b/elements/neutron/install.d/99-neutronclient
new file mode 100755
index 000000000..3ffb9bb09
--- /dev/null
+++ b/elements/neutron/install.d/99-neutronclient
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eux
+
+# Due to trunk neutron relying on trunk neutronclient, we need
+# trunk neutronclient - https://bugs.launchpad.net/neutron/+bug/1182732
+/opt/stack/venvs/neutron/bin/pip install -U git+https://github.com/openstack/python-neutronclient
diff --git a/elements/quantum/os-config-applier/etc/quantum/api-paste.ini b/elements/neutron/os-config-applier/etc/neutron/api-paste.ini
similarity index 55%
rename from elements/quantum/os-config-applier/etc/quantum/api-paste.ini
rename to elements/neutron/os-config-applier/etc/neutron/api-paste.ini
index 69ae06567..9fca167ae 100644
--- a/elements/quantum/os-config-applier/etc/quantum/api-paste.ini
+++ b/elements/neutron/os-config-applier/etc/neutron/api-paste.ini
@@ -4,32 +4,32 @@
 ## Please submit patches for any setting that should be deleted or Heat-configurable.
 ##  https://github.com/stackforge/diskimage-builder
 
-[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:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 auth_host = {{keystone.host}}
 auth_port = 35357
 admin_tenant_name = service
-admin_user = quantum
+admin_user = neutron
 admin_password = {{service-password}}
 
 [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
diff --git a/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini b/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini
similarity index 68%
rename from elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini
rename to elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini
index 8cf536212..77eadd3f6 100644
--- a/elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini
+++ b/elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini
@@ -6,8 +6,8 @@
 [DEFAULT]
 debug = True
 
-state_path = /var/run/quantum
-interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
-dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq
-root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf
+state_path = /var/run/neutron
+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 use_namespaces = True
diff --git a/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini b/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini
similarity index 82%
rename from elements/quantum/os-config-applier/etc/quantum/l3_agent.ini
rename to elements/neutron/os-config-applier/etc/neutron/l3_agent.ini
index 17b188a5d..f40aeab22 100644
--- a/elements/quantum/os-config-applier/etc/quantum/l3_agent.ini
+++ b/elements/neutron/os-config-applier/etc/neutron/l3_agent.ini
@@ -7,12 +7,12 @@
 [DEFAULT]
 debug = True
 
-interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
-state_path = /var/run/quantum
+state_path = /var/run/neutron
 
 auth_url = http://{{keystone.host}}:35357/v2.0
 admin_tenant_name = service
-admin_user = quantum
+admin_user = neutron
 admin_password = {{service-password}}
 use_namespaces = True
diff --git a/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini b/elements/neutron/os-config-applier/etc/neutron/metadata_agent.ini
similarity index 64%
rename from elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini
rename to elements/neutron/os-config-applier/etc/neutron/metadata_agent.ini
index 1cf3e74b0..0c5e4be96 100644
--- a/elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini
+++ b/elements/neutron/os-config-applier/etc/neutron/metadata_agent.ini
@@ -2,10 +2,10 @@
 auth_url = http://{{keystone.host}}:35357/v2.0
 auth_region = RegionOne
 admin_tenant_name = service
-admin_user = quantum
+admin_user = neutron
 admin_password = {{admin-password}}
-metadata_proxy_shared_secret = {{quantum.metadata_proxy_shared_secret}}
+metadata_proxy_shared_secret = {{neutron.metadata_proxy_shared_secret}}
 nova_metadata_ip = {{nova.host}}
 nova_metadata_port = 8775
 
-state_path = /var/run/quantum
+state_path = /var/run/neutron
diff --git a/elements/quantum/os-config-applier/etc/quantum/quantum.conf b/elements/neutron/os-config-applier/etc/neutron/neutron.conf
similarity index 72%
rename from elements/quantum/os-config-applier/etc/quantum/quantum.conf
rename to elements/neutron/os-config-applier/etc/neutron/neutron.conf
index c5b39de61..241bec8d4 100644
--- a/elements/quantum/os-config-applier/etc/quantum/quantum.conf
+++ b/elements/neutron/os-config-applier/etc/neutron/neutron.conf
@@ -11,10 +11,10 @@ auth_strategy = keystone
 allow_overlapping_ips = False
 debug = True
 verbose = True
-core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2
+core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
 rabbit_host = {{rabbit.host}}
 rabbit_password = {{rabbit.password}}
-rpc_backend = quantum.openstack.common.rpc.impl_kombu
+rpc_backend = neutron.openstack.common.rpc.impl_kombu
 
 bind_host = 0.0.0.0
 
@@ -22,15 +22,15 @@ bind_port = 9696
 
 api_paste_config = api-paste.ini
 
-control_exchange = quantum
+control_exchange = neutron
 
-notification_driver = quantum.openstack.common.notifier.rpc_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 
 
 notification_topics = notifications
 
 [QUOTAS]
-quota_driver = quantum.db.quota_db.DbQuotaDriver
+quota_driver = neutron.db.quota_db.DbQuotaDriver
 
 [DEFAULT_SERVICETYPE]
 
@@ -44,6 +44,6 @@ auth_port = 35357
 auth_protocol = http
 auth_protocol = http
 admin_tenant_name = service
-admin_user = quantum
+admin_user = neutron
 admin_password = {{service-password}}
-signing_dir = /var/lib/quantum/keystone-signing
+signing_dir = /var/lib/neutron/keystone-signing
diff --git a/elements/neutron/os-config-applier/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/elements/neutron/os-config-applier/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
new file mode 100644
index 000000000..f8e4280af
--- /dev/null
+++ b/elements/neutron/os-config-applier/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -0,0 +1,23 @@
+[DATABASE]
+sql_connection = {{neutron.ovs_db}}
+
+reconnect_interval = 2
+
+[OVS]
+bridge_mappings = {{neutron.ovs.bridge_mappings}}
+network_vlan_ranges = {{neutron.ovs.network_vlan_ranges}}
+
+tenant_network_type = {{neutron.ovs.tenant_network_type}}
+tunnel_id_ranges = 1:1000
+enable_tunneling = {{neutron.ovs.enable_tunneling}}
+integration_bridge = br-int
+tunnel_bridge = br-tun
+local_ip = {{neutron.ovs.local_ip}}
+
+
+[AGENT]
+root_helper = sudo
+polling_interval = 2
+
+[SECURITYGROUP]
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
diff --git a/elements/quantum/os-config-applier/etc/quantum/policy.json b/elements/neutron/os-config-applier/etc/neutron/policy.json
similarity index 100%
rename from elements/quantum/os-config-applier/etc/quantum/policy.json
rename to elements/neutron/os-config-applier/etc/neutron/policy.json
diff --git a/elements/quantum/os-config-applier/etc/quantum/rootwrap.conf b/elements/neutron/os-config-applier/etc/neutron/rootwrap.conf
similarity index 68%
rename from elements/quantum/os-config-applier/etc/quantum/rootwrap.conf
rename to elements/neutron/os-config-applier/etc/neutron/rootwrap.conf
index 5f88a6ad6..f0af1e835 100644
--- a/elements/quantum/os-config-applier/etc/quantum/rootwrap.conf
+++ b/elements/neutron/os-config-applier/etc/neutron/rootwrap.conf
@@ -1,4 +1,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
diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf
index 4ff463378..423708f8f 100644
--- a/elements/nova/os-apply-config/etc/nova/nova.conf
+++ b/elements/nova/os-apply-config/etc/nova/nova.conf
@@ -38,18 +38,18 @@ vncserver_listen=0.0.0.0
 
 # Networking #
 network_api_class=nova.network.quantumv2.api.API
-quantum_url=http://{{quantum.host}}:9696
+quantum_url=http://{{neutron.host}}:9696
 quantum_auth_strategy=keystone
 quantum_admin_tenant_name=service
-quantum_admin_username=quantum
+quantum_admin_username=neutron
 quantum_admin_password={{service-password}}
 quantum_admin_auth_url=http://{{keystone.host}}:35357/v2.0
 linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver
 fixed_range = 192.0.2.32/29
 service_quantum_metadata_proxy={{nova.metadata-proxy}}
-{{#quantum.metadata_proxy_shared_secret}}
-quantum_metadata_proxy_shared_secret={{quantum.metadata_proxy_shared_secret}}
-{{/quantum.metadata_proxy_shared_secret}}
+{{#neutron.metadata_proxy_shared_secret}}
+quantum_metadata_proxy_shared_secret={{neutron.metadata_proxy_shared_secret}}
+{{/neutron.metadata_proxy_shared_secret}}
 
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
diff --git a/elements/openstack-clients/README.md b/elements/openstack-clients/README.md
index 0f18a7375..ec7133dc7 100644
--- a/elements/openstack-clients/README.md
+++ b/elements/openstack-clients/README.md
@@ -8,4 +8,4 @@ Installed clients are:
     python-glanceclient
     python-heatclient
     python-novaclient
-    python-quantumclient
+    python-neutronclient
diff --git a/elements/openstack-db/install.d/50-openstack-db b/elements/openstack-db/install.d/50-openstack-db
index 6f1daf1eb..4c58f59a1 100755
--- a/elements/openstack-db/install.d/50-openstack-db
+++ b/elements/openstack-db/install.d/50-openstack-db
@@ -16,4 +16,4 @@ os-svc-install -u keystone -r https://github.com/openstack/keystone.git
 os-svc-install -u cinder   -r https://github.com/openstack/cinder.git
 os-svc-install -u nova     -r https://github.com/openstack/nova.git
 os-svc-install -u glance   -r https://github.com/openstack/glance.git
-os-svc-install -u quantum  -r https://github.com/openstack/quantum.git
+os-svc-install -u neutron  -r https://github.com/openstack/neutron.git
diff --git a/elements/quantum-network-node/element-deps b/elements/quantum-network-node/element-deps
deleted file mode 100644
index 2f47a253d..000000000
--- a/elements/quantum-network-node/element-deps
+++ /dev/null
@@ -1,2 +0,0 @@
-quantum
-quantum-openvswitch-agent
diff --git a/elements/quantum-network-node/install.d/80-quantum-networking b/elements/quantum-network-node/install.d/80-quantum-networking
deleted file mode 100755
index 3a0902715..000000000
--- a/elements/quantum-network-node/install.d/80-quantum-networking
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -eux
-
-os-svc-daemon -n quantum-l3-agent -u quantum -c quantum-l3-agent -- --config-file /etc/quantum/l3_agent.ini --config-dir /etc/quantum
-os-svc-daemon -n quantum-dhcp-agent -u quantum -c quantum-dhcp-agent -- --config-file /etc/quantum/dhcp_agent.ini --config-dir /etc/quantum
-os-svc-daemon -n quantum-metadata-agent -u quantum -c quantum-metadata-agent -- --config-file /etc/quantum/metadata_agent.ini --config-dir /etc/quantum
-
-# This has to be on the path of the agent that runs it http://pad.lv/1182704
-ln -sf /opt/stack/venvs/quantum/bin/quantum-ns-metadata-proxy /usr/bin
diff --git a/elements/quantum-openvswitch-agent/element-deps b/elements/quantum-openvswitch-agent/element-deps
deleted file mode 100644
index 710859ac2..000000000
--- a/elements/quantum-openvswitch-agent/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-quantum
diff --git a/elements/quantum-openvswitch-agent/install.d/80-quantum-openvswitch-agent b/elements/quantum-openvswitch-agent/install.d/80-quantum-openvswitch-agent
deleted file mode 100755
index 8159ff501..000000000
--- a/elements/quantum-openvswitch-agent/install.d/80-quantum-openvswitch-agent
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -eux
-install -m 0755 -o root -g root -t /usr/local/bin $(dirname $0)/../quantum-ovs-agent-bin/*
-os-svc-daemon quantum-openvswitch-agent quantum quantum-openvswitch-agent \
-    "--config-file /etc/quantum/quantum.conf  --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --config-dir /etc/quantum"
diff --git a/elements/quantum-openvswitch-agent/os-refresh-config/post-configure.d/80-quantum-openvswitch-agent b/elements/quantum-openvswitch-agent/os-refresh-config/post-configure.d/80-quantum-openvswitch-agent
deleted file mode 100755
index 89899d4f3..000000000
--- a/elements/quantum-openvswitch-agent/os-refresh-config/post-configure.d/80-quantum-openvswitch-agent
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -eux
-service quantum-openvswitch-agent restart
diff --git a/elements/quantum-server/README.md b/elements/quantum-server/README.md
deleted file mode 100644
index ca682398d..000000000
--- a/elements/quantum-server/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Install and configure Quantum server components.
diff --git a/elements/quantum-server/element-deps b/elements/quantum-server/element-deps
deleted file mode 100644
index 710859ac2..000000000
--- a/elements/quantum-server/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-quantum
diff --git a/elements/quantum-server/install.d/80-quantum-server b/elements/quantum-server/install.d/80-quantum-server
deleted file mode 100755
index b4d3e07dc..000000000
--- a/elements/quantum-server/install.d/80-quantum-server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-os-svc-daemon quantum-server quantum quantum-server \
-    "--config-file /etc/quantum/quantum.conf  --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --config-dir /etc/quantum"
diff --git a/elements/quantum-server/os-refresh-config/post-configure.d/80-quantum-server b/elements/quantum-server/os-refresh-config/post-configure.d/80-quantum-server
deleted file mode 100755
index 31162ee14..000000000
--- a/elements/quantum-server/os-refresh-config/post-configure.d/80-quantum-server
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -eux
-service quantum-server restart
diff --git a/elements/quantum/README.md b/elements/quantum/README.md
deleted file mode 100644
index d0d0c41a9..000000000
--- a/elements/quantum/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Install quantum service from git.
diff --git a/elements/quantum/install.d/76-quantum b/elements/quantum/install.d/76-quantum
deleted file mode 100755
index 25ee4c15e..000000000
--- a/elements/quantum/install.d/76-quantum
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eux
-
-DISTRO=`lsb_release -si` || true
-
-install-packages openvswitch-switch openvswitch-datapath-dkms
-os-svc-install -n quantum -u quantum -r https://github.com/openstack/neutron.git
-
-mkdir -p /var/lib/quantum && chown -R quantum:quantum /var/lib/quantum
-
-ln -sf /opt/stack/venvs/quantum/bin/quantum-rootwrap /usr/bin/quantum-rootwrap
-ln -sf /opt/stack/venvs/quantum/etc/quantum/rootwrap.d /etc/quantum/rootwrap.d
-
-echo "quantum ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/quantum
-chmod 0440 /etc/sudoers.d/quantum
-visudo -c
-
-if [ $DISTRO = "Fedora" ]; then
-    systemctl enable openvswitch.service
-fi
-
diff --git a/elements/quantum/install.d/99-quantumclient b/elements/quantum/install.d/99-quantumclient
deleted file mode 100755
index 329bb4cdd..000000000
--- a/elements/quantum/install.d/99-quantumclient
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -eux
-
-# Due to trunk quantum relying on trunk quantumclient, we need
-# trunk quantumclient - https://bugs.launchpad.net/quantum/+bug/1182732
-/opt/stack/venvs/quantum/bin/pip install -U git+https://github.com/openstack/python-quantumclient
diff --git a/elements/quantum/os-config-applier/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini b/elements/quantum/os-config-applier/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
deleted file mode 100644
index a7ce5347a..000000000
--- a/elements/quantum/os-config-applier/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[DATABASE]
-sql_connection = {{quantum.ovs_db}}
-
-reconnect_interval = 2
-
-[OVS]
-bridge_mappings = {{quantum.ovs.bridge_mappings}}
-network_vlan_ranges = {{quantum.ovs.network_vlan_ranges}}
-
-tenant_network_type = {{quantum.ovs.tenant_network_type}}
-tunnel_id_ranges = 1:1000
-enable_tunneling = {{quantum.ovs.enable_tunneling}}
-integration_bridge = br-int
-tunnel_bridge = br-tun
-local_ip = {{quantum.ovs.local_ip}}
-
-
-[AGENT]
-root_helper = sudo
-polling_interval = 2
-
-[SECURITYGROUP]
-firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
diff --git a/elements/seed-stack-config/README.md b/elements/seed-stack-config/README.md
index 6456c5df7..ff4dee853 100644
--- a/elements/seed-stack-config/README.md
+++ b/elements/seed-stack-config/README.md
@@ -15,7 +15,7 @@ Usage
 Edit config.json to customise it for your deployment environment. The default
 is configured for nova-baremetal operation in a seed VM. The configuration
 options are documented in the actual elements that use the configuration - e.g.
-nova, quantum etc.
+nova, neutron etc.
 
 Configuration keys
 ------------------
diff --git a/elements/seed-stack-config/config.json b/elements/seed-stack-config/config.json
index 19ea0b2c0..5b33ba006 100644
--- a/elements/seed-stack-config/config.json
+++ b/elements/seed-stack-config/config.json
@@ -48,9 +48,9 @@
     "db": "mysql://cinder:unset@localhost/cinder",
     "volume_size_mb": "5000"
   },
-  "quantum": {
+  "neutron": {
     "host": "127.0.0.1",
-    "ovs_db": "mysql://quantum:unset@localhost/ovs_quantum?charset=utf8",
+    "ovs_db": "mysql://neutron:unset@localhost/ovs_neutron?charset=utf8",
     "ovs": {
       "bridge_mappings": "ctlplane:br-ctlplane",
       "dnsmasq_range": ["192.0.2.4", "192.0.2.4"],