diff --git a/README.md b/README.md
index 0cf341c..d1a2160 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ for persistent block volumes to be deployed against.
 
 Log in to your all_in_one node, and bootstrap it into production:
 
-    bash <(curl -fsS https://raw.github.com/CiscoSystems/openstack-installer/master/install-scripts/install.sh)
+    bash <(curl -fsS https://raw.github.com/stackforge/puppet\_openstack\_builder/master/install-scripts/install.sh)
 
 You can over-ride the default parameters, such as ethernet interface names, or hostname, and default ip address if you choose:
 
@@ -135,7 +135,7 @@ echo "compute_node_name: compute" >> /etc/puppet/data/role_mappings.yaml
 
 3) Configure the system to point ot the all_in_one node for puppet deployment and set up the right version of puppet on the node:
 
-    export build_server_ip=X.X.X.X ; export master=false ; bash <(curl -fsS https://raw.github.com/CiscoSystems/openstack-installer/master/install-scripts/install.sh)
+    export build_server_ip=X.X.X.X ; export master=false ; bash <(curl -fsS https://raw.github.com/stackforge/puppet\_openstack\_builder/master/install-scripts/install.sh)
 
 After which you may still have to run puppet in "agent" mode to actually deploy the openstack elements:
 
diff --git a/data/README.md b/data/README.md
index d4445fc..450f1ef 100644
--- a/data/README.md
+++ b/data/README.md
@@ -89,12 +89,12 @@ correct interface.
 
 ## Setup
 
-Applying [setup.pp](https://github.com/CiscoSystems/openstack-installer/blob/master/manifests/setup.pp)
+Applying [setup.pp](https://github.com/stackforge/puppet_openstack_builder/blob/master/manifests/setup.pp)
 will configure your nodes to use the data model. It does the following:
 
 1. Installs a version of Puppet greater than 3.0.
-2. [Sets the node\_terminus as scenario.](https://github.com/CiscoSystems/openstack-installer/blob/master/manifests/setup.pp#L97)
-3. [Configures hiera](https://github.com/CiscoSystems/openstack-installer/blob/master/manifests/setup.pp#L63)
+2. [Sets the node\_terminus as scenario.](https://github.com/stackforge/puppet_openstack_builder/blob/master/manifests/setup.pp#L97)
+3. [Configures hiera](https://github.com/stackforge/puppet_openstack_builder/blob/master/manifests/setup.pp#L63)
 
 ## Getting Started as a User
 
diff --git a/image-builder/CI-elements/CI-tools/first-boot.d/10-CI-run b/image-builder/CI-elements/CI-tools/first-boot.d/10-CI-run
index 873fe6a..62215ec 100755
--- a/image-builder/CI-elements/CI-tools/first-boot.d/10-CI-run
+++ b/image-builder/CI-elements/CI-tools/first-boot.d/10-CI-run
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-cd /root/openstack-installer/install-scripts
+cd /root/puppet_openstack_builder/install-scripts
 chmod 775 master.sh
 chmod 775 setup.sh
 
-/root/openstack-installer/install-scripts/setup.sh
+/root/puppet_openstack_builder/install-scripts/setup.sh
 
-/root/openstack-installer/install-scripts/master.sh
+/root/puppet_openstack_builder/install-scripts/master.sh
 
diff --git a/image-builder/CI-elements/CI-tools/install.d/10-CI-tools b/image-builder/CI-elements/CI-tools/install.d/10-CI-tools
index 880bc7e..7dd2016 100755
--- a/image-builder/CI-elements/CI-tools/install.d/10-CI-tools
+++ b/image-builder/CI-elements/CI-tools/install.d/10-CI-tools
@@ -5,9 +5,9 @@ apt-get install -y git
 apt-get install -d -y puppet rubygems curl python-yaml apache2
 
 
-# Install openstack-installer
+# Install puppet_openstack_builder
 cd /root/
-if ! [ -f openstack-installer ]; then
-    git clone https://github.com/CiscoSystems/openstack-installer.git /root/openstack-installer
+if ! [ -f puppet_openstack_builder ]; then
+    git clone https://github.com/CiscoSystems/puppet_openstack_builder.git /root/puppet_openstack_builder
 fi
 
diff --git a/install-scripts/install.sh b/install-scripts/install.sh
index 7ef0009..93055b6 100644
--- a/install-scripts/install.sh
+++ b/install-scripts/install.sh
@@ -31,10 +31,10 @@ else
   echo "127.0.1.1 $(hostname).$domain $(hostname)" >> /etc/hosts
 fi;
 
-# Install openstack-installer
+# Install puppet_openstack_builder
 cd /root/
-if ! [ -d openstack-installer ]; then
-  git clone https://github.com/CiscoSystems/openstack-installer.git /root/openstack-installer
+if ! [ -d puppet_openstack_builder ]; then
+  git clone https://github.com/stackforge/puppet_openstack_builder.git /root/puppet_openstack_builder
 fi
 
 
@@ -58,11 +58,11 @@ if ${master}; then
   # scenarios will map to /etc/puppet/data/scenarios/*.yaml
   export scenario="${scenario:-all_in_one}"
 
-  sed -e "s/scenario: .*/scenario: ${scenario}/" -i /root/openstack-installer/data/config.yaml
+  sed -e "s/scenario: .*/scenario: ${scenario}/" -i /root/puppet_openstack_builder/data/config.yaml
 
   if [ "${scenario}" == "all_in_one" ] ; then
-    echo `hostname`: all_in_one >> /root/openstack-installer/data/role_mappings.yaml
-    cat > /root/openstack-installer/data/hiera_data/user.yaml<<EOF
+    echo `hostname`: all_in_one >> /root/puppet_openstack_builder/data/role_mappings.yaml
+    cat > /root/puppet_openstack_builder/data/hiera_data/user.yaml<<EOF
 domain_name: "${domain}"
 ntp_servers:
   - ${ntp_server}
@@ -90,14 +90,14 @@ neutron::agents::ovs::local_ip: "%{ipaddress}"
 EOF
   fi
 
-  cd openstack-installer
+  cd puppet_openstack_builder
   gem install librarian-puppet-simple --no-ri --no-rdoc
   export git_protocol='https'
   librarian-puppet install --verbose
 
-  cp -R /root/openstack-installer/modules /etc/puppet/
-  cp -R /root/openstack-installer/data /etc/puppet/
-  cp -R /root/openstack-installer/manifests /etc/puppet/
+  cp -R /root/puppet_openstack_builder/modules /etc/puppet/
+  cp -R /root/puppet_openstack_builder/data /etc/puppet/
+  cp -R /root/puppet_openstack_builder/manifests /etc/puppet/
 
   export FACTER_build_server=${build_server}
 
diff --git a/install-scripts/master.sh b/install-scripts/master.sh
index f368510..8081392 100644
--- a/install-scripts/master.sh
+++ b/install-scripts/master.sh
@@ -27,13 +27,13 @@ export puppet_run_mode="apply"
 # scenarios will map to /etc/puppet/data/scenarios/*.yaml
 export scenario="${scenario:-all_in_one}"
 
-sed -e "s/scenario: .*/scenario: ${scenario}/" -i /root/openstack-installer/data/config.yaml
+sed -e "s/scenario: .*/scenario: ${scenario}/" -i /root/puppet_openstack_builder/data/config.yaml
 
 if [ "${scenario}" == "all_in_one" ] ; then
-  echo `hostname`: all_in_one >> /root/openstack-installer/data/role_mappings.yaml
+  echo `hostname`: all_in_one >> /root/puppet_openstack_builder/data/role_mappings.yaml
   export FACTER_build_server_ip=${build_server_ip}
   export FACTER_build_server=${build_server}
-  cat > /root/openstack-installer/data/hiera_data/user.yaml<<EOF
+  cat > /root/puppet_openstack_builder/data/hiera_data/user.yaml<<EOF
 domain_name: "${domain_name}"
 ntp_servers:
   - ${ntp_server}
@@ -61,11 +61,11 @@ neutron::agents::ovs::local_ip: "%{ipaddress}"
 EOF
 fi
 
-bash <(curl -fsS https://raw.github.com/CiscoSystems/openstack-installer/master/install-scripts/setup.sh)
+bash <(curl -fsS https://raw.github.com/stackforge/puppet_openstack_builder/master/install-scripts/setup.sh)
 
-cp -R /root/openstack-installer/modules /etc/puppet/
-cp -R /root/openstack-installer/data /etc/puppet/
-cp -R /root/openstack-installer/manifests /etc/puppet/
+cp -R /root/puppet_openstack_builder/modules /etc/puppet/
+cp -R /root/puppet_openstack_builder/data /etc/puppet/
+cp -R /root/puppet_openstack_builder/manifests /etc/puppet/
 
 
 puppet apply /etc/puppet/manifests/site.pp --certname ${build_server} --debug
diff --git a/install-scripts/setup.sh b/install-scripts/setup.sh
index 3f1a1e5..c246c94 100644
--- a/install-scripts/setup.sh
+++ b/install-scripts/setup.sh
@@ -27,13 +27,13 @@ else
   echo "127.0.1.1 $(hostname).$domain $(hostname)" >> /etc/hosts
 fi;
 
-# Install openstack-installer
+# Install puppet_openstack_builder
 cd /root/
-if ! [ -d openstack-installer ]; then
-  git clone https://github.com/CiscoSystems/openstack-installer.git /root/openstack-installer
+if ! [ -d puppet_openstack_builder ]; then
+  git clone https://github.com/stackforge/puppet_openstack_builder.git /root/puppet_openstack_builder
 fi
 
-cd openstack-installer
+cd puppet_openstack_builder
 gem install librarian-puppet-simple --no-ri --no-rdoc
 export git_protocol='https'
 librarian-puppet install --verbose
diff --git a/tests/basic_test.sh b/tests/basic_test.sh
index 8e72fa5..52af8a4 100755
--- a/tests/basic_test.sh
+++ b/tests/basic_test.sh
@@ -46,13 +46,13 @@ fi
 
 # check out a specific branch that we want to test
 if [ -n "${project_name:-}" ]; then
-  if [ ! "${project_name:-}" = 'openstack-installer' ]; then
+  if [ ! "${project_name:-}" = 'puppet_openstack_builder' ]; then
     pushd "modules/$project_name"
   fi
   if [ -n "${checkout_branch_command:-}" ]; then
     eval "${checkout_branch_command}"
   fi
-  if [ ! "${project_name:-}" = 'openstack-installer' ]; then
+  if [ ! "${project_name:-}" = 'puppet_openstack_builder' ]; then
     popd
   fi
 fi