fix variables

24 files changed, 159 insertions, 159 deletions

diff --git a/any-to-ours b/any-to-ours
index a55b62b..cbdacad 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -21,7 +21,7 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 BASEARCH='x86_64'
 
 # Traverse all Arch repos
-for _repo in "${ARCHREPOS[@]}"; do
+for _repo in "${derivative_repositories[@]}"; do
 	msg "Processing %s..." "${_repo}"
 
 	# Find 'any' packages
@@ -35,7 +35,7 @@ for _repo in "${ARCHREPOS[@]}"; do
 		continue
 	fi
 
-	for _arch in "${OURARCHES[@]}"; do
+	for _arch in "${native_architectures[@]}"; do
 		msg2 "Syncing %s..." "${_arch}"
 
 		# Sync 'any' only and extract the synced packages
diff --git a/create-repo b/create-repo
index 2ef3ace..2d82db0 100755
--- a/create-repo
+++ b/create-repo
@@ -12,10 +12,10 @@ fi
 msg "Creating repos..."
 for _repo in "$@"; do
 	msg2 "Creating [%s]" "${_repo}"
-	for _arch in "${ARCHES[@]}"; do
+	for _arch in "${architectures[@]}"; do
 		mkdir -p "${root_dir}/${_repo}/os/${_arch}" || \
 			error "Failed creating %s dir" "${_arch}"
 	done
 done
 
-msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
+msg "Don't forget to add them to the repositories array on %s" "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
diff --git a/createrepos b/createrepos
index 94fb9d5..c89b1d3 100755
--- a/createrepos
+++ b/createrepos
@@ -3,6 +3,6 @@
 
 source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
 
-mkdir -p -- "${root_dir}"/{"${PKGPOOL}","${SRCPOOL}"} "${cleanup_destination_directory}" "${source_cleanup_destination_directory}" "${staging_directory}"
+mkdir -p -- "${root_dir}"/{"${packages_pool}","${sources_pool}"} "${cleanup_destination_directory}" "${source_cleanup_destination_directory}" "${staging_directory}"
 
-"$(dirname "$(readlink -e "$0")")/create-repo" "${PKGREPOS[@]}"
+"$(dirname "$(readlink -e "$0")")/create-repo" "${repositories[@]}"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index fcf6879..43d5236 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -24,8 +24,8 @@ clean_pkg() {
 
 "${cleanup_dryrun}" && warning 'dry run mode is active'
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then
 			continue
 		fi
@@ -54,7 +54,7 @@ for repo in "${PKGREPOS[@]}"; do
 done
 
 # get a list of all available packages in the pacakge pool
-find "${root_dir}/${PKGPOOL}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
+find "${root_dir}/${packages_pool}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool"
 # create a list of packages in our db
 cat "${work_directory}/db-"* | sort -u > "${work_directory}/db"
 
@@ -63,7 +63,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	msg "Removing old packages from package pool..."
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
-		clean_pkg "${root_dir}/${PKGPOOL}/${old_pkg}"
+		clean_pkg "${root_dir}/${packages_pool}/${old_pkg}"
 	done
 fi
 
@@ -79,8 +79,8 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	done
 fi
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${arch}"
 	done
 done
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index f98e8fa..1963812 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -8,7 +8,7 @@ source "$(dirname "$(readlink -e "$0")")/../etc/dbscripts.cfg"
 source "$(dirname "$(readlink -e "$0")")/../share/db-functions"
 
 # Traverse all repos
-for _repo in "${PKGREPOS[@]}"; do
+for _repo in "${repositories[@]}"; do
 	msg "Cleaning up [%s]" "${_repo}"
 
 	# Find all pkgnames on this repo's abs
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index efa9523..efa9f09 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -7,8 +7,8 @@ pushd "${work_directory}" >/dev/null
 
 script_lock
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_lock "${repo}" "${arch}" || exit 1
 	done
 done
@@ -18,8 +18,8 @@ renice +10 -p $$ > /dev/null
 
 # Create a readable file for each repo with the following format
 # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>]
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		# Repo does not exist; skip it
 		if [ ! -f "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" ]; then
 			continue
@@ -39,17 +39,17 @@ for repo in "${PKGREPOS[@]}"; do
 	done | sort -u > "${work_directory}/db-${repo}"
 done
 
-for repo in "${PKGREPOS[@]}"; do
-	for arch in "${ARCHES[@]}"; do
+for repo in "${repositories[@]}"; do
+	for arch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${arch}"
 	done
 done
 
 # Create a list of all available source package file names
-find "${root_dir}/${SRCPOOL}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
+find "${root_dir}/${sources_pool}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs"
 
 # Check for all packages if we need to build a source package
-for repo in "${PKGREPOS[@]}"; do
+for repo in "${repositories[@]}"; do
 	newpkgs=()
 	failedpkgs=()
 	while read line; do
@@ -91,7 +91,7 @@ for repo in "${PKGREPOS[@]}"; do
 			pushd "${work_directory}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null
 			SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${work_directory}/${pkgbase}.log" 2>&1
 			if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${source_extension_suffixfile}" ]; then
-				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${SRCPOOL}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
+				mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${sources_pool}/${pkgbase}-${pkgver}${source_extension_suffixfile}"
 				# Avoid creating the same source package for every arch
 				echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${work_directory}/available-src-pkgs"
 				newpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}")
