10 files changed, 18 insertions, 15 deletions
diff --git a/share/bash-completion/container b/share/bash-completion/container
index b1f3f93..4789b18 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -63,7 +63,7 @@ _container()
 		create|cr)
 			case "${prev}" in
 				-n|--name)
-					opts="$(cd /etc/open-infrastructure/container/debconf 2>/dev/null && ls *.cfg */*.cfg 2>/dev/null | sed -e 's|.*/||g' -e 's|.cfg$||g')"
+					opts="$(cd /etc/compute-tools/debconf 2>/dev/null && ls *.cfg */*.cfg 2>/dev/null | sed -e 's|.*/||g' -e 's|.cfg$||g')"
 					COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 					return 0
 					;;
diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh
index 823440f..9704206 100755
--- a/share/hooks/pre-create.git-pull.sh
+++ b/share/hooks/pre-create.git-pull.sh
@@ -20,9 +20,10 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 
-DIRECTORIES="/etc/${PROJECT}/${PROGRAM}/debconf /etc/${PROJECT}/${PROGRAM}/debconf/*/"
+DIRECTORIES="/etc/${SOFTWARE}/debconf /etc/${SOFTWARE}/debconf/*/"
 
 for DIRECTORY in ${DIRECTORIES}
 do
@@ -30,9 +31,9 @@ do
 	then
 		echo "Updating ${DIRECTORY}..."
 
-		if [ -e "/etc/${PROJECT}/${PROGRAM}.conf" ]
+		if [ -e "/etc/${SOFTWARE}.conf" ]
 		then
-			. "/etc/${PROJECT}/${PROGRAM}.conf"
+			. "/etc/${SOFTWARE}.conf"
 		fi
 
 		DEBCONF_ID="${DEBCONF_ID:-HEAD}"
diff --git a/share/hooks/pre-start.unlink-console.sh b/share/hooks/pre-start.unlink-console.sh
index 3133a19..f781167 100755
--- a/share/hooks/pre-start.unlink-console.sh
+++ b/share/hooks/pre-start.unlink-console.sh
@@ -20,9 +20,10 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+CONFIG="/etc/${SOFTWARE}/config"
 
 # Run
 if grep -qs 'bind=.*/dev:/dev;' "${CONFIG}/${NAME}.conf"
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
index 1095103..e049b23 100644
--- a/share/man/container-create-curl.1.txt
+++ b/share/man/container-create-curl.1.txt
@@ -83,7 +83,7 @@ FILES
 -----
 The following files are used:
 
-*/etc/open-infrastructure/container/config*::
+*/etc/compute-tools/config*::
 	Container configuration files.
 
 */usr/share/open-infrastructure/container/scripts*::
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index f4092a0..fb0a838 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -114,7 +114,7 @@ FILES
 -----
 The following files are used:
 
-*/etc/open-infrastructure/container/config*::
+*/etc/compute-tools/config*::
 	Container configuration files.
 
 */usr/share/open-infrastructure/container/scripts*::
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 179794f..60d757e 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -104,7 +104,7 @@ FILES
 -----
 The following files are used:
 
-*/etc/open-infrastructure/container*::
+*/etc/compute-tools/container*::
 	Container configuration files.
 
 */usr/bin/container*, */usr/bin/cnt*::
diff --git a/share/scripts/curl b/share/scripts/curl
index 465ecbe..7d7661a 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -24,8 +24,8 @@ SOFTWARE="compute-tools"
 PROGRAM="container"
 SCRIPT="${0}"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
-KEYS="/etc/${PROJECT}/${PROGRAM}/keys"
+HOOKS="/etc/${SOFTWARE}/hooks"
+KEYS="/etc/${SOFTWARE}/keys"
 MACHINES="/var/lib/machines"
 CACHE="/var/cache/${PROJECT}/${PROGRAM}/system"
 
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 7f2bf3d..0147212 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -25,8 +25,8 @@ PROGRAM="container"
 SCRIPT="${0}"
 export SCRIPT
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+CONFIG="/etc/${SOFTWARE}/config"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index 4fec6b0..edf26a0 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -20,9 +20,10 @@
 set -e
 
 PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
 PROGRAM="container"
 
-CONFIG="/etc/${PROJECT}/${PROGRAM}/debconf"
+CONFIG="/etc/${SOFTWARE}/debconf"
 
 DEBCONF_NOWARNINGS="true"
 export DEBCONF_NOWARNINGS
@@ -43,7 +44,7 @@ then
 elif [ "$(ls ${CONFIG}/*/${NAME}.cfg 2>/dev/null | wc -l)" -eq 1 ]
 then
 	# user did not specify a pressed file, but there is 1 (and only 1)
-	# matching in a sub-directory of /etc/${PROJECT}/${PROGRAM}/debconf
+	# matching in a sub-directory of /etc/${SOFTWARE}/debconf
 
 	FILE="$(ls ${CONFIG}/*/${NAME}.cfg)"
 
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index 98f202b..13a7746 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -25,7 +25,7 @@ PROGRAM="container"
 
 SCRIPT="$(basename ${0})"
 
-HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+HOOKS="/etc/${SOFTWARE}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()