Updating cache directory names to consistent naming scheme.

26 files changed, 104 insertions, 104 deletions

diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot
index 4314752d9..92e1667b6 100755
--- a/scripts/build/lb_binary_chroot
+++ b/scripts/build/lb_binary_chroot
@@ -73,7 +73,7 @@ then
 	exit 0
 fi
 
-if [ "${LB_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
+if [ "${LB_CACHE}" = "true" ] && Find_files cache/binary_rootfs/filesystem*
 then
 	exit 0
 fi
@@ -85,10 +85,10 @@ ${LB_ROOT_COMMAND} rm -rf chroot/chroot
 ${LB_ROOT_COMMAND} rm -rf chroot.tmp
 
 # Copying new chroot
-if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
+if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
 then
 	${LB_ROOT_COMMAND} mv chroot chroot.tmp
-	${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+	${LB_ROOT_COMMAND} cp -a cache/bootstrap chroot
 	${LB_ROOT_COMMAND} touch chroot/chroot.cache
 else
 	${LB_ROOT_COMMAND} cp -a chroot chroot.tmp
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 60cdfacfa..6d6d20b6c 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -73,7 +73,7 @@ Check_package chroot/usr/bin/wget wget
 Check_package chroot/usr/bin/apt-ftparchive apt-utils
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -521,14 +521,14 @@ then
 	if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 	then
 		# Including base debian packages
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1
 		then
-			for FILE in cache/packages_bootstrap/*.deb
+			for FILE in cache/packages.bootstrap/*.deb
 			do
 				Install_file "${FILE}" "binary/pool"
 			done
 		else
-			Echo_error "Could not find packages in cache/packages_bootstrap."
+			Echo_error "Could not find packages in cache/packages.bootstrap."
 			Echo_error "You selected values of LB_CACHE, LB_CACHE_PACKAGES, LB_CACHE_STAGES and LB_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
 			exit 1
 		fi
@@ -623,10 +623,10 @@ then
 
 	for UDEB in ${UDEBS}
 	do
-		if [ -f ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ]
+		if [ -f ../cache/packages.binary_debian-installer.udeb/"$(basename ${UDEB})" ]
 		then
 			# Copying cached udebs
-			cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
+			cp ../cache/packages.binary_debian-installer.udeb/"$(basename ${UDEB})" ./
 		else
 			# Downloading udebs
 			if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
@@ -637,9 +637,9 @@ then
 	done
 
 	# Caching udebs
-	rm -rf ../cache/packages_debian-installer.udeb
-	mkdir -p ../cache/packages_debian-installer.udeb
-	cp *.udeb ../cache/packages_debian-installer.udeb
+	rm -rf ../cache/packages.binary_debian-installer.udeb
+	mkdir -p ../cache/packages.binary_debian-installer.udeb
+	cp *.udeb ../cache/packages.binary_debian-installer.udeb
 
 	# Including local udebs
 	if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb
@@ -853,7 +853,7 @@ then
 fi
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 5da02b70b..4d94716bf 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -54,7 +54,7 @@ Check_crossarchitectures
 Check_package chroot/usr/sbin/grub grub-legacy
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -300,7 +300,7 @@ sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEN
 sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index 8aa2295dc..d88901d7b 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -54,7 +54,7 @@ Check_crossarchitectures
 Check_package chroot/usr/bin/grub-mkimage grub-pc
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -270,7 +270,7 @@ sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEN
 sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd
index 9679e61ad..687bca862 100755
--- a/scripts/build/lb_binary_hdd
+++ b/scripts/build/lb_binary_hdd
@@ -73,7 +73,7 @@ case "${LB_BOOTLOADER}" in
 esac
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -283,7 +283,7 @@ fi
 mv chroot/binary.img ./
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index f7710d100..2595e6bee 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -61,7 +61,7 @@ then
 fi
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -229,7 +229,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 esac
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest
index 71b2d0582..f66701d68 100755
--- a/scripts/build/lb_binary_memtest
+++ b/scripts/build/lb_binary_memtest
@@ -73,7 +73,7 @@ case "${LB_MEMTEST}" in
 esac
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -110,7 +110,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 esac
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net
index 250191680..5d8cdeed7 100755
--- a/scripts/build/lb_binary_net
+++ b/scripts/build/lb_binary_net
@@ -54,7 +54,7 @@ then
 	Check_package chroot/usr/bin/elftoaout sparc-utils
 
 	# Restoring cache
-	Restore_cache cache/packages_binary
+	Restore_cache cache/packages.binary
 
 	# Installing depends
 	Install_package
@@ -112,7 +112,7 @@ then
 	rm -f kernel.tmp
 
 	# Saving cache
-	Save_cache cache/packages_binary
+	Save_cache cache/packages.binary
 
 	# Removing depends
 	Remove_package
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index 791802140..431ec9773 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -42,7 +42,7 @@ if ls config/package-lists/*.list > /dev/null 2>&1 || \
    ls config/package-lists/*.list.binary > /dev/null 2>&1
 then
 	# Restoring cache
-	Restore_cache cache/packages_chroot
+	Restore_cache cache/packages.chroot
 
 	# Check depends
 	Check_package chroot/usr/bin/apt-ftparchive apt-utils
@@ -127,7 +127,7 @@ then
 	Remove_package
 
 	# Saving cache
-	Save_cache cache/packages_chroot
+	Save_cache cache/packages.chroot
 
 	# Creating stage file
 	Create_stagefile .build/binary_package-lists
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index e0abbe0f7..1328b9dfe 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -67,14 +67,14 @@ mkdir -p binary/${INITFS}
 
 for STAGE in ${LB_CACHE_STAGES}
 do
-	if [ "${STAGE}" = "rootfs" ] && [ -d cache/stages_rootfs ]
+	if [ "${STAGE}" = "rootfs" ] && [ -d cache/binary_rootfs ]
 	then
 		# Removing old chroot
 		rm -rf binary/"${INITFS}"/filesystem.*
 
 		# Restoring old cache
 		mkdir -p binary/"${INITFS}"
-		${LB_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
+		${LB_ROOT_COMMAND} cp -a cache/binary_rootfs/filesystem.* binary/"${INITFS}"
 
 		if [ -n "${LB_ROOT_COMMAND}" ]
 		then
@@ -93,7 +93,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs
 
 		# Restoring cache
-		Restore_cache cache/packages_binary
+		Restore_cache cache/packages.binary
 
 		# Installing depends
 		Install_package
@@ -211,7 +211,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		esac
 
 		# Saving cache
-		Save_cache cache/packages_binary
+		Save_cache cache/packages.binary
 		;;
 
 	jffs2)
@@ -219,7 +219,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		Check_package chroot/usr/sbin/mkfs.jffs2 mtd-tools
 
 		# Restoring cache
-		Restore_cache cache/packages_binary
+		Restore_cache cache/packages.binary
 
 		# Installing depends
 		Install_package
@@ -293,7 +293,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		esac
 
 		# Saving cache
-		Save_cache cache/packages_binary
+		Save_cache cache/packages.binary
 		;;
 
 	plain)
@@ -318,7 +318,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		Check_package chroot/usr/share/doc/squashfs-tools squashfs-tools
 
 		# Restoring cache
-		Restore_cache cache/packages_binary
+		Restore_cache cache/packages.binary
 
 		# Installing depends
 		Install_package
@@ -457,7 +457,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		fi
 
 		# Saving cache
-		Save_cache cache/packages_binary
+		Save_cache cache/packages.binary
 		;;
 
 	none)
@@ -484,18 +484,18 @@ for STAGE in ${LB_CACHE_STAGES}
 do
 	if [ "${STAGE}" = "rootfs" ]
 	then
-		rm -rf cache/stages_rootfs
+		rm -rf cache/binary_rootfs
 
-		mkdir -p cache/stages_rootfs
+		mkdir -p cache/binary_rootfs
 
 		if [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
 		then
-			${LB_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
+			${LB_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/binary_rootfs
 		fi
 
 		if [ -n "${LB_ROOT_COMMAND}" ]
 		then
-			${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_rootfs
+			${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/binary_rootfs
 		fi
 	fi
 done
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 587955cd2..31a2aad1b 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -64,7 +64,7 @@ Check_architectures sparc
 Check_package chroot/usr/sbin/silo silo
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -230,7 +230,7 @@ case "${LB_BINARY_IMAGES}" in
 esac
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index b07fd60cd..487245e3b 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -129,7 +129,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 esac
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -255,7 +255,7 @@ esac
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		# Saving cache
-		Save_cache cache/packages_binary
+		Save_cache cache/packages.binary
 
 		# Removing depends
 		Remove_package
diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd
index 88755102e..c25139a48 100755
--- a/scripts/build/lb_binary_virtual-hdd
+++ b/scripts/build/lb_binary_virtual-hdd
@@ -53,7 +53,7 @@ then
 fi
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -102,7 +102,7 @@ ${LB_ROOT_COMMAND} umount binary.tmp
 rmdir binary.tmp
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader
index 6ac4576f0..f0a5aebd8 100755
--- a/scripts/build/lb_binary_win32-loader
+++ b/scripts/build/lb_binary_win32-loader
@@ -51,7 +51,7 @@ case "${LB_ARCHITECTURES}" in
 			Check_package chroot/usr/share/win32/win32-loader.exe win32-loader
 
 			# Restoring cache
-			Restore_cache cache/packages_binary
+			Restore_cache cache/packages.binary
 
 			# Installing depends
 			Install_package
@@ -88,7 +88,7 @@ EOF
 		fi
 
 		# Saving cache
-		Save_cache cache/packages_binary
+		Save_cache cache/packages.binary
 
 		# Removing depends
 		Remove_package
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index 8318318e0..c4e21c88f 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -54,7 +54,7 @@ Check_crossarchitectures
 Check_package chroot/usr/lib/yaboot/yaboot yaboot
 
 # Restoring cache
-Restore_cache cache/packages_binary
+Restore_cache cache/packages.binary
 
 # Installing depends
 Install_package
@@ -275,7 +275,7 @@ case "${LB_BINARY_IMAGES}" in
 esac
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package
diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache
index 9323f27b9..fe50fe9f6 100755
--- a/scripts/build/lb_bootstrap_cache
+++ b/scripts/build/lb_bootstrap_cache
@@ -38,7 +38,7 @@ do
 				# Checking stage file
 				Check_stagefile .build/bootstrap_cache.restore
 
-				if [ -d cache/stages_bootstrap ]
+				if [ -d cache/bootstrap ]
 				then
 					# Checking lock file
 					Check_lockfile .lock
@@ -50,7 +50,7 @@ do
 					rm -rf chroot
 
 					# Restoring old cache
-					${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+					${LB_ROOT_COMMAND} cp -a cache/bootstrap chroot
 
 					if [ -n "${LB_ROOT_COMMAND}" ]
 					then
@@ -77,15 +77,15 @@ do
 				# Creating lock file
 				Create_lockfile .lock
 
-				rm -rf cache/stages_bootstrap
+				rm -rf cache/bootstrap
 
 				mkdir -p cache
 
-				${LB_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+				${LB_ROOT_COMMAND} cp -a chroot cache/bootstrap
 
 				if [ -n "${LB_ROOT_COMMAND}" ]
 				then
-					${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
+					${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/bootstrap
 				fi
 
 				# Creating stage file
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 4bd601dcd..0d5577a48 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -122,10 +122,10 @@ if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
 then
 	if [ "${LB_CACHE_PACKAGES}" = "true" ]
 	then
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1
 		then
 			mkdir -p chroot/var/cache/bootstrap
-			cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
+			cp cache/packages.bootstrap/*.deb chroot/var/cache/bootstrap
 		fi
 
 		Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
@@ -137,11 +137,11 @@ then
 		fi
 
 		# Removing old cache
-		rm -f cache/packages_bootstrap/*.deb
+		rm -f cache/packages.bootstrap/*.deb
 
 		# Saving new cache
-		mkdir -p cache/packages_bootstrap
-		cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
+		mkdir -p cache/packages.bootstrap
+		cp chroot/var/cache/bootstrap/*.deb cache/packages.bootstrap
 	fi
 
 	Echo_breakage "Running ${LB_BOOTSTRAP}... "
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index f5dd76839..080335d20 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -117,10 +117,10 @@ if [ -x "/usr/sbin/debootstrap" ]
 then
 	if [ "${LB_CACHE_PACKAGES}" = "true" ]
 	then
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1
 		then
 			mkdir -p chroot/var/cache/apt/archives
-			cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
+			cp cache/packages.bootstrap/*.deb chroot/var/cache/apt/archives
 		fi
 
 		Echo_breakage "Running debootstrap (download-only)... "
@@ -132,11 +132,11 @@ then
 		fi
 
 		# Removing old cache
-		rm -f cache/packages_bootstrap/*.deb
+		rm -f cache/packages.bootstrap/*.deb
 
 		# Saving new cache
-		mkdir -p cache/packages_bootstrap
-		cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
+		mkdir -p cache/packages.bootstrap
+		cp chroot/var/cache/apt/archives/*.deb cache/packages.bootstrap
 	fi
 
 	Echo_breakage "Running debootstrap... "
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 064c247f4..fb4a9e8ee 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -56,7 +56,7 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Restoring cache
-		Restore_cache cache/packages_chroot
+		Restore_cache cache/packages.chroot
 
 		# Configure custom sources.list
 
@@ -431,41 +431,41 @@ EOF
 		fi
 
 		# Update indices from cache
-		if [ "${LB_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
+		if [ "${LB_CACHE_INDICES}" = "true" ] && [ -d cache/indices.bootstrap ]
 		then
-			if Find_files cache/indices_bootstrap/secring.gpg*
+			if Find_files cache/indices.bootstrap/secring.gpg*
 			then
-				cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
+				cp -f cache/indices.bootstrap/secring.gpg* chroot/etc/apt
 			fi
 
-			if Find_files cache/indices_bootstrap/trusted.gpg*
+			if Find_files cache/indices.bootstrap/trusted.gpg*
 			then
-				cp -rf cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
+				cp -rf cache/indices.bootstrap/trusted.gpg* chroot/etc/apt
 			fi
 
-			if [ -f cache/indices_bootstrap/pkgcache.bin ]
+			if [ -f cache/indices.bootstrap/pkgcache.bin ]
 			then
-				cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
+				cp -f cache/indices.bootstrap/pkgcache.bin chroot/var/cache/apt
 			fi
 
-			if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
+			if [ -f cache/indices.bootstrap/srcpkgcache.bin ]
 			then
-				cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
+				cp -f cache/indices.bootstrap/srcpkgcache.bin chroot/var/cache/apt
 			fi
 
-			if Find_files cache/indices_bootstrap/*_Packages
+			if Find_files cache/indices.bootstrap/*_Packages
 			then
-				cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
+				cp -f cache/indices.bootstrap/*_Packages chroot/var/lib/apt/lists
 			fi
 
-			if Find_files cache/indices_bootstrap/*_Sources
+			if Find_files cache/indices.bootstrap/*_Sources
 			then
-				cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
+				cp -f cache/indices.bootstrap/*_Sources chroot/var/lib/apt/lists
 			fi
 
-			if Find_files cache/indices_bootstrap/*Release*
+			if Find_files cache/indices.bootstrap/*Release*
 			then
-				cp -f cache/indices_bootstrap/*Release* chroot/var/lib/apt/lists
+				cp -f cache/indices.bootstrap/*Release* chroot/var/lib/apt/lists
 			fi
 
 			if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
@@ -536,31 +536,31 @@ EOF
 
 			if [ "${LB_CACHE_INDICES}" = "true" ]
 			then
-				mkdir -p cache/indices_bootstrap
+				mkdir -p cache/indices.bootstrap
 
-				cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
-				cp -rf chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
+				cp -f chroot/etc/apt/secring.gpg* cache/indices.bootstrap
+				cp -rf chroot/etc/apt/trusted.gpg* cache/indices.bootstrap
 
-				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices.bootstrap
 
 				if Find_files chroot/var/cache/apt/srcpkgcache.bin
 				then
-					cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
+					cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices.bootstrap
 				fi
 
-				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices.bootstrap
 
 				if Find_files chroot/var/lib/apt/lists/*_Sources
 				then
-					cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+					cp -f chroot/var/lib/apt/lists/*_Sources cache/indices.bootstrap
 				fi
 
-				cp -f chroot/var/lib/apt/lists/*Release* cache/indices_bootstrap
+				cp -f chroot/var/lib/apt/lists/*Release* cache/indices.bootstrap
 			fi
 		fi
 
 		# Saving cache
-		Save_cache cache/packages_chroot
+		Save_cache cache/packages.chroot
 
 		# Creating stage file
 		Create_stagefile .build/chroot_archives
diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache
index 876b0259f..ba9560065 100755
--- a/scripts/build/lb_chroot_cache
+++ b/scripts/build/lb_chroot_cache
@@ -35,7 +35,7 @@ do
 				# Checking stage file
 				Check_stagefile .build/chroot_cache.restore
 
-				if [ -d cache/stages_chroot ]
+				if [ -d cache/chroot ]
 				then
 					# Checking lock file
 					Check_lockfile .lock
@@ -47,7 +47,7 @@ do
 					rm -rf chroot
 
 					# Restoring old cache
-					${LB_ROOT_COMMAND} cp -a cache/stages_chroot chroot
+					${LB_ROOT_COMMAND} cp -a cache/chroot chroot
 
 					if [ -n "${LB_ROOT_COMMAND}" ]
 					then
@@ -73,15 +73,15 @@ do
 				# Creating lock file
 				Create_lockfile .lock
 
-				rm -rf cache/stages_chroot
+				rm -rf cache/chroot
 
 				mkdir -p cache
 
-				${LB_ROOT_COMMAND} cp -a chroot cache/stages_chroot
+				${LB_ROOT_COMMAND} cp -a chroot cache/chroot
 
 				if [ -n "${LB_ROOT_COMMAND}" ]
 				then
-					${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_chroot
+					${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/chroot
 				fi
 
 				# Creating stage file
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index d74598abc..b07474d7a 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -76,7 +76,7 @@ fi
 if Find_files config/hooks/*.chroot
 then
 	# Restoring cache
-	Restore_cache cache/packages_chroot
+	Restore_cache cache/packages.chroot
 
 	for _HOOK in config/hooks/*.chroot
 	do
@@ -97,7 +97,7 @@ then
 	done
 
 	# Saving cache
-	Save_cache cache/packages_chroot
+	Save_cache cache/packages.chroot
 
 	# Creating stage file
 	Create_stagefile .build/chroot_hooks
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages
index 3565fb6b7..ed5119d94 100755
--- a/scripts/build/lb_chroot_install-packages
+++ b/scripts/build/lb_chroot_install-packages
@@ -45,7 +45,7 @@ Create_lockfile .lock
 if [ -e chroot/root/packages.chroot ] && [ -s chroot/root/packages.chroot ]
 then
 	# Restoring cache
-	Restore_cache cache/packages_chroot
+	Restore_cache cache/packages.chroot
 
 	# Installing packages
 	case "${LB_APT}" in
@@ -62,7 +62,7 @@ then
 	rm -f chroot/root/packages.chroot
 
 	# Saving cache
-	Save_cache cache/packages_chroot
+	Save_cache cache/packages.chroot
 
 fi
 
diff --git a/scripts/build/lb_chroot_local-patches b/scripts/build/lb_chroot_local-patches
index ce4654ded..f1a52396c 100755
--- a/scripts/build/lb_chroot_local-patches
+++ b/scripts/build/lb_chroot_local-patches
@@ -41,7 +41,7 @@ Create_lockfile .lock
 if Find_files config/chroot_local-patches/
 then
 	# Restoring cache
-	Restore_cache cache/packages_chroot
+	Restore_cache cache/packages.chroot
 
 	# Checking depends
 	Check_package chroot/usr/bin/patch patch
@@ -59,7 +59,7 @@ then
 	Remove_package
 
 	# Saving cache
-	Save_cache cache/packages_chroot
+	Save_cache cache/packages.chroot
 
 	# Creating stage file
 	Create_stagefile .build/chroot_local-patches
diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists
index ac1197e07..c223a6859 100755
--- a/scripts/build/lb_chroot_task-lists
+++ b/scripts/build/lb_chroot_task-lists
@@ -58,7 +58,7 @@ then
 	done
 
 	# Restoring cache
-	Restore_cache cache/packages_chroot
+	Restore_cache cache/packages.chroot
 
 	# Checking depends
 	case "${LB_TASKSEL}" in
@@ -144,7 +144,7 @@ then
 	rm -f chroot/root/chroot_tasks
 
 	# Saving cache
-	Save_cache cache/packages_chroot
+	Save_cache cache/packages.chroot
 
 	# Creating stage file
 	Create_stagefile .build/chroot_task-lists.${_PASS}
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 67282de7d..e61c14b7f 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -109,7 +109,7 @@ do
 
 		--remove)
 			LB=1 "${0}" --all
-			rm -rf cache/packages_*
+			rm -rf cache/packages.*
 			;;
 
 		--purge)
diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd
index 52566694c..5d861d8df 100755
--- a/scripts/build/lb_source_virtual-hdd
+++ b/scripts/build/lb_source_virtual-hdd
@@ -97,7 +97,7 @@ ${LB_ROOT_COMMAND} umount source.tmp
 rmdir source.tmp
 
 # Saving cache
-Save_cache cache/packages_binary
+Save_cache cache/packages.binary
 
 # Removing depends
 Remove_package