diff --git a/functions/update_functions.sh b/functions/command_update_functions.sh
similarity index 94%
rename from functions/update_functions.sh
rename to functions/command_update_functions.sh
index 970dc9773..7cc1c4cb2 100644
--- a/functions/update_functions.sh
+++ b/functions/command_update_functions.sh
@@ -15,7 +15,7 @@ echo -ne "\n"
 if [ -d "${rootdir}/functions/" ]; then
 	rm -rfv "${rootdir}/functions/"
 	exitcode=$?
-elif [ -z "${functionsdir}" ]; then
+elif [ -n "${functionsdir}" ]; then
 	rm -rfv "${functionsdir}/"*
 	exitcode=$?
 else
diff --git a/functions/core_getopt.sh b/functions/core_getopt.sh
index 47cd5f748..899b6257a 100644
--- a/functions/core_getopt.sh
+++ b/functions/core_getopt.sh
@@ -20,7 +20,7 @@ case "$getopt" in
 		forceupdate=1;
 		update_check.sh;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	v|validate)
 		command_validate.sh;;
 	m|monitor)
@@ -81,7 +81,7 @@ case "$getopt" in
 	u|update)
 		update_check.sh;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	m|monitor)
 		command_monitor.sh;;
 	et|email-test)
@@ -133,7 +133,7 @@ case "$getopt" in
 	r|restart)
 		fn_restart;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	m|monitor)
 		command_monitor.sh;;
 	et|email-test)
@@ -183,7 +183,7 @@ case "$getopt" in
 		forceupdate=1;
 		update_check.sh;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	v|validate)
 		command_validate.sh;;
 	m|monitor)
@@ -242,7 +242,7 @@ case "$getopt" in
 	r|restart)
 		fn_restart;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	m|monitor)
 		command_monitor.sh;;
 	et|email-test)
@@ -305,7 +305,7 @@ case "$getopt" in
 		forceupdate=1;
 		update_check.sh;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	v|validate)
 		command_validate.sh;;
 	m|monitor)
@@ -368,7 +368,7 @@ case "$getopt" in
 	r|restart)
 		fn_restart;;
 	uf|update-functions)
-		update_functions.sh;;
+		command_update_functions.sh;;
 	m|monitor)
 		command_monitor.sh;;
 	et|email-test)