diff --git a/ccollect.sh b/ccollect
similarity index 100%
rename from ccollect.sh
rename to ccollect
diff --git a/tools/README b/tools/README
index 7312018..cc25edb 100644
--- a/tools/README
+++ b/tools/README
@@ -1,19 +1,19 @@
 Files and their tasks / destinations:
 
-ccollect_add_source.sh: bin
-ccollect_analyse_logs.sh: bin
-ccollect_create_source2.sh: ???
-ccollect_create_source.sh: ???
-ccollect_delete_source.sh: bin
-ccollect_list_intervals.sh: bin
-ccollect_logwrapper.sh: bin
-ccollect-stats.sh: ???
+ccollect_add_source: bin
+ccollect_analyse_logs: bin
+ccollect_create_source2: ???
+ccollect_create_source: ???
+ccollect_delete_source: bin
+ccollect_list_intervals: bin
+ccollect_logwrapper: bin
+ccollect-stats: ???
 config-pre-0.4-to-0.4.BUGS: only to be used for converting
-config-pre-0.4-to-0.4.sh: only to be used for converting
-config-pre-0.4-to-0.4.sub.sh: only to be used for converting
-config-pre-0.6-to-0.6.sh: only to be used for converting
-config-pre-0.6-to-0.6.sub.sh: only to be used for converting
-config-pre-0.7-to-0.7.sh: only to be used for converting
-config-pre-0.7-to-0.7.sub.sh: only to be used for converting
-gnu-du-backup-size-compare.sh
+config-pre-0.4-to-0.4: only to be used for converting
+config-pre-0.4-to-0.4.sub: only to be used for converting
+config-pre-0.6-to-0.6: only to be used for converting
+config-pre-0.6-to-0.6.sub: only to be used for converting
+config-pre-0.7-to-0.7: only to be used for converting
+config-pre-0.7-to-0.7.sub: only to be used for converting
+gnu-du-backup-size-compare
 README
diff --git a/tools/ccollect_add_source.sh b/tools/ccollect_add_source
similarity index 100%
rename from tools/ccollect_add_source.sh
rename to tools/ccollect_add_source
diff --git a/tools/ccollect_analyse_logs.sh b/tools/ccollect_analyse_logs
similarity index 100%
rename from tools/ccollect_analyse_logs.sh
rename to tools/ccollect_analyse_logs
diff --git a/tools/ccollect_archive_config.sh b/tools/ccollect_archive_config
similarity index 100%
rename from tools/ccollect_archive_config.sh
rename to tools/ccollect_archive_config
diff --git a/tools/ccollect_check_config.sh b/tools/ccollect_check_config
similarity index 100%
rename from tools/ccollect_check_config.sh
rename to tools/ccollect_check_config
diff --git a/tools/ccollect_delete_source.sh b/tools/ccollect_delete_source
similarity index 100%
rename from tools/ccollect_delete_source.sh
rename to tools/ccollect_delete_source
diff --git a/tools/ccollect_list_intervals.sh b/tools/ccollect_list_intervals
similarity index 100%
rename from tools/ccollect_list_intervals.sh
rename to tools/ccollect_list_intervals
diff --git a/tools/ccollect_logwrapper.sh b/tools/ccollect_logwrapper
similarity index 94%
rename from tools/ccollect_logwrapper.sh
rename to tools/ccollect_logwrapper
index ac7f496..95e6fbb 100755
--- a/tools/ccollect_logwrapper.sh
+++ b/tools/ccollect_logwrapper
@@ -58,7 +58,7 @@ _echo "Starting with arguments: $@"
 touch "${ccollect_logfile}" || _exit_err "Failed to create ${ccollect_logfile}"
 
 # First line in the logfile is always the commandline
-echo ccollect.sh "$@" > "${ccollect_logfile}" 2>&1
-ccollect.sh "$@" >> "${ccollect_logfile}" 2>&1
+echo ccollect "$@" > "${ccollect_logfile}" 2>&1
+ccollect "$@" >> "${ccollect_logfile}" 2>&1
 
 _echo "Finished."
diff --git a/tools/ccollect_stats.sh b/tools/ccollect_stats
similarity index 100%
rename from tools/ccollect_stats.sh
rename to tools/ccollect_stats
diff --git a/tools/config-pre-0.4-to-0.4.sh b/tools/config-pre-0.4-to-0.4
similarity index 100%
rename from tools/config-pre-0.4-to-0.4.sh
rename to tools/config-pre-0.4-to-0.4
diff --git a/tools/config-pre-0.4-to-0.4.sub.sh b/tools/config-pre-0.4-to-0.4.sub
similarity index 100%
rename from tools/config-pre-0.4-to-0.4.sub.sh
rename to tools/config-pre-0.4-to-0.4.sub
diff --git a/tools/config-pre-0.6-to-0.6.sh b/tools/config-pre-0.6-to-0.6
similarity index 96%
rename from tools/config-pre-0.6-to-0.6.sh
rename to tools/config-pre-0.6-to-0.6
index 58a538a..1a4bc2f 100755
--- a/tools/config-pre-0.6-to-0.6.sh
+++ b/tools/config-pre-0.6-to-0.6
@@ -30,7 +30,7 @@ if [ $# -ne 1 ]; then
 fi
 
 dir="$1"
-script=$(echo $0 | sed 's/\.sh$/.sub.sh/')
+script="${0}.sub"
 
 find "${dir}/sources/" -type f -name rsync_options -exec "${script}" {} \;
 
diff --git a/tools/config-pre-0.6-to-0.6.sub.sh b/tools/config-pre-0.6-to-0.6.sub
similarity index 100%
rename from tools/config-pre-0.6-to-0.6.sub.sh
rename to tools/config-pre-0.6-to-0.6.sub
diff --git a/tools/config-pre-0.7-to-0.7.sh b/tools/config-pre-0.7-to-0.7
similarity index 96%
rename from tools/config-pre-0.7-to-0.7.sh
rename to tools/config-pre-0.7-to-0.7
index 6d540ab..3098728 100755
--- a/tools/config-pre-0.7-to-0.7.sh
+++ b/tools/config-pre-0.7-to-0.7
@@ -29,7 +29,7 @@ if [ $# -ne 1 ]; then
 fi
 
 dir="$1"
-script=$(echo $0 | sed 's/\.sh$/.sub.sh/')
+script="${0}.sub"
 
 find "${dir}/sources/" -name destination -exec "${script}" {} \;
 
diff --git a/tools/config-pre-0.7-to-0.7.sub.sh b/tools/config-pre-0.7-to-0.7.sub
similarity index 100%
rename from tools/config-pre-0.7-to-0.7.sub.sh
rename to tools/config-pre-0.7-to-0.7.sub
diff --git a/tools/gnu-du-backup-size-compare.sh b/tools/gnu-du-backup-size-compare
similarity index 100%
rename from tools/gnu-du-backup-size-compare.sh
rename to tools/gnu-du-backup-size-compare
diff --git a/tools/report_success.sh b/tools/report_success
similarity index 100%
rename from tools/report_success.sh
rename to tools/report_success