diff --git a/chef/lib/chef/knife.rb b/chef/lib/chef/knife.rb
index d0d8cae9505..e3a704fccb8 100644
--- a/chef/lib/chef/knife.rb
+++ b/chef/lib/chef/knife.rb
@@ -29,6 +29,10 @@ class Knife
 
     attr_accessor :name_args
 
+    def self.msg(msg)
+      puts msg
+    end
+
     # Load all the sub-commands
     def self.load_commands
       @sub_classes = Hash.new
@@ -44,7 +48,7 @@ def self.load_commands
 
     def self.list_commands
       load_commands
-      puts "SUB-COMMANDS (for details, knife SUBCMD --help)\n\n"
+      puts "Available SUB-COMMANDS (for details, knife SUB-COMMAND --help)\n\n"
       ch = Hash.new { |h, k| h[k] = [] }
       @sub_classes.keys.sort.each do |c|
         k = c
@@ -91,7 +95,7 @@ def self.find_command(args=ARGV, merge_opts={})
       end
 
       unless klass_instance
-        puts "Cannot find sub command for: #{args.join(' ')}"
+        puts "Cannot find sub-command for: #{args.join(' ')}"
         Chef::Knife.list_commands
         exit 10
       end
@@ -149,7 +153,7 @@ def configure_chef
         Chef::Config.from_file(config[:config_file])
       else
         # ...but do log a message if no config was found.
-        Chef::Log.info("No knife configuration file found")
+        self.msg("No knife configuration file found")
       end
 
       Chef::Config[:log_level] = config[:log_level] if config[:log_level]
@@ -253,11 +257,11 @@ def confirm(question, append_instructions=true)
       when "Y", "y"
         true
       when "N", "n"
-        Chef::Log.info("You said no, so I'm done here.")
+        self.msg("You said no, so I'm done here.")
         exit 3 
       else
-        Chef::Log.error("I have no idea what to do with #{answer}")
-        Chef::Log.error("Just say Y or N, please.")
+        self.msg("I have no idea what to do with #{answer}")
+        self.msg("Just say Y or N, please.")
         confirm(question)
       end
     end
@@ -312,7 +316,7 @@ def edit_object(klass, name)
       
       output.save
 
-      Chef::Log.info("Saved #{output}")
+      self.msg("Saved #{output}")
 
       output(format_for_display(object)) if config[:print_after]
     end
@@ -328,7 +332,7 @@ def create_object(object, pretty_name=nil, &block)
 
       pretty_name ||= output
 
-      Chef::Log.info("Created (or updated) #{pretty_name}")
+      self.msg("Created (or updated) #{pretty_name}")
       
       output(output) if config[:print_after]
     end
@@ -346,7 +350,7 @@ def delete_object(klass, name, delete_name=nil, &block)
       output(format_for_display(object)) if config[:print_after]
 
       obj_name = delete_name ? "#{delete_name}[#{name}]" : object
-      Chef::Log.warn("Deleted #{obj_name}!")
+      self.msg("Deleted #{obj_name}!")
     end
 
     def bulk_delete(klass, fancy_name, delete_name=nil, list=nil, regex=nil, &block)
@@ -373,7 +377,7 @@ def bulk_delete(klass, fancy_name, delete_name=nil, list=nil, regex=nil, &block)
           object.destroy
         end
         output(format_for_display(object)) if config[:print_after]
-        Chef::Log.warn("Deleted #{fancy_name} #{name}")
+        self.msg("Deleted #{fancy_name} #{name}")
       end
     end
     
diff --git a/chef/lib/chef/knife/bootstrap.rb b/chef/lib/chef/knife/bootstrap.rb
index 77f0e032d7e..c001ed5e0b6 100644
--- a/chef/lib/chef/knife/bootstrap.rb
+++ b/chef/lib/chef/knife/bootstrap.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class Bootstrap < Knife
 
-      banner "Sub-Command: knife bootstrap FQDN [RUN LIST...] (options)"
+      banner "knife bootstrap FQDN [RUN LIST...] (options)"
 
       option :ssh_user,
         :short => "-x USERNAME",
diff --git a/chef/lib/chef/knife/client_bulk_delete.rb b/chef/lib/chef/knife/client_bulk_delete.rb
index e1dfcbf0fee..9f7e0c8ace8 100644
--- a/chef/lib/chef/knife/client_bulk_delete.rb
+++ b/chef/lib/chef/knife/client_bulk_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientBulkDelete < Knife
 
