@@ -62,8 +62,8 @@ set +o xtrace

 # -----------------------------

 # 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

@@ -124,11 +124,11 @@ KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystone

 KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_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:-stable/grizzly}

 # 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}

 # Tempest test suite