diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
index c58f06e..8ec78f0 100755
--- a/HelperResources/CommonResources
+++ b/HelperResources/CommonResources
@@ -1012,10 +1012,10 @@ installAllServices ()
 	local service
 	# get list of services in the package's service directory
 	if [ -d "$servicesDir" ]; then
-		servicesList=$( cd "$servicesDir"; ls -d * 2> /dev/null )
+		servicesList=( $( cd "$servicesDir"; ls -d * 2> /dev/null ) )
 		if [ ! -z "$servicesList" ]; then
 			logMessage "installing services"
-			for service in $servicesList ; do
+			for service in ${servicesList[@]} ; do
 				if $installFailed; then break; fi
 				installService $service
 			done
@@ -1048,7 +1048,7 @@ uninstallAllServices ()
 	# uninstall services
 	if [ ! -z "$servicesList" ]; then
 		logMessage "uninstalling services"
-		for service in $servicesList ; do
+		for service in ${servicesList[@]} ; do
 			if [ -z "$service" ]; then
 				removeService $packageName
 			else
diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
index 403203a..6483c54 100644
--- a/blindInstall/SetupHelperVersion
+++ b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v8.0~17
+v8.0~18
diff --git a/changes b/changes
index 9870a09..33c3957 100644
--- a/changes
+++ b/changes
@@ -4,6 +4,7 @@ v8.0: (beta)
 	add TailscaleGX to default package list
 	fixed: PackageManager hangs if there is no setup script in package directory
 	fixed: package conflict message disappears
+	fixed: only first service is uninstalled
 
 v7.17:
 	services not always uninstalled
diff --git a/updatePackage b/updatePackage
index da2415f..60eff65 100755
--- a/updatePackage
+++ b/updatePackage
@@ -1169,22 +1169,18 @@ for package in $packageList; do
 		# convert old name formats
 		oldPath="$patchSourceDir/$baseName"
 		newPath="$oldPath-1"
-		if [ -e "$oldPath.source" ] || [ -e "$oldPath.edited" ] || [ -e "$oldPath.patch" ]; then
+		if [ -e "$oldPath.source" ] || [ -e "$oldPath.edited" ]; then
 			if [ -e "$newPath*" ]; then
 				logMessage "can't move .source and .edited patch files - ...-1... already exists"
 			else
 				if [ -e "$oldPath.source" ]; then
-					logMessage " renaming $baseName.source to $baseName-1.orig"
+					logMessage " renaming $baseName.source to $baseName.orig"
 					mv "$oldPath.source" "$newPath.orig"
 				fi
 				if [ -e "$oldPath.edited" ]; then
-					logMessage " renaming $baseName.edited to $baseName-1"
+					logMessage " renaming $baseName.edited to $baseName"
 					mv "$oldPath.edited" "$newPath"
 				fi
-				if [ -e "$oldPath.patch" ]; then
-					logMessage " renaming $baseName.patch to $baseName-1.patch"
-					mv "$oldPath.patch" "$newPath.patch"
-				fi
 			fi
 		fi
 		
diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz
index 5b81cc7..0d93a96 100644
Binary files a/venus-data-UninstallPackages.tgz and b/venus-data-UninstallPackages.tgz differ
diff --git a/venus-data.tgz b/venus-data.tgz
index 8f560ee..fc35543 100644
Binary files a/venus-data.tgz and b/venus-data.tgz differ
diff --git a/version b/version
index 403203a..6483c54 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v8.0~17
+v8.0~18