@@ -128,7 +128,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then
 	for old_pkg in "${old_pkgs[@]}"; do
 		msg2 '%s' "${old_pkg}"
 		if ! "${source_cleanup_dryrun}"; then
-			mv_acl "${root_dir}/${SRCPOOL}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
+			mv_acl "${root_dir}/${sources_pool}/${old_pkg}" "${source_cleanup_destination_directory}/${old_pkg}"
 			touch "${source_cleanup_destination_directory}/${old_pkg}"
 		fi
 	done
diff --git a/db-check-nonfree b/db-check-nonfree
index a1f54ee..e6eecb4 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -10,15 +10,15 @@ fi
 
 # TODO: this might lock too much (architectures)
 for repo in "${repos[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		repo_lock "${repo}" "${pkgarch}" || exit 1
 	done
 done
 
 msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 "${blacklist_file}" | sort -u))
-for repo in "${ARCHREPOS[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
+for repo in "${derivative_repositories[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		msg2 "%s %s" "$repo" "$pkgarch"
 		if [ ! -f "${root_dir}/${repo}/os/${pkgarch}/${repo}${database_extension_suffixfile}" ]; then
 			continue
@@ -40,7 +40,7 @@ for repo in "${ARCHREPOS[@]}"; do
 done
 
 for repo in "${repos[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${pkgarch}"
 	done
 done
diff --git a/db-cleanup b/db-cleanup
index 9426d11..e62681f 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -31,8 +31,8 @@ EXTRAFLAGS=()
 filter=$(mktemp -t "${0##*/}.XXXXXXXXXX")
 trap "rm -f -- $(printf %q "$filter")" EXIT
 
-for _repo in "${PKGREPOS[@]}"; do
-	for _arch in "${ARCHES[@]}"; do
+for _repo in "${repositories[@]}"; do
+	for _arch in "${architectures[@]}"; do
 		msg "Getting %s-%s database" "${_repo}" "${_arch}"
 
 		dbfile="${root_dir}/${_repo}/os/${_arch}/${_repo}${database_extension_suffixfile}"
@@ -53,7 +53,7 @@ done
 
 msg "Removing old files:"
 
-for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
+for POOL in "${packages_poolS[@]}" "${sources_poolS[@]}"; do
 	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
diff --git a/db-list-unsigned-packages b/db-list-unsigned-packages
index 1b2cf62..7ea91e0 100755
--- a/db-list-unsigned-packages
+++ b/db-list-unsigned-packages
@@ -31,7 +31,7 @@ fi
 arch=$1
 shift
 
-for repo in "${PKGREPOS[@]}"
+for repo in "${repositories[@]}"
 do
 	db="${root_dir}/${repo}/os/${arch}/${repo}.db"
 	[ -f "$db" ] && "$(dirname "$(readlink -e "$0")")/db-list-unsigned-packages.py" "$repo" "$@" < "$db"
diff --git a/db-move b/db-move
index 2714ff1..4c80d73 100755
--- a/db-move
+++ b/db-move
@@ -19,14 +19,14 @@ if ! check_repo_permission "$repo_to" || ! check_repo_permission "$repo_from"; t
 fi
 
 # TODO: this might lock too much (architectures)
-for pkgarch in "${ARCHES[@]}"; do
+for pkgarch in "${architectures[@]}"; do
 	repo_lock "${repo_to}" "${pkgarch}" || exit 1
 	repo_lock "${repo_from}" "${pkgarch}" || exit 1
 done
 
 # First loop is to check that all necessary files exist
 for pkgbase in "${args[@]:2}"; do
-	for pkgarch in "${ARCHES[@]}" 'any'; do
+	for pkgarch in "${architectures[@]}" 'any'; do
 		xbsrepo_from="$(xbs releasepath "${pkgbase}" "${repo_from}" "${pkgarch}")"
 		if [ -r "${xbsrepo_from}/PKGBUILD" ]; then
 			pkgnames=($(. "${xbsrepo_from}/PKGBUILD"; echo "${pkgname[@]}"))