-      banner "Sub-Command: client bulk delete REGEX (options)"
+      banner "knife client bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1
diff --git a/chef/lib/chef/knife/client_create.rb b/chef/lib/chef/knife/client_create.rb
index 1eac0e389be..d25e77f4e24 100644
--- a/chef/lib/chef/knife/client_create.rb
+++ b/chef/lib/chef/knife/client_create.rb
@@ -35,7 +35,7 @@ class ClientCreate < Knife
         :description => "Create the client as an admin",
         :boolean => true
 
-      banner "Sub-Command: client create CLIENT (options)"
+      banner "knife client create CLIENT (options)"
 
       def run
         @client_name = @name_args[0]
diff --git a/chef/lib/chef/knife/client_delete.rb b/chef/lib/chef/knife/client_delete.rb
index 34e13fbe5af..2815369e5cc 100644
--- a/chef/lib/chef/knife/client_delete.rb
+++ b/chef/lib/chef/knife/client_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientDelete < Knife
 
-      banner "Sub-Command: client delete CLIENT (options)"
+      banner "knife client delete CLIENT (options)"
 
       def run 
         @client_name = @name_args[0]
diff --git a/chef/lib/chef/knife/client_edit.rb b/chef/lib/chef/knife/client_edit.rb
index c9e13068ba0..293e2ae9042 100644
--- a/chef/lib/chef/knife/client_edit.rb
+++ b/chef/lib/chef/knife/client_edit.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientEdit < Knife
 
-      banner "Sub-Command: client edit CLIENT (options)"
+      banner "knife client edit CLIENT (options)"
 
       def run
         @client_name = @name_args[0]
diff --git a/chef/lib/chef/knife/client_list.rb b/chef/lib/chef/knife/client_list.rb
index c6f3ca51361..1a0942ae4a2 100644
--- a/chef/lib/chef/knife/client_list.rb
+++ b/chef/lib/chef/knife/client_list.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientList < Knife
 
-      banner "Sub-Command: client list (options)"
+      banner "knife client list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/client_reregister.rb b/chef/lib/chef/knife/client_reregister.rb
index 63cf2ce30fe..e865b8bf668 100644
--- a/chef/lib/chef/knife/client_reregister.rb
+++ b/chef/lib/chef/knife/client_reregister.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientReregister < Knife
 
-      banner "Sub-Command: client reregister CLIENT (options)"
+      banner "knife client reregister CLIENT (options)"
 
       option :file,
         :short => "-f FILE",
diff --git a/chef/lib/chef/knife/client_show.rb b/chef/lib/chef/knife/client_show.rb
index d48d396b313..7c84b6cfabd 100644
--- a/chef/lib/chef/knife/client_show.rb
+++ b/chef/lib/chef/knife/client_show.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class ClientShow < Knife
 
-      banner "Sub-Command: client show CLIENT (options)"
+      banner "knife client show CLIENT (options)"
 
       option :attribute,
         :short => "-a ATTR",
diff --git a/chef/lib/chef/knife/configure.rb b/chef/lib/chef/knife/configure.rb
index c5e14930c11..84133e787b8 100644
--- a/chef/lib/chef/knife/configure.rb
+++ b/chef/lib/chef/knife/configure.rb
@@ -24,7 +24,7 @@ class Configure < Knife
       attr_reader :chef_server, :new_client_name, :admin_client_name, :admin_client_key
       attr_reader :chef_repo, :new_client_key, :validation_client_name, :validation_key
 
-      banner "Sub-Command: configure (options)"
+      banner "knife configure (options)"
 
       option :repository,
         :short => "-r REPO",
diff --git a/chef/lib/chef/knife/cookbook_bulk_delete.rb b/chef/lib/chef/knife/cookbook_bulk_delete.rb
index 95332b9ad5d..a3700b134b6 100644
--- a/chef/lib/chef/knife/cookbook_bulk_delete.rb
+++ b/chef/lib/chef/knife/cookbook_bulk_delete.rb
@@ -26,7 +26,7 @@ class CookbookBulkDelete < Knife
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
       
-      banner "Sub-Command: cookbook bulk delete REGEX (options)"
+      banner "knife cookbook bulk delete REGEX (options)"
 
       def run
         unless regex_str = @name_args.first
