diff --git a/lib/quantum b/lib/quantum
index afe99c48cb..a8708653cb 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -72,8 +72,8 @@ PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
 PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}
 
 # Set up default directories
-QUANTUM_DIR=$DEST/quantum
-QUANTUMCLIENT_DIR=$DEST/python-quantumclient
+QUANTUM_DIR=$DEST/neutron
+QUANTUMCLIENT_DIR=$DEST/python-neutronclient
 QUANTUM_AUTH_CACHE_DIR=${QUANTUM_AUTH_CACHE_DIR:-/var/cache/quantum}
 
 QUANTUM_CONF_DIR=/etc/quantum
diff --git a/stackrc b/stackrc
index 49cf0266ad..fc1e01d62a 100644
--- a/stackrc
+++ b/stackrc
@@ -118,11 +118,11 @@ PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
 PBR_BRANCH=${PBR_BRANCH:-master}
 
 # quantum service
-QUANTUM_REPO=${QUANTUM_REPO:-${GIT_BASE}/openstack/quantum.git}
+QUANTUM_REPO=${QUANTUM_REPO:-${GIT_BASE}/openstack/neutron.git}
 QUANTUM_BRANCH=${QUANTUM_BRANCH:-master}
 
 # quantum client
-QUANTUMCLIENT_REPO=${QUANTUMCLIENT_REPO:-${GIT_BASE}/openstack/python-quantumclient.git}
+QUANTUMCLIENT_REPO=${QUANTUMCLIENT_REPO:-${GIT_BASE}/openstack/python-neutronclient.git}
 QUANTUMCLIENT_BRANCH=${QUANTUMCLIENT_BRANCH:-master}
 
 # storage service