diff --git a/browser_patches/do_checkout.sh b/browser_patches/do_checkout.sh
index c107b6035e..dcf15a8d58 100755
--- a/browser_patches/do_checkout.sh
+++ b/browser_patches/do_checkout.sh
@@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
 cd "$(dirname "$0")"
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: do_something.sh [firefox|webkit]"
+  echo "usage: $(basename $0) [firefox|webkit]"
   echo
   echo "Produces a browser checkout ready to be built."
   echo
@@ -15,7 +15,7 @@ fi
 
 if [[ $# == 0 ]]; then
   echo "missing browser: 'firefox' or 'webkit'"
-  echo "try './do_something.sh --help' for more information"
+  echo "try './$(basename $0) --help' for more information"
   exit 1
 fi
 
@@ -40,7 +40,7 @@ elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then
   REMOTE_URL=""
   REMOTE_URL="https://github.com/webkit/webkit"
 else
-  echo ERROR: unknown browser to export - "$1"
+  echo ERROR: unknown browser - "$1"
   exit 1
 fi
 
diff --git a/browser_patches/firefox/archive.sh b/browser_patches/firefox/archive.sh
index b14e839c89..1d5e445c47 100755
--- a/browser_patches/firefox/archive.sh
+++ b/browser_patches/firefox/archive.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ ("$1" == "-h") || ("$1" == "--help") ]]; then
-  echo "usage: $0"
+  echo "usage: $(basename $0)"
   echo
   echo "Generate distributable .zip archive from ./checkout folder that was previously built."
   echo
diff --git a/browser_patches/check_cdn.sh b/browser_patches/tools/check_cdn.sh
similarity index 96%
rename from browser_patches/check_cdn.sh
rename to browser_patches/tools/check_cdn.sh
index 4ae89a6dc1..bf0f49aa5e 100755
--- a/browser_patches/check_cdn.sh
+++ b/browser_patches/tools/check_cdn.sh
@@ -3,7 +3,7 @@ set -e
 set +x
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: $0 [revision-to-start]"
+  echo "usage: $(basename $0) [revision-to-start]"
   echo
   echo "List CDN status for browser revisions"
   echo "Pass optional |revision-to-start| to limit revision search"
@@ -42,11 +42,11 @@ cd "$(dirname "$0")"
 
 FFOX_REVISION=$(cat firefox/BUILD_NUMBER)
 WK_REVISION=$(cat webkit/BUILD_NUMBER)
-# Read start revision if there's any.
 REVISION=$FFOX_REVISION
 if (( FFOX_REVISION < WK_REVISION )); then
   REVISION=$WK_REVISION
 fi
+# Read start revision if there's any.
 if [[ $# == 1 ]]; then
   REVISION=$1
 fi
diff --git a/browser_patches/upload.sh b/browser_patches/upload.sh
index 936267efb5..8c70d92f10 100755
--- a/browser_patches/upload.sh
+++ b/browser_patches/upload.sh
@@ -6,7 +6,7 @@ trap "cd $(pwd -P)" EXIT
 cd "$(dirname "$0")"
 
 if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: $0 [firefox|webkit]"
+  echo "usage: $(basename $0) [firefox|webkit]"
   echo
   echo "Archive and upload a browser"
   echo
@@ -17,7 +17,7 @@ fi
 
 if [[ $# == 0 ]]; then
   echo "missing browser: 'firefox' or 'webkit'"
-  echo "try '$0 --help' for more information"
+  echo "try '$(basename $0) --help' for more information"
   exit 1
 fi
 
diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh
index c96e493a06..14104deb89 100755
--- a/browser_patches/webkit/archive.sh
+++ b/browser_patches/webkit/archive.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ ("$1" == "-h") || ("$1" == "--help") ]]; then
-  echo "usage: $0"
+  echo "usage: $(basename $0)"
   echo
   echo "Generate distributable .zip archive from ./checkout folder that was previously built."
   echo