diff --git a/chef/lib/chef/knife/cookbook_delete.rb b/chef/lib/chef/knife/cookbook_delete.rb
index 76264e63340..141599b8508 100644
--- a/chef/lib/chef/knife/cookbook_delete.rb
+++ b/chef/lib/chef/knife/cookbook_delete.rb
@@ -26,7 +26,7 @@ class CookbookDelete < Knife
 
       option :purge, :short => '-p', :long => '--purge', :boolean => true, :description => 'Permanently remove files from backing data store'
 
-      banner "Sub-Command: cookbook delete COOKBOOK VERSION (options)"
+      banner "knife cookbook delete COOKBOOK VERSION (options)"
 
       def run
         confirm("Files that are common to multiple cookbooks are shared, so purging the files may disable other cookbooks. Are you sure you want to purge files instead of just deleting the cookbook") if config[:purge]
diff --git a/chef/lib/chef/knife/cookbook_download.rb b/chef/lib/chef/knife/cookbook_download.rb
index 43cf57cb477..a4ebca18d6b 100644
--- a/chef/lib/chef/knife/cookbook_download.rb
+++ b/chef/lib/chef/knife/cookbook_download.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookDownload < Knife
 
-      banner "Sub-Command: cookbook download COOKBOOK [VERSION] (options)"
+      banner "knife cookbook download COOKBOOK [VERSION] (options)"
 
       option :latest,
        :short => "-N",
diff --git a/chef/lib/chef/knife/cookbook_list.rb b/chef/lib/chef/knife/cookbook_list.rb
index 7e1599dd623..9d201742d4e 100644
--- a/chef/lib/chef/knife/cookbook_list.rb
+++ b/chef/lib/chef/knife/cookbook_list.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookList < Knife
 
-      banner "Sub-Command: cookbook list (options)"
+      banner "knife cookbook list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/cookbook_metadata.rb b/chef/lib/chef/knife/cookbook_metadata.rb
index 4a1a097b62b..5c23f2f205a 100644
--- a/chef/lib/chef/knife/cookbook_metadata.rb
+++ b/chef/lib/chef/knife/cookbook_metadata.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookMetadata < Knife
 
-      banner "Sub-Command: cookbook metadata COOKBOOK (options)"
+      banner "knife cookbook metadata COOKBOOK (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
diff --git a/chef/lib/chef/knife/cookbook_metadata_from_file.rb b/chef/lib/chef/knife/cookbook_metadata_from_file.rb
index 8da5773e615..ea0479d53d8 100644
--- a/chef/lib/chef/knife/cookbook_metadata_from_file.rb
+++ b/chef/lib/chef/knife/cookbook_metadata_from_file.rb
@@ -25,7 +25,7 @@ class Chef
   class Knife
     class CookbookMetadataFromFile < Knife
 
-      banner "Sub-Command: cookbook metadata from FILE (options)"
+      banner "knife cookbook metadata from FILE (options)"
 
       def run
         file = @name_args[0]
diff --git a/chef/lib/chef/knife/cookbook_show.rb b/chef/lib/chef/knife/cookbook_show.rb
index 3e2bb26cf99..7537c97cca8 100644
--- a/chef/lib/chef/knife/cookbook_show.rb
+++ b/chef/lib/chef/knife/cookbook_show.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class CookbookShow < Knife
 
-      banner "Sub-Command: cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
+      banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
 
       option :fqdn,
        :short => "-f FQDN",
diff --git a/chef/lib/chef/knife/cookbook_site_download.rb b/chef/lib/chef/knife/cookbook_site_download.rb
index 26c00bf26c6..04f3667034e 100644
--- a/chef/lib/chef/knife/cookbook_site_download.rb
+++ b/chef/lib/chef/knife/cookbook_site_download.rb
@@ -23,7 +23,7 @@ class CookbookSiteDownload < Knife
 
       attr_reader :version
 
-      banner "Sub-Command: cookbook site download COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site download COOKBOOK [VERSION] (options)"
 
       option :file,
        :short => "-f FILE",
diff --git a/chef/lib/chef/knife/cookbook_site_list.rb b/chef/lib/chef/knife/cookbook_site_list.rb
index 19d1eccbb4e..28760a1f726 100644
--- a/chef/lib/chef/knife/cookbook_site_list.rb
+++ b/chef/lib/chef/knife/cookbook_site_list.rb
@@ -22,7 +22,7 @@ class Chef
   class Knife
     class CookbookSiteList < Knife
 
