diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 44f5ab45d34b7d333683299e435edad53f51a71f..e0285835a8af70f9cd45bf52e5b71401e6fb7727 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -158,26 +158,26 @@ def redirect_resource_name # :doc:
 
         def model_resource_name(prefix: "") # :doc:
           resource_name = "#{prefix}#{singular_table_name}"
-          if controller_class_path.empty?
-            resource_name
-          else
+          if options[:model_name]
             "[#{controller_class_path.map { |name| ":" + name }.join(", ")}, #{resource_name}]"
+          else
+            resource_name
           end
         end
 
         def singular_route_name # :doc:
-          if controller_class_path.empty?
-            singular_table_name
-          else
+          if options[:model_name]
             "#{controller_class_path.join('_')}_#{singular_table_name}"
+          else
+            singular_table_name
           end
         end
 
         def plural_route_name # :doc:
-          if controller_class_path.empty?
-            plural_table_name
-          else
+          if options[:model_name]
             "#{controller_class_path.join('_')}_#{plural_table_name}"
+          else
+            plural_table_name
           end
         end
 
diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 967754c81376f8dfa4a81bc7573b0b6a8bb8342c..4e61b660d75d0c0252581f8a529161ae7d8dad3f 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -33,6 +33,17 @@ def test_named_generator_attributes
     assert_name g, "foos",       :plural_name
     assert_name g, "admin.foo",  :i18n_scope
     assert_name g, "admin_foos", :table_name
+    assert_name g, "admin/foos", :controller_name
+    assert_name g, %w(admin),     :controller_class_path
+    assert_name g, "Admin::Foos", :controller_class_name
+    assert_name g, "admin/foos",  :controller_file_path
+    assert_name g, "foos",        :controller_file_name
+    assert_name g, "admin.foos",  :controller_i18n_scope
+    assert_name g, "admin_foo",  :singular_route_name
+    assert_name g, "admin_foos", :plural_route_name
+    assert_name g, "@admin_foo", :redirect_resource_name
+    assert_name g, "admin_foo",  :model_resource_name
+    assert_name g, "admin_foos", :index_helper
   end
 
   def test_named_generator_attributes_as_ruby
@@ -47,6 +58,17 @@ def test_named_generator_attributes_as_ruby
     assert_name g, "foos",       :plural_name
     assert_name g, "admin.foo",  :i18n_scope
     assert_name g, "admin_foos", :table_name
+    assert_name g, "Admin::Foos", :controller_name
+    assert_name g, %w(admin),     :controller_class_path
+    assert_name g, "Admin::Foos", :controller_class_name
+    assert_name g, "admin/foos",  :controller_file_path
+    assert_name g, "foos",        :controller_file_name
+    assert_name g, "admin.foos",  :controller_i18n_scope
+    assert_name g, "admin_foo",  :singular_route_name
+    assert_name g, "admin_foos", :plural_route_name
+    assert_name g, "@admin_foo", :redirect_resource_name
+    assert_name g, "admin_foo",  :model_resource_name
+    assert_name g, "admin_foos", :index_helper
   end
 
   def test_named_generator_attributes_without_pluralized
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 03322c1c59cef35539d7d7c751188d0c20029942..b6294c3b940b0df84b33b81c8ea56d86ef3d0bb8 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -282,7 +282,14 @@ def test_scaffold_with_namespace_on_invoke
                 /class Admin::RolesTest < ApplicationSystemTestCase/
 
     # Views
-    %w(index edit new show _form).each do |view|
+    assert_file "app/views/admin/roles/index.html.erb" do |content|
+      assert_match("'Show', admin_role", content)
+      assert_match("'Edit', edit_admin_role_path(admin_role)", content)
+      assert_match("'Destroy', admin_role", content)
+      assert_match("'New Admin Role', new_admin_role_path", content)
+    end
+
+    %w(edit new show _form).each do |view|
       assert_file "app/views/admin/roles/#{view}.html.erb"
     end
     assert_no_file "app/views/layouts/admin/roles.html.erb"