@@ -40,7 +40,7 @@ for pkgbase in "${args[@]:2}"; do
 			fi
 
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=("${ARCHES[@]}")
+				tarches=("${architectures[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
@@ -68,7 +68,7 @@ for pkgbase in "${args[@]:2}"; do
 		xbsrepo_to="$(xbs releasepath "$pkgbase" "$repo_to" "$pkgarch")"
 		if true; then # to add an indent level to make merging easier
 			if [ "${pkgarch}" == 'any' ]; then
-				tarches=("${ARCHES[@]}")
+				tarches=("${architectures[@]}")
 			else
 				tarches=("${pkgarch}")
 			fi
@@ -81,11 +81,11 @@ for pkgbase in "${args[@]:2}"; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile})
 					pkgfile="${pkgpath##*/}"
 
-					ln -s "../../../${PKGPOOL}/${pkgfile}" "${ftppath_to}/${tarch}/"
-					if [ -f "${root_dir}/${PKGPOOL}/${pkgfile}.sig" ]; then
-						ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
+					ln -s "../../../${packages_pool}/${pkgfile}" "${ftppath_to}/${tarch}/"
+					if [ -f "${root_dir}/${packages_pool}/${pkgfile}.sig" ]; then
+						ln -s "../../../${packages_pool}/${pkgfile}.sig" "${ftppath_to}/${tarch}/"
 					fi
-					add_pkgs[${tarch}]+="${root_dir}/${PKGPOOL}/${pkgfile} "
+					add_pkgs[${tarch}]+="${root_dir}/${packages_pool}/${pkgfile} "
 					remove_pkgs[${tarch}]+="${pkgname} "
 				done
 			done
@@ -93,14 +93,14 @@ for pkgbase in "${args[@]:2}"; do
 	done
 done
 
-for tarch in "${ARCHES[@]}"; do
+for tarch in "${architectures[@]}"; do
 	if [ -n "${add_pkgs[${tarch}]}" ]; then
 		arch_repo_add "${repo_to}" "${tarch}" ${add_pkgs[${tarch}]}
 		arch_repo_remove "${repo_from}" "${tarch}" ${remove_pkgs[${tarch}]}
 	fi
 done
 
-for pkgarch in "${ARCHES[@]}"; do
+for pkgarch in "${architectures[@]}"; do
 	repo_unlock "${repo_from}" "${pkgarch}"
 	repo_unlock "${repo_to}" "${pkgarch}"
 done
diff --git a/db-remove b/db-remove
index f3f1b9d..24a6742 100755
--- a/db-remove
+++ b/db-remove
@@ -17,7 +17,7 @@ if ! check_repo_permission "$repo"; then
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=("${ARCHES[@]}")
+	tarches=("${architectures[@]}")
 else
 	tarches=("$arch")
 fi
diff --git a/db-repo-add b/db-repo-add
index 0813ecc..4ba0d2c 100755
--- a/db-repo-add
+++ b/db-repo-add
@@ -19,7 +19,7 @@ if ! check_repo_permission "$repo"; then
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=("${ARCHES[@]}")
+	tarches=("${architectures[@]}")
 else
 	tarches=("$arch")
 fi
diff --git a/db-repo-remove b/db-repo-remove
index bbab5af..5397437 100755
--- a/db-repo-remove
+++ b/db-repo-remove
@@ -19,7 +19,7 @@ if ! check_repo_permission "$repo"; then
 fi
 
 if [ "$arch" == "any" ]; then
-	tarches=("${ARCHES[@]}")
+	tarches=("${architectures[@]}")
 else
 	tarches=("$arch")
 fi