-      banner "Sub-Command: cookbook site list (options)"
+      banner "knife cookbook site list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/cookbook_site_search.rb b/chef/lib/chef/knife/cookbook_site_search.rb
index 4c4b5cc1001..d5dc0ff8c67 100644
--- a/chef/lib/chef/knife/cookbook_site_search.rb
+++ b/chef/lib/chef/knife/cookbook_site_search.rb
@@ -21,7 +21,7 @@ class Chef
   class Knife
     class CookbookSiteSearch < Knife
 
-      banner "Sub-Command: cookbook site search QUERY (options)"
+      banner "knife cookbook site search QUERY (options)"
 
       def run
         output(search_cookbook(name_args[0]))
diff --git a/chef/lib/chef/knife/cookbook_site_show.rb b/chef/lib/chef/knife/cookbook_site_show.rb
index 128ac7bf4cc..d426fdc6c3b 100644
--- a/chef/lib/chef/knife/cookbook_site_show.rb
+++ b/chef/lib/chef/knife/cookbook_site_show.rb
@@ -21,7 +21,7 @@ class Chef
   class Knife
     class CookbookSiteShow < Knife
 
-      banner "Sub-Command: cookbook site show COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site show COOKBOOK [VERSION] (options)"
 
       def run
         case @name_args.length
diff --git a/chef/lib/chef/knife/cookbook_site_vendor.rb b/chef/lib/chef/knife/cookbook_site_vendor.rb
index 579177d5a4e..247f27e50e5 100644
--- a/chef/lib/chef/knife/cookbook_site_vendor.rb
+++ b/chef/lib/chef/knife/cookbook_site_vendor.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class CookbookSiteVendor < Knife
 
-      banner "Sub-Command: cookbook site vendor COOKBOOK [VERSION] (options)"
+      banner "knife cookbook site vendor COOKBOOK [VERSION] (options)"
 
       option :deps,
        :short => "-d",
diff --git a/chef/lib/chef/knife/cookbook_test.rb b/chef/lib/chef/knife/cookbook_test.rb
index a167712e82a..e931f6e03d9 100644
--- a/chef/lib/chef/knife/cookbook_test.rb
+++ b/chef/lib/chef/knife/cookbook_test.rb
@@ -25,7 +25,7 @@ class Chef
   class Knife
     class CookbookTest < Knife
 
-      banner "Sub-Command: cookbook test [COOKBOOKS...] (options)"
+      banner "knife cookbook test [COOKBOOKS...] (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
diff --git a/chef/lib/chef/knife/cookbook_upload.rb b/chef/lib/chef/knife/cookbook_upload.rb
index 08b274abeaa..9fbd760551f 100644
--- a/chef/lib/chef/knife/cookbook_upload.rb
+++ b/chef/lib/chef/knife/cookbook_upload.rb
@@ -32,7 +32,7 @@ class Knife
     class CookbookUpload < Knife
       include Chef::Mixin::ShellOut
 
-      banner "Sub-Command: cookbook upload [COOKBOOKS...] (options)"
+      banner "knife cookbook upload [COOKBOOKS...] (options)"
 
       option :cookbook_path,
         :short => "-o PATH:PATH",
diff --git a/chef/lib/chef/knife/data_bag_create.rb b/chef/lib/chef/knife/data_bag_create.rb
index 6face979d25..20a5e035cd3 100644
--- a/chef/lib/chef/knife/data_bag_create.rb
+++ b/chef/lib/chef/knife/data_bag_create.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class DataBagCreate < Knife
 
-      banner "Sub-Command: data bag create BAG [ITEM] (options)"
+      banner "knife data bag create BAG [ITEM] (options)"
 
       def run
         @data_bag_name, @data_bag_item_name = @name_args
diff --git a/chef/lib/chef/knife/data_bag_delete.rb b/chef/lib/chef/knife/data_bag_delete.rb
index f0d045b037b..23a68737acf 100644
--- a/chef/lib/chef/knife/data_bag_delete.rb
+++ b/chef/lib/chef/knife/data_bag_delete.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class DataBagDelete < Knife
 
-      banner "Sub-Command: data bag delete BAG [ITEM] (options)"
+      banner "knife data bag delete BAG [ITEM] (options)"
 
       def run 
         if @name_args.length == 2
diff --git a/chef/lib/chef/knife/data_bag_edit.rb b/chef/lib/chef/knife/data_bag_edit.rb
index 50c53cc7a0a..9bf351d061c 100644
--- a/chef/lib/chef/knife/data_bag_edit.rb
+++ b/chef/lib/chef/knife/data_bag_edit.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class DataBagEdit < Knife
 
