diff --git a/bin/backup b/bin/backup
index a051c36..660e1c7 100755
--- a/bin/backup
+++ b/bin/backup
@@ -20,7 +20,7 @@
 ##########
 _version() {
     cat <<VERSION
-backup v2.5.1
+backup v2.5.2
 Written by Sandor Semsey, Copyright (C) 2020, License MIT
 VERSION
 }
@@ -128,7 +128,7 @@ while :; do
                 SNAPSHOT) backup_mode=snapshot ;;
                 ARCHIVE) backup_mode=archive ;;
                 *)
-                    echo Not supported mode: "${1}" >&2
+                    echo backup: Not supported mode "'${1}'" >&2
                     _usage
                     exit 1
                     ;;
@@ -141,7 +141,7 @@ while :; do
                 24H) date_format=%T ;;
                 FULL) date_format=%F_%T ;;
                 *)
-                    echo Not supported format: "${1}" >&2
+                    echo backup: Not supported format "'${1}'" >&2
                     _usage
                     exit 1
                     ;;
@@ -163,7 +163,7 @@ while :; do
             ;;
         "") break ;;
         *)
-            echo Not supported option: "${1}" >&2
+            echo backup: Not supported option "'${1}'" >&2
             _usage
             exit 1
             ;;
diff --git a/bin/benchmark b/bin/benchmark
index 40e1413..2574e7d 100755
--- a/bin/benchmark
+++ b/bin/benchmark
@@ -18,7 +18,7 @@
 ############
 
 # Version
-version=1.2.5
+version=1.2.6
 # Individual benchmark time limit (seconds)
 # Quick benchmark
 test_run_time_quick=6
@@ -181,7 +181,7 @@ _run-benchmark() {
             return 0
             ;;
         *)
-            echo Not supported type >&2
+            echo benchmark: Not supported type "'${type}'" >&2
             return 1
             ;;
     esac
@@ -214,7 +214,7 @@ _filter-results() {
             return 0
             ;;
         *)
-            echo Not supported type >&2
+            echo benchmark: Not supported type "'${type}'" >&2
             return 1
             ;;
     esac
@@ -327,7 +327,7 @@ _print-summary() {
                 printf "%-15s [%-10s]  : " "${params[1]}" "${params[0]}"
                 ;;
             *)
-                echo Not supported testname: "${testname}" >&2
+                echo benchmark: Not supported testname "'${testname}'" >&2
                 exit 1
                 ;;
         esac
@@ -392,7 +392,7 @@ while :; do
             ;;
         "") break ;;
         *)
-            echo Not supported option: "${1}" >&2
+            echo benchmark: Not supported option "'${1}'" >&2
             _usage
             exit 1
             ;;
@@ -401,7 +401,7 @@ while :; do
 done
 
 if [[ -z "${sys_check}" && -z "${benchmark_depth}" ]]; then
-    echo "Benchmark depth missing (quick or full)" >&2
+    echo "benchmark: Benchmark depth missing (quick or full)" >&2
     exit 1
 fi
 
@@ -429,7 +429,7 @@ case "${benchmark_depth}" in
         ;;
     *)
         if [[ -z "${sys_check}" ]]; then
-            echo Not supported depth: "${benchmark_depth}" >&2
+            echo benchmark: Not supported depth "'${benchmark_depth}'" >&2
             _usage
             exit 1
         fi
@@ -444,7 +444,7 @@ if [[ -z "${sys_check}" ]]; then
     required_commands=(dd sha256sum bzip2 openssl lsblk sysbench curl)
     for cmd in "${required_commands[@]}"; do
         if ! command -v "${cmd}" >/dev/null 2>&1; then
-            echo Missing dependency: "${cmd}" >&2
+            echo benchmark: Missing dependency "'${cmd}'" >&2
             exit 1
         fi
     done
diff --git a/bin/clean b/bin/clean
index 4b3162c..b7867df 100755
--- a/bin/clean
+++ b/bin/clean
@@ -16,7 +16,7 @@
 ##########
 _version() {
     cat <<VERSION
-clean v2.0.1
+clean v2.0.2
 Written by Sandor Semsey, Copyright (C) 2023, License MIT
 VERSION
 }
@@ -85,7 +85,7 @@ while :; do
             ;;
         "") break ;;
         *)
-            echo Not supported option: "${1}" >&2
+            echo clean: Not supported option "'${1}'" >&2
             _usage
             exit 1
             ;;
@@ -95,7 +95,7 @@ done
 
 uid=$(id -u)
 if [[ "${uid}" -ne 0 ]]; then
-    echo Run as root! >&2
+    echo clean: Run as root! >&2
     exit 1
 fi