diff --git a/db-sync b/db-sync
index df8675e..6902828 100755
--- a/db-sync
+++ b/db-sync
@@ -69,8 +69,8 @@ init() {
 	get_repos
 
 	# Traverse all repo-arch pairs
-	for _repo in "${ARCHREPOS[@]}"; do
-		for _arch in "${ARCHARCHES[@]}"; do
+	for _repo in "${derivative_repositories[@]}"; do
+		for _arch in "${derivative_architectures[@]}"; do
 			msg "Processing %s-%s" "${_repo}-${_arch}"
 
 			db_file=$(get_repo_file "${_repo}" "${_arch}")${database_extension_suffixfile}
@@ -145,7 +145,7 @@ init() {
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
 	local pkgpool
-	for pkgpool in "${ARCHPKGPOOLS[@]}"; do
+	for pkgpool in "${ARCHpackages_poolS[@]}"; do
 		rsync "${extra[@]}" --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
@@ -164,7 +164,7 @@ init() {
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
 	local srcpool
-	for srcpool in "${ARCHSRCPOOLS[@]}"; do
+	for srcpool in "${ARCHsources_poolS[@]}"; do
 		rsync "${extra[@]}" --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
@@ -192,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
 source "$(dirname "$(readlink -e "$0")")/share/db-libremessages"
 
 # Check variables presence
-for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir ARCHSRCPOOLS ARCHPKGPOOLS; do
+for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir ARCHsources_poolS ARCHpackages_poolS; do
 	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
diff --git a/db-update b/db-update
index c674475..e3281c0 100755
--- a/db-update
+++ b/db-update
@@ -16,14 +16,14 @@ fi
 
 repos=()
 for staging_repo in "${staging_repos[@]##*/}"; do
-	if in_array "${staging_repo}" "${PKGREPOS[@]}"; then
+	if in_array "${staging_repo}" "${repositories[@]}"; then
 		repos+=("${staging_repo}")
 	fi
 done
 
 # TODO: this might lock too much (architectures)
 for repo in "${repos[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		repo_lock "${repo}" "${pkgarch}" || exit 1
 	done
 done
@@ -59,7 +59,7 @@ dirs=()
 for repo in "${repos[@]}"; do
 	msg "Updating [%s]..." "${repo}"
 	any_pkgs=($(getpkgfiles "${staging_directory}/${repo}/"*-any${package_extension_suffixfile} 2>/dev/null))
-	for pkgarch in "${ARCHES[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		add_dirs=()
 		add_pkgs=()
 		arch_pkgs=($(getpkgfiles "${staging_directory}/${repo}/"*-"${pkgarch}"${package_extension_suffixfile} 2>/dev/null))
@@ -68,17 +68,17 @@ for repo in "${repos[@]}"; do
 			msg2 "%s (%s)" "${pkgfile}" "${pkgarch}"
 			# any packages might have been moved by the previous run
 			if [ -f "${pkg}" ]; then
-				mv "${pkg}" "${root_dir}/${PKGPOOL}"
+				mv "${pkg}" "${root_dir}/${packages_pool}"
 			fi
-			ln -s "../../../${PKGPOOL}/${pkgfile}" "${root_dir}/$repo/os/${pkgarch}"
+			ln -s "../../../${packages_pool}/${pkgfile}" "${root_dir}/$repo/os/${pkgarch}"
 			# also move signatures
 			if [ -f "${pkg}.sig" ]; then
-				mv "${pkg}.sig" "${root_dir}/${PKGPOOL}"
+				mv "${pkg}.sig" "${root_dir}/${packages_pool}"
 			fi
-			if [ -f "${root_dir}/${PKGPOOL}/${pkgfile}.sig" ]; then
-				ln -s "../../../${PKGPOOL}/${pkgfile}.sig" "${root_dir}/$repo/os/${pkgarch}"
+			if [ -f "${root_dir}/${packages_pool}/${pkgfile}.sig" ]; then
+				ln -s "../../../${packages_pool}/${pkgfile}.sig" "${root_dir}/$repo/os/${pkgarch}"
 			fi
-			add_dirs+=("${staging_directory}/abslibre/$(getpkgarch "${root_dir}/$PKGPOOL/$pkgfile")/$repo/$(getpkgbase "${root_dir}/$PKGPOOL/$pkgfile")")
+			add_dirs+=("${staging_directory}/abslibre/$(getpkgarch "${root_dir}/$packages_pool/$pkgfile")/$repo/$(getpkgbase "${root_dir}/$packages_pool/$pkgfile")")
 			add_pkgs+=("${pkgfile}")
 		done
 		for add_dir in "${add_dirs[@]}"; do
@@ -93,7 +93,7 @@ for repo in "${repos[@]}"; do
 done
 
 for repo in "${repos[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
+	for pkgarch in "${architectures[@]}"; do
 		repo_unlock "${repo}" "${pkgarch}"
 	done
 done
diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
index 49b599e..3c4aef9 100644
--- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
@@ -1,31 +1,31 @@
 #!/hint/bash
 
-# Repos from Arch arm
-ARCHREPOS=('core' 'extra' 'community' 'aur' 'alarm')
-# Official Parabola repos
-OURREPOS=('libre' 'libre-testing')
-# User repos
-USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
-# Community project repos
-PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
-# Remote repos
-PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
-PKGPOOL='pool/parabola'
-SRCPOOL='sources/parabola'
+# Main repositories
+main_repositories=('libre' 'libre-testing')
+# Derivative repositories from Arch arm
+derivative_repositories=('core' 'extra' 'community' 'aur' 'alarm')
+# Community repositories
+community_repositories=('pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
+# Extra repositories
+extra_repositories=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'kernels' 'cross' 'java')
+# Remote repositories
+repositories=("${derivative_repositories[@]}" "${main_repositories[@]}" "${community_repositories[@]}" "${extra_repositories[@]}")
+packages_pool='pool/parabola'
+sources_pool='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-ARCHPKGPOOLS=(pool/arch_gnu+linux-arm_main)
-OURPKGPOOLS=(pool/parabola)
-PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+ARCHpackages_poolS=(pool/arch_gnu+linux-arm_main)
+OURpackages_poolS=(pool/parabola)
+packages_poolS=(${OURpackages_poolS[@]} ${ARCHpackages_poolS[@]})
 # Directories where sources are stored
-ARCHSRCPOOLS=(sources/arch_gnu+linux-arm_main)
-OURPKGPOOLS=(sources/parabola)
-SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+ARCHsources_poolS=(sources/arch_gnu+linux-arm_main)
+OURpackages_poolS=(sources/parabola)
+sources_poolS=(${OURsources_poolS[@]} ${ARCHsources_poolS[@]})
 
-ARCHARCHES=('arm' 'armv6h' 'armv7h' 'aarch64')
-OURARCHES=()
-ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+derivative_architectures=('arm' 'armv6h' 'armv7h' 'aarch64')
+native_architectures=()
+architectures=(${derivative_architectures[@]} ${native_architectures[@]})
 
 # db-sync
 #mirror="mirrors.kernel.org"
diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
index 00c5fee..b03179c 100644
--- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
@@ -1,31 +1,31 @@
 #!/hint/bash
 
-# Repos from Arch x86
-ARCHREPOS=('core' 'extra' 'testing' 'community' 'multilib' 'multilib-testing')
-# Official Parabola repos
-OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
-# User repos
-USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
-# Community project repos
-PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
-# Remote repos
-PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
-PKGPOOL='pool/parabola'
-SRCPOOL='sources/parabola'
+# Main repositories
+main_repositories=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
+# Derivative repositories from Arch x86
+derivative_repositories=('core' 'extra' 'testing' 'community' 'multilib' 'multilib-testing')
+# Community repositories
+community_repositories=('pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
+# Extra repositories
+extra_repositories=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'kernels' 'cross' 'java')
+# Remote repositories
+repositories=("${derivative_repositories[@]}" "${main_repositories[@]}" "${community_repositories[@]}" "${extra_repositories[@]}")
+packages_pool='pool/parabola'
+sources_pool='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
-ARCHPKGPOOLS=(pool/{packages,community})
-OURPKGPOOLS=(pool/parabola)
-PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+ARCHpackages_poolS=(pool/{packages,community})
+OURpackages_poolS=(pool/parabola)
+packages_poolS=(${OURpackages_poolS[@]} ${ARCHpackages_poolS[@]})
 # Directories where sources are stored
-ARCHSRCPOOLS=(sources/{packages,community})
-OURPKGPOOLS=(sources/parabola)
-SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+ARCHsources_poolS=(sources/{packages,community})
+OURpackages_poolS=(sources/parabola)
+sources_poolS=(${OURsources_poolS[@]} ${ARCHsources_poolS[@]})
 
-ARCHARCHES=('i686' 'x86_64')
-OURARCHES=()
-ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+derivative_architectures=('i686' 'x86_64')
+native_architectures=()
+architectures=(${derivative_architectures[@]} ${native_architectures[@]})
 
 # db-sync
 #mirror="mirrors.kernel.org"
diff --git a/mkrepo b/mkrepo
index 9419eb0..7d6622e 100755
--- a/mkrepo
+++ b/mkrepo
@@ -7,7 +7,7 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg"
 
 for repo in "$@"; do
 	echo ":: Creating [$repo]"
-	for arch in "${ARCHES[@]}"; do
+	for arch in "${architectures[@]}"; do
 		mkdir -pv "${root_dir}/${repo}/os/${arch}"
 	done
 done
diff --git a/share/db-functions b/share/db-functions
index 9afb9e2..ac7e6ef 100644
--- a/share/db-functions
+++ b/share/db-functions
@@ -338,7 +338,7 @@ check_pkgfile() {
 	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
-	in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
+	in_array "${pkgarch}" "${architectures[@]}" 'any' || return 1
 
 	if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
 		return 0
@@ -359,7 +359,7 @@ check_pkgxbs() {
 	[ $? -ge 1 ] && return 1
 	local repo="${2}"
 
-	in_array "${repo}" "${PKGREPOS[@]}" || return 1
+	in_array "${repo}" "${repositories[@]}" || return 1
 
 	local xbsver="$(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; get_full_version "${_pkgname}")"
 	[ "${xbsver}" == "${_pkgver}" ] || return 1
@@ -417,15 +417,15 @@ check_pkgrepos() {
 	local pkgarch="$(getpkgarch "${pkgfile}")"
 	[ $? -ge 1 ] && return 1
 
-	[ -f "${root_dir}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1
-	[ -f "${root_dir}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1
-	[ -f "${root_dir}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
-	[ -f "${root_dir}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
+	[ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1
+	[ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1
+	[ -f "${root_dir}/${packages_pool}/${pkgfile##*/}" ] && return 1
+	[ -f "${root_dir}/${packages_pool}/${pkgfile##*/}.sig" ] && return 1
 
 	local repo
 	local arch
-	for repo in "${PKGREPOS[@]}"; do
-		for arch in "${ARCHES[@]}"; do
+	for repo in "${repositories[@]}"; do
+		for arch in "${architectures[@]}"; do
 			[ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1
 			[ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1
 			[ -f "${root_dir}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
@@ -449,15 +449,15 @@ chk_license() {
 check_repo_permission() {
 	local repo=$1
 
-	[ ${#PKGREPOS[@]} -eq 0 ] && return 1
-	[ -z "${PKGPOOL}" ] && return 1
+	[ ${#repositories[@]} -eq 0 ] && return 1
+	[ -z "${packages_pool}" ] && return 1
 
-	in_array "${repo}" "${PKGREPOS[@]}" || return 1
+	in_array "${repo}" "${repositories[@]}" || return 1
 
-	[ -w "${root_dir}/${PKGPOOL}" ] || return 1
+	[ -w "${root_dir}/${packages_pool}" ] || return 1
 
 	local arch
-	for arch in "${ARCHES[@]}"; do
+	for arch in "${architectures[@]}"; do
 		local dir="${root_dir}/${repo}/os/${arch}/"
 		[ -w "${dir}" ] || return 1
 		[ -f "${dir}${repo}"${database_extension_suffixfile} -a ! -w "${dir}${repo}"${database_extension_suffixfile} ] && return 1
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 781737a..19caf80 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -59,18 +59,18 @@ setUp() {
 	temporary_directory="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)"
 	#msg "Using ${temporary_directory}"
 
-	PKGREPOS=('core' 'extra' 'testing')
-	PKGPOOL='pool/packages'
+	repositories=('core' 'extra' 'testing')
+	packages_pool='pool/packages'
 	mkdir -p "${temporary_directory}/"{ftp,tmp,staging,{package,source}-cleanup,svn-packages-{copy,repo}}
 
-	for r in ${PKGREPOS[@]}; do
+	for r in ${repositories[@]}; do
 		mkdir -p "${temporary_directory}/staging/${r}"
-		for a in ${ARCHES[@]} any; do
+		for a in ${architectures[@]} any; do
 			mkdir -p "${temporary_directory}/ftp/${r}/os/${a}"
 		done
 	done
-	mkdir -p "${temporary_directory}/ftp/${PKGPOOL}"
-	mkdir -p "${temporary_directory}/ftp/${SRCPOOL}"
+	mkdir -p "${temporary_directory}/ftp/${packages_pool}"
+	mkdir -p "${temporary_directory}/ftp/${sources_pool}"
 
 	msg 'Creating svn repository...'
 	svnadmin create "${temporary_directory}/svn-packages-repo"
@@ -87,8 +87,8 @@ setUp() {
 	cat <<eot > "$(dirname ${BASH_SOURCE[0]})/../../etc/dbscripts.local.cfg"
 	root_dir="${temporary_directory}/ftp"
 	SVN_repository="file://${temporary_directory}/svn-packages-repo"
-	PKGREPOS=(${PKGREPOS[@]})
-	PKGPOOL="${PKGPOOL}"
+	repositories=(${repositories[@]})
+	packages_pool="${packages_pool}"
 	cleanup_destination_directory="${temporary_directory}/package-cleanup"
 	source_cleanup_destination_directory="${temporary_directory}/source-cleanup"
 	staging_directory="${temporary_directory}/staging"
@@ -131,20 +131,20 @@ checkAnyPackageDB() {
 	local arch
 	local db
 
-	[ -r "${root_dir}/${PKGPOOL}/${pkg}" ] || fail "${PKGPOOL}/${pkg} not found"
+	[ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
 	if ${require_signature}; then
-		[ -r "${root_dir}/${PKGPOOL}/${pkg}.sig" ] || fail "${PKGPOOL}/${pkg}.sig not found"
+		[ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
 	fi
 
 	for arch in i686 x86_64; do
 		[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} is not a symlink"
-		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${PKGPOOL}/${pkg}" ] \
-			|| fail "${repo}/os/${arch}/${pkg} does not link to ${PKGPOOL}/${pkg}"
+		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
+			|| fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
 
 		if ${require_signature}; then
 			[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
-			[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${PKGPOOL}/${pkg}.sig" ] \
-				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${PKGPOOL}/${pkg}.sig"
+			[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
+				|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
 		fi
 	done
 	[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
@@ -166,7 +166,7 @@ checkAnyPackage() {
 
 	checkAnyPackageDB $repo $pkg
 
-	local pkgbase=$(getpkgbase "${root_dir}/${PKGPOOL}/${pkg}")
+	local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
 	svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
 	[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-any" ] \
 		|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-any does not exist"
@@ -178,20 +178,20 @@ checkPackageDB() {
 	local arch=$3
 	local db
 
-	[ -r "${root_dir}/${PKGPOOL}/${pkg}" ] || fail "${PKGPOOL}/${pkg} not found"
+	[ -r "${root_dir}/${packages_pool}/${pkg}" ] || fail "${packages_pool}/${pkg} not found"
 	[ -L "${root_dir}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} not a symlink"
 	[ -r "${staging_directory}"/${repo}/${pkg} ] && fail "${repo}/${pkg} found in staging directory"
 
-	[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${PKGPOOL}/${pkg}" ] \
-		|| fail "${repo}/os/${arch}/${pkg} does not link to ${PKGPOOL}/${pkg}"
+	[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}")" == "${root_dir}/${packages_pool}/${pkg}" ] \
+		|| fail "${repo}/os/${arch}/${pkg} does not link to ${packages_pool}/${pkg}"
 
 	if ${require_signature}; then
-		[ -r "${root_dir}/${PKGPOOL}/${pkg}.sig" ] || fail "${PKGPOOL}/${pkg}.sig not found"
+		[ -r "${root_dir}/${packages_pool}/${pkg}.sig" ] || fail "${packages_pool}/${pkg}.sig not found"
 		[ -L "${root_dir}/${repo}/os/${arch}/${pkg}.sig" ] || fail "${repo}/os/${arch}/${pkg}.sig is not a symlink"
 		[ -r "${staging_directory}"/${repo}/${pkg}.sig ] && fail "${repo}/${pkg}.sig found in staging directory"
 
-		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${PKGPOOL}/${pkg}.sig" ] \
-			|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${PKGPOOL}/${pkg}.sig"
+		[ "$(readlink -e "${root_dir}/${repo}/os/${arch}/${pkg}.sig")" == "${root_dir}/${packages_pool}/${pkg}.sig" ] \
+			|| fail "${repo}/os/${arch}/${pkg}.sig does not link to ${packages_pool}/${pkg}.sig"
 	fi
 
 	for db in ${database_extension_suffixfile} ${files_extension_suffixfile}; do
@@ -208,7 +208,7 @@ checkPackage() {
 
 	checkPackageDB $repo $pkg $arch
 
-	local pkgbase=$(getpkgbase "${root_dir}/${PKGPOOL}/${pkg}")
+	local pkgbase=$(getpkgbase "${root_dir}/${packages_pool}/${pkg}")
 	svn up -q "${temporary_directory}/svn-packages-copy/${pkgbase}"
 	[ -d "${temporary_directory}/svn-packages-copy/${pkgbase}/repos/${repo}-${arch}" ] \
 		|| fail "svn-packages-copy/${pkgbase}/repos/${repo}-${arch} does not exist"
diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh
index 01d53c4..3542dae 100755
--- a/test/test.d/db-repo-add.sh
+++ b/test/test.d/db-repo-add.sh
@@ -11,10 +11,10 @@ testAddSimplePackages() {
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
-			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${PKGPOOL}/"
-			touch "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
-			ln -s "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
-			ln -s "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
+			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${packages_pool}/"
+			touch "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
+			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
+			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
 			../db-repo-add extra ${arch} ${pkgbase}-1-1-${arch}.pkg.tar.xz
 		done
 	done
@@ -35,10 +35,10 @@ testAddMultiplePackages() {
 	for arch in ${arches[@]}; do
 		add_pkgs=()
 		for pkgbase in ${pkgs[@]}; do
-			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${PKGPOOL}/"
-			touch "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
-			ln -s "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
-			ln -s "${root_dir}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
+			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/${packages_pool}/"
+			touch "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
+			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${root_dir}/extra/os/${arch}/"
+			ln -s "${root_dir}/${packages_pool}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${root_dir}/extra/os/${arch}/"
 			add_pkgs[${#add_pkgs[*]}]=${pkgbase}-1-1-${arch}.pkg.tar.xz
 		done
 		../db-repo-add extra ${arch} ${add_pkgs[@]}
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh
index 5ba7fb3..3210fee 100755
--- a/test/test.d/ftpdir-cleanup.sh
+++ b/test/test.d/ftpdir-cleanup.sh
@@ -26,7 +26,7 @@ testCleanupSimplePackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-a' ${arch}
-		[ -f "${root_dir}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
+		[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
 		[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
@@ -57,7 +57,7 @@ testCleanupEpochPackages() {
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz"
 		checkRemovedPackage extra 'pkg-simple-epoch' ${arch}
-		[ -f "${root_dir}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
+		[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
 		[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 	done
 }
@@ -77,7 +77,7 @@ testCleanupAnyPackages() {
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	checkRemovedAnyPackage extra 'pkg-any-a'
-	[ -f "${root_dir}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
+	[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
 	[ -f "${root_dir}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
@@ -108,7 +108,7 @@ testCleanupSplitPackages() {
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}${package_extension_suffixfile}; do
 			checkRemovedPackage extra ${pkgs[0]} ${arch}
-			[ -f "${root_dir}/${PKGPOOL}/${pkg}" ] && fail "${PKGPOOL}/${pkg} found"
+			[ -f "${root_dir}/${packages_pool}/${pkg}" ] && fail "${packages_pool}/${pkg} found"
 			[ -f "${root_dir}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
 
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
index e74cf8b..1d00ee7 100755
--- a/test/test.d/pool-transition.sh
+++ b/test/test.d/pool-transition.sh
@@ -24,7 +24,7 @@ testMovePackagesWithoutPool() {
 		for old in 0 2; do
 			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${package_extension_suffixfile}; do
 				pkg=$(basename $pkg)
-				mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
+				mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
 			done
 		done
 	done
@@ -55,7 +55,7 @@ testUpdateAnyPackageWithoutPool() {
 	releasePackage extra pkg-any-a any
 	../db-update
 	# transform two packages to old style layout
-	mv -f "${root_dir}/${PKGPOOL}/${pkg1}" "${root_dir}/extra/os/any"
+	mv -f "${root_dir}/${packages_pool}/${pkg1}" "${root_dir}/extra/os/any"
 	for arch in i686 x86_64; do
 		ln -sf "../any/${pkg1}" "${root_dir}/extra/os/${arch}"
 	done
@@ -75,7 +75,7 @@ testUpdateAnyPackageWithoutPool() {
 
 	checkAnyPackage extra "${pkg2}"
 
-	[ -f "${root_dir}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
+	[ -f "${root_dir}/${packages_pool}/${pkg1}" ] && fail "${packages_pool}/${pkg1} found"
 	for arch in any i686 x86_64; do
 		[ -f "${root_dir}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
 	done
@@ -96,7 +96,7 @@ testMoveAnyPackagesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${package_extension_suffixfile}; do
 		pkg=$(basename $pkg)
-		mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/testing/os/any/${pkg}"
+		mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/testing/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${root_dir}/testing/os/${arch}/${pkg}"
 		done
@@ -133,7 +133,7 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
 	# transform a package to old style layout
 	for pkg in "${pkgdir}/pkg-any-a"/*-any${package_extension_suffixfile}; do
 		pkg=$(basename $pkg)
-		mv -f "${root_dir}/${PKGPOOL}/${pkg}" "${root_dir}/extra/os/any/${pkg}"
+		mv -f "${root_dir}/${packages_pool}/${pkg}" "${root_dir}/extra/os/any/${pkg}"
 		for arch in i686 x86_64; do
 			ln -sf "../any/${pkg}" "${root_dir}/extra/os/${arch}/${pkg}"
 		done
diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh
index d1adf1e..40debb6 100755
--- a/test/test.d/sourceballs.sh
+++ b/test/test.d/sourceballs.sh
@@ -18,7 +18,7 @@ testSourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${SRCPOOL}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -33,7 +33,7 @@ testAnySourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${SRCPOOL}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -54,7 +54,7 @@ testSplitSourceballs() {
 
 	../cron-jobs/sourceballs
 	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${root_dir}/${SRCPOOL}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
+		[ ! -r ${root_dir}/${sources_pool}/${pkgbase}-*${source_extension_suffixfile} ] && fail "source package not found!"
 	done
 }
 
@@ -77,8 +77,8 @@ testSourceballsCleanup() {
 	done
 
 	../cron-jobs/sourceballs
-	[ -r ${root_dir}/${SRCPOOL}/pkg-simple-a-*${source_extension_suffixfile} ] && fail "source package was not removed!"
-	[ ! -r ${root_dir}/${SRCPOOL}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!"
+	[ -r ${root_dir}/${sources_pool}/pkg-simple-a-*${source_extension_suffixfile} ] && fail "source package was not removed!"
+	[ ! -r ${root_dir}/${sources_pool}/pkg-simple-b-*${source_extension_suffixfile} ] && fail "source package not found!"
 }
 
 source "${curdir}/../lib/shunit2"