-      banner "Sub-Command: data bag edit BAG ITEM (options)"
+      banner "knife data bag edit BAG ITEM (options)"
 
       def run 
         if @name_args.length != 2
diff --git a/chef/lib/chef/knife/data_bag_from_file.rb b/chef/lib/chef/knife/data_bag_from_file.rb
index 7e2fa0d2162..6259e4c3c08 100644
--- a/chef/lib/chef/knife/data_bag_from_file.rb
+++ b/chef/lib/chef/knife/data_bag_from_file.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class DataBagFromFile < Knife
 
-      banner "Sub-Command: data bag from file BAG FILE (options)"
+      banner "knife data bag from file BAG FILE (options)"
 
       def run 
         updated = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])
diff --git a/chef/lib/chef/knife/data_bag_list.rb b/chef/lib/chef/knife/data_bag_list.rb
index 30ebbe8a89b..07ed6ad9125 100644
--- a/chef/lib/chef/knife/data_bag_list.rb
+++ b/chef/lib/chef/knife/data_bag_list.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class DataBagList < Knife
 
-      banner "Sub-Command: data bag list (options)"
+      banner "knife data bag list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/data_bag_show.rb b/chef/lib/chef/knife/data_bag_show.rb
index a030e56c85b..6838dd963a7 100644
--- a/chef/lib/chef/knife/data_bag_show.rb
+++ b/chef/lib/chef/knife/data_bag_show.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class DataBagShow < Knife
 
-      banner "Sub-Command: data bag show BAG [ITEM] (options)"
+      banner "knife data bag show BAG [ITEM] (options)"
 
       def run
         display = case @name_args.length
diff --git a/chef/lib/chef/knife/ec2_instance_data.rb b/chef/lib/chef/knife/ec2_instance_data.rb
index 00282e77658..b69a2330c14 100644
--- a/chef/lib/chef/knife/ec2_instance_data.rb
+++ b/chef/lib/chef/knife/ec2_instance_data.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2InstanceData < Knife
 
-      banner "Sub-Command: ec2 instance data [RUN LIST...] (options)"
+      banner "knife ec2 instance data [RUN LIST...] (options)"
 
       option :edit,
         :short => "-e",
diff --git a/chef/lib/chef/knife/ec2_server_create.rb b/chef/lib/chef/knife/ec2_server_create.rb
index 927f11eeae3..dc67fc98057 100644
--- a/chef/lib/chef/knife/ec2_server_create.rb
+++ b/chef/lib/chef/knife/ec2_server_create.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerCreate < Knife
 
-      banner "Sub-Command: ec2 server create [RUN LIST...] (options)"
+      banner "knife ec2 server create [RUN LIST...] (options)"
 
       option :flavor,
         :short => "-f FLAVOR",
diff --git a/chef/lib/chef/knife/ec2_server_delete.rb b/chef/lib/chef/knife/ec2_server_delete.rb
index ed889cda65c..161c558b377 100644
--- a/chef/lib/chef/knife/ec2_server_delete.rb
+++ b/chef/lib/chef/knife/ec2_server_delete.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerDelete < Knife
 
-      banner "Sub-Command: ec2 server delete SERVER [SERVER] (options)"
+      banner "knife ec2 server delete SERVER [SERVER] (options)"
       
       option :aws_access_key_id,
         :short => "-A ID",
diff --git a/chef/lib/chef/knife/ec2_server_list.rb b/chef/lib/chef/knife/ec2_server_list.rb
index d4cd5a44ae7..0711cbcf6ae 100644
--- a/chef/lib/chef/knife/ec2_server_list.rb
+++ b/chef/lib/chef/knife/ec2_server_list.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerList < Knife
 
-      banner "Sub-Command: ec2 server list [RUN LIST...] (options)"
+      banner "knife ec2 server list [RUN LIST...] (options)"
 
       option :aws_access_key_id,
         :short => "-A ID",
diff --git a/chef/lib/chef/knife/index_rebuild.rb b/chef/lib/chef/knife/index_rebuild.rb
index b5d982be98b..fc165aadc49 100644
--- a/chef/lib/chef/knife/index_rebuild.rb
+++ b/chef/lib/chef/knife/index_rebuild.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class IndexRebuild < Knife
       
