diff --git a/script-drives-add b/script-drives-add
index 30007f12..b2e921fb 100644
--- a/script-drives-add
+++ b/script-drives-add
@@ -6,7 +6,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-drives-fix-btrfs-full b/script-drives-fix-btrfs-full
index 0163b30b..ddf04f75 100755
--- a/script-drives-fix-btrfs-full
+++ b/script-drives-fix-btrfs-full
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-files-permissions-reset b/script-files-permissions-reset
index 27012487..7ba00484 100755
--- a/script-files-permissions-reset
+++ b/script-files-permissions-reset
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-files-permissions-set b/script-files-permissions-set
index b13105ad..df53cbee 100755
--- a/script-files-permissions-set
+++ b/script-files-permissions-set
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/functions b/script-functions
similarity index 97%
rename from functions
rename to script-functions
index bca07299..ea54c957 100644
--- a/functions
+++ b/script-functions
@@ -7,7 +7,7 @@
 
 prompt() { read -pr "Enter $1: " "$1"; }
 
-askOk() {
+ask_ok() {
     declare response
     (( YES_SWITCH )) && return 0
     read -r -p "$* [y/N]: " response
diff --git a/script-install-motd b/script-install-motd
index 4f08d520..bb47b65b 100755
--- a/script-install-motd
+++ b/script-install-motd
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-install-reverse-proxy b/script-install-reverse-proxy
index 52ffdc8a..ec0dbdb9 100644
--- a/script-install-reverse-proxy
+++ b/script-install-reverse-proxy
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-system-scheduled-restart b/script-system-scheduled-restart
index 3c1ae968..7c8cc7fc 100755
--- a/script-system-scheduled-restart
+++ b/script-system-scheduled-restart
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-system-update b/script-system-update
index dc7f93cb..211e7989 100755
--- a/script-system-update
+++ b/script-system-update
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-system-update-r b/script-system-update-r
index ac4fd4ae..a466fca4 100755
--- a/script-system-update-r
+++ b/script-system-update-r
@@ -7,7 +7,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-user-add b/script-user-add
index 89b8e3ab..79471a9a 100755
--- a/script-user-add
+++ b/script-user-add
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-user-reset-password b/script-user-reset-password
index 1d464da6..75240f1b 100755
--- a/script-user-reset-password
+++ b/script-user-reset-password
@@ -7,7 +7,7 @@ unset user password
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-user-reset-x2go b/script-user-reset-x2go
index 0c7cd781..52945558 100755
--- a/script-user-reset-x2go
+++ b/script-user-reset-x2go
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/script-user-unban b/script-user-unban
index c6abca3d..fc1dc956 100755
--- a/script-user-unban
+++ b/script-user-unban
@@ -5,7 +5,7 @@
 parent="${BASH_SOURCE[0]}"
 parent=${parent%/*}
 
-[[ -f "$parent"/functions ]] && . "$parent"/functions || exit 1
+[[ -f "$parent"/script-functions ]] && . "$parent"/script-functions || exit 1
 
 is_root
 
diff --git a/smart-tests b/smart-tests
deleted file mode 120000
index e6bf00cf..00000000
--- a/smart-tests
+++ /dev/null
@@ -1 +0,0 @@
-../smart-tests
\ No newline at end of file