4 files changed, 4 insertions, 4 deletions
diff --git a/bin/custodian-dequeue b/bin/custodian-dequeue
index 46a62da..349ff31 100755
--- a/bin/custodian-dequeue
+++ b/bin/custodian-dequeue
@@ -57,7 +57,7 @@ require 'custodian/worker'
 #
 #  Entry-point to our code.
 #
-if __FILE__ == $0 then
+if __FILE__ == $PROGRAM_NAME then
 
   $help    = false
   $manual  = false
diff --git a/bin/custodian-enqueue b/bin/custodian-enqueue
index 86c253f..75d38ac 100755
--- a/bin/custodian-enqueue
+++ b/bin/custodian-enqueue
@@ -63,7 +63,7 @@ require 'custodian/settings'
 #
 #  Entry-point to our code.
 #
-if __FILE__ == $0 then
+if __FILE__ == $PROGRAM_NAME then
 
   $help   = false
   $manual = false
diff --git a/bin/custodian-queue b/bin/custodian-queue
index 978cbda..ed2c3be 100755
--- a/bin/custodian-queue
+++ b/bin/custodian-queue
@@ -52,7 +52,7 @@ require 'custodian/queue'
 #
 #  Entry-point to our code.
 #
-if __FILE__ == $0 then
+if __FILE__ == $PROGRAM_NAME then
 
   $FLUSH   = false
   $STATS   = false
diff --git a/bin/multi-ping b/bin/multi-ping
index ef14c4c..00ae466 100755
--- a/bin/multi-ping
+++ b/bin/multi-ping
@@ -106,7 +106,7 @@ hostname = ARGV.shift
 #  Abort if we don't have a hostname
 #
 if ( hostname.nil? )
-  puts "Usage: #{$0} hostname"
+  puts "Usage: #{$PROGRAM_NAME} hostname"
   exit 1
 end