-      banner "Sub-Command: index rebuild (options)"
+      banner "knife index rebuild (options)"
       option :yes,
         :short        => "-y",
         :long         => "--yes",
diff --git a/chef/lib/chef/knife/node_bulk_delete.rb b/chef/lib/chef/knife/node_bulk_delete.rb
index d0b883c3886..1958c638361 100644
--- a/chef/lib/chef/knife/node_bulk_delete.rb
+++ b/chef/lib/chef/knife/node_bulk_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeBulkDelete < Knife
 
-      banner "Sub-Command: node bulk delete REGEX (options)"
+      banner "knife node bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1
diff --git a/chef/lib/chef/knife/node_create.rb b/chef/lib/chef/knife/node_create.rb
index 7f22c3c6a75..4f14d21ab8a 100644
--- a/chef/lib/chef/knife/node_create.rb
+++ b/chef/lib/chef/knife/node_create.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeCreate < Knife
 
-      banner "Sub-Command: node create NODE (options)"
+      banner "knife node create NODE (options)"
 
       def run
         @node_name = @name_args[0]
diff --git a/chef/lib/chef/knife/node_delete.rb b/chef/lib/chef/knife/node_delete.rb
index f6358550473..03113b60037 100644
--- a/chef/lib/chef/knife/node_delete.rb
+++ b/chef/lib/chef/knife/node_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeDelete < Knife
 
-      banner "Sub-Command: node delete NODE (options)"
+      banner "knife node delete NODE (options)"
 
       def run 
         @node_name = @name_args[0]
diff --git a/chef/lib/chef/knife/node_edit.rb b/chef/lib/chef/knife/node_edit.rb
index 77d709c3462..5460af5ab00 100644
--- a/chef/lib/chef/knife/node_edit.rb
+++ b/chef/lib/chef/knife/node_edit.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeEdit < Knife
 
-      banner "Sub-Command: node edit NODE (options)"
+      banner "knife node edit NODE (options)"
 
       def run 
         @node_name = @name_args[0]
diff --git a/chef/lib/chef/knife/node_from_file.rb b/chef/lib/chef/knife/node_from_file.rb
index b0b5ff713cb..e644ca17a51 100644
--- a/chef/lib/chef/knife/node_from_file.rb
+++ b/chef/lib/chef/knife/node_from_file.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeFromFile < Knife
 
-      banner "Sub-Command: node from file FILE (options)"
+      banner "knife node from file FILE (options)"
 
       def run 
         updated = load_from_file(Chef::Node, @name_args[0])
diff --git a/chef/lib/chef/knife/node_list.rb b/chef/lib/chef/knife/node_list.rb
index ad4255a9387..6371b655b61 100644
--- a/chef/lib/chef/knife/node_list.rb
+++ b/chef/lib/chef/knife/node_list.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeList < Knife
 
-      banner "Sub-Command: node list (options)"
+      banner "knife node list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/node_run_list_add.rb b/chef/lib/chef/knife/node_run_list_add.rb
index 5ce61b12a83..9e1602a1e2a 100644
--- a/chef/lib/chef/knife/node_run_list_add.rb
+++ b/chef/lib/chef/knife/node_run_list_add.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeRunListAdd < Knife
 
-      banner "Sub-Command: node run_list add [NODE] [ENTRY] (options)"
+      banner "knife node run_list add [NODE] [ENTRY] (options)"
 
       option :after,
         :short => "-a ITEM",
diff --git a/chef/lib/chef/knife/node_run_list_remove.rb b/chef/lib/chef/knife/node_run_list_remove.rb
index 6bda2c21deb..7bdfc9a66b0 100644
--- a/chef/lib/chef/knife/node_run_list_remove.rb
+++ b/chef/lib/chef/knife/node_run_list_remove.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeRunListRemove < Knife
 
-      banner "Sub-Command: node run_list remove [NODE] [ENTRY] (options)"
+      banner "knife node run_list remove [NODE] [ENTRY] (options)"
 
       def run 
         node = Chef::Node.load(@name_args[0])
diff --git a/chef/lib/chef/knife/node_show.rb b/chef/lib/chef/knife/node_show.rb
index 83a2e0c0b73..971354ba668 100644
--- a/chef/lib/chef/knife/node_show.rb
+++ b/chef/lib/chef/knife/node_show.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class NodeShow < Knife
 
-      banner "Sub-Command: node show NODE (options)"
+      banner "knife node show NODE (options)"
 
       option :attribute,
         :short => "-a [ATTR]",
