diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/generators/rails/app/templates/public/index.html
index b153ae392f5ab8aaa5ad182cb2d2f824e561d408..ef916f9c5a5a1486656b249ed9e757c3a592ca95 100644
--- a/railties/lib/generators/rails/app/templates/public/index.html
+++ b/railties/lib/generators/rails/app/templates/public/index.html
@@ -255,7 +255,7 @@
 
           <ol>
             <li>
-              <h2>Use <code>script/generate</code> to create your models and controllers</h2>
+              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
               <p>To see all available options, run it without parameters.</p>
             </li>
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 95a33c50f882f1a0568eb0e9e6c1af48fd56d321..93ef67818de8a91f2fe6f21e193f5612e3fc74f7 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -35,7 +35,7 @@ def test_application_skeleton_is_created
       public/images
       public/javascripts
       public/stylesheets
-      script/performance
+      script/rails
       test/fixtures
       test/functional
       test/integration
@@ -98,34 +98,14 @@ def test_prototype_and_test_unit_are_skipped_if_required
     assert_no_file "test"
   end
 
-  def test_shebang_is_added_to_files
+  def test_shebang_is_added_to_rails_file
     run_generator [destination_root, "--ruby", "foo/bar/baz"]
-
-    %w(
-      about
-      console
-      dbconsole
-      destroy
-      generate
-      plugin
-      runner
-      server
-    ).each { |path| assert_file "script/#{path}", /#!foo\/bar\/baz/ }
+    assert_file "script/rails", /#!foo\/bar\/baz/
   end
 
   def test_shebang_when_is_the_same_as_default_use_env
     run_generator [destination_root, "--ruby", Thor::Util.ruby_command]
-
-    %w(
-      about
-      console
-      dbconsole
-      destroy
-      generate
-      plugin
-      runner
-      server
-    ).each { |path| assert_file "script/#{path}", /#!\/usr\/bin\/env/ }
+    assert_file "script/rails", /#!\/usr\/bin\/env/
   end
 
   def test_template_from_dir_pwd