diff --git a/chef/lib/chef/knife/rackspace_server_create.rb b/chef/lib/chef/knife/rackspace_server_create.rb
index 319ca315adf..3bfdc2ce5c0 100644
--- a/chef/lib/chef/knife/rackspace_server_create.rb
+++ b/chef/lib/chef/knife/rackspace_server_create.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerCreate < Knife
 
-      banner "Sub-Command: rackspace server create [RUN LIST...] (options)"
+      banner "knife rackspace server create [RUN LIST...] (options)"
 
       option :flavor,
         :short => "-f FLAVOR",
diff --git a/chef/lib/chef/knife/rackspace_server_delete.rb b/chef/lib/chef/knife/rackspace_server_delete.rb
index 6feed316ed5..e6b133f7c62 100644
--- a/chef/lib/chef/knife/rackspace_server_delete.rb
+++ b/chef/lib/chef/knife/rackspace_server_delete.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerDelete < Knife
 
-      banner "Sub-Command: rackspace server delete SERVER (options)"
+      banner "knife rackspace server delete SERVER (options)"
 
       def h
         @highline ||= HighLine.new
diff --git a/chef/lib/chef/knife/rackspace_server_list.rb b/chef/lib/chef/knife/rackspace_server_list.rb
index bf5e28fc567..bae3548cc64 100644
--- a/chef/lib/chef/knife/rackspace_server_list.rb
+++ b/chef/lib/chef/knife/rackspace_server_list.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class RackspaceServerList < Knife
 
-      banner "Sub-Command: rackspace server list (options)"
+      banner "knife rackspace server list (options)"
 
       def h
         @highline ||= HighLine.new
diff --git a/chef/lib/chef/knife/recipe_list.rb b/chef/lib/chef/knife/recipe_list.rb
index fea17b59e7b..c630a2b406a 100644
--- a/chef/lib/chef/knife/recipe_list.rb
+++ b/chef/lib/chef/knife/recipe_list.rb
@@ -19,7 +19,7 @@
 require 'chef/knife'
 class Chef::Knife::RecipeList < Chef::Knife
   
-  banner "Sub-Command: recipe list [PATTERN]"
+  banner "knife recipe list [PATTERN]"
 
   def run
     recipes = rest.get_rest('cookbooks/_recipes')
diff --git a/chef/lib/chef/knife/role_bulk_delete.rb b/chef/lib/chef/knife/role_bulk_delete.rb
index 3a6e9b15e2f..1e4b533c36e 100644
--- a/chef/lib/chef/knife/role_bulk_delete.rb
+++ b/chef/lib/chef/knife/role_bulk_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleBulkDelete < Knife
 
-      banner "Sub-Command: role bulk delete REGEX (options)"
+      banner "knife role bulk delete REGEX (options)"
 
       def run 
         if @name_args.length < 1
diff --git a/chef/lib/chef/knife/role_create.rb b/chef/lib/chef/knife/role_create.rb
index 2f4e375c84f..e81b883fdb5 100644
--- a/chef/lib/chef/knife/role_create.rb
+++ b/chef/lib/chef/knife/role_create.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleCreate < Knife
 
-      banner "Sub-Command: role create ROLE (options)"
+      banner "knife role create ROLE (options)"
 
       option :description,
         :short => "-d",
diff --git a/chef/lib/chef/knife/role_delete.rb b/chef/lib/chef/knife/role_delete.rb
index d5246a52f5c..14e74ba110c 100644
--- a/chef/lib/chef/knife/role_delete.rb
+++ b/chef/lib/chef/knife/role_delete.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleDelete < Knife
 
-      banner "Sub-Command: role delete ROLE (options)"
+      banner "knife role delete ROLE (options)"
 
       def run 
         @role_name = @name_args[0]
diff --git a/chef/lib/chef/knife/role_edit.rb b/chef/lib/chef/knife/role_edit.rb
index 3454cf59b02..78cad694714 100644
--- a/chef/lib/chef/knife/role_edit.rb
+++ b/chef/lib/chef/knife/role_edit.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleEdit < Knife
 
-      banner "Sub-Command: role edit ROLE (options)"
+      banner "knife role edit ROLE (options)"
 
       def run 
         @role_name = @name_args[0]
diff --git a/chef/lib/chef/knife/role_from_file.rb b/chef/lib/chef/knife/role_from_file.rb
index b366e7f7f60..a12589c4df5 100644
--- a/chef/lib/chef/knife/role_from_file.rb
+++ b/chef/lib/chef/knife/role_from_file.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleFromFile < Knife
 
-      banner "Sub-Command: role from file FILE (options)"
+      banner "knife role from file FILE (options)"
 
       def run 
         updated = load_from_file(Chef::Role, @name_args[0])
diff --git a/chef/lib/chef/knife/role_list.rb b/chef/lib/chef/knife/role_list.rb
index a8e127246be..c617d4aa24d 100644
--- a/chef/lib/chef/knife/role_list.rb
+++ b/chef/lib/chef/knife/role_list.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleList < Knife
 
-      banner "Sub-Command: role list (options)"
+      banner "knife role list (options)"
 
       option :with_uri,
         :short => "-w",
diff --git a/chef/lib/chef/knife/role_show.rb b/chef/lib/chef/knife/role_show.rb
index 68f30dde205..952260ae27c 100644
--- a/chef/lib/chef/knife/role_show.rb
+++ b/chef/lib/chef/knife/role_show.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class RoleShow < Knife
 
-      banner "Sub-Command: role show ROLE (options)"
+      banner "knife role show ROLE (options)"
 
       option :attribute,
         :short => "-a ATTR",
diff --git a/chef/lib/chef/knife/search.rb b/chef/lib/chef/knife/search.rb
index f9a291c36bc..4f580936905 100644
--- a/chef/lib/chef/knife/search.rb
+++ b/chef/lib/chef/knife/search.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Search < Knife
 
-      banner "Sub-Command: search INDEX QUERY (options)"
+      banner "knife search INDEX QUERY (options)"
 
       option :sort,
         :short => "-o SORT",
diff --git a/chef/lib/chef/knife/ssh.rb b/chef/lib/chef/knife/ssh.rb
index bac901acb9e..530e63e39d9 100644
--- a/chef/lib/chef/knife/ssh.rb
+++ b/chef/lib/chef/knife/ssh.rb
@@ -30,7 +30,7 @@ class Ssh < Knife
 
       attr_writer :password
 
-      banner "Sub-Command: ssh QUERY COMMAND (options)"
+      banner "knife ssh QUERY COMMAND (options)"
 
       option :concurrency,
         :short => "-C NUM",
diff --git a/chef/lib/chef/knife/status.rb b/chef/lib/chef/knife/status.rb
index 4f66212dffb..b468f53bcab 100644
--- a/chef/lib/chef/knife/status.rb
+++ b/chef/lib/chef/knife/status.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class Status < Knife
 
-      banner "Sub-Command: status"
+      banner "knife status"
 
       def highline
         @h ||= HighLine.new
@@ -48,4 +48,4 @@ def run
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/chef/lib/chef/knife/terremark_server_create.rb b/chef/lib/chef/knife/terremark_server_create.rb
index 87e933db91e..c32fd9315db 100644
--- a/chef/lib/chef/knife/terremark_server_create.rb
+++ b/chef/lib/chef/knife/terremark_server_create.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class TerremarkServerCreate < Knife
 
-      banner "Sub-Command: terremark server create NAME [RUN LIST...] (options)"
+      banner "knife terremark server create NAME [RUN LIST...] (options)"
 
       option :terremark_password,
         :short => "-K PASSWORD",
diff --git a/chef/lib/chef/knife/terremark_server_delete.rb b/chef/lib/chef/knife/terremark_server_delete.rb
index 38f98dec4bf..aeb195c70d9 100644
--- a/chef/lib/chef/knife/terremark_server_delete.rb
+++ b/chef/lib/chef/knife/terremark_server_delete.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     class TerremarkServerDelete < Knife
 
-      banner "Sub-Command: terremark server delete SERVER (options)"
+      banner "knife terremark server delete SERVER (options)"
 
       def h
         @highline ||= HighLine.new
diff --git a/chef/lib/chef/knife/terremark_server_list.rb b/chef/lib/chef/knife/terremark_server_list.rb
index 3aba8585707..20dadbedff2 100644
--- a/chef/lib/chef/knife/terremark_server_list.rb
+++ b/chef/lib/chef/knife/terremark_server_list.rb
@@ -24,7 +24,7 @@ class Chef
   class Knife
     class TerremarkServerList < Knife
 
-      banner "Sub-Command: terremark server list (options)"
+      banner "knife terremark server list (options)"
 
       option :terremark_password,
         :short => "-K PASSWORD",