diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2bd6fd50ec025439f6c67d34bed3ee50ebbf2215..d9b5f3eb548edda90bf66ba20e42d605a672bcb5 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
+
 * Fix #distance_of_time_in_words to report accurately against the Duration class.  #7114 [eventualbuddha]
 
 * Refactor #form_tag to allow easy extending.  [Rick]
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 0ae924059835f4858e2212667a558b63ac84db67..e424df3514d6aa75022826684cf89c2d7c9f30a6 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -52,6 +52,12 @@ def test_multile_with_path_prefix
       assert_simply_restful_for :comments, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }
     end
   end
+  
+  def test_with_name_prefix
+    with_restful_routing :messages, :name_prefix => 'post_' do
+      assert_simply_restful_for :messages, :name_prefix => 'post_'
+    end
+  end
 
   def test_with_collection_action
     rss_options = {:action => 'rss'}
@@ -346,13 +352,14 @@ def assert_restful_named_routes_for(controller_name, singular_name = nil, option
       options[:options].delete :action
 
       full_prefix = "/#{options[:path_prefix]}#{controller_name}"
-
-      assert_named_route "#{full_prefix}",        "#{controller_name}_path",           options[:options]
-      assert_named_route "#{full_prefix}.xml",    "formatted_#{controller_name}_path", options[:options].merge(:format => 'xml')
-      assert_named_route "#{full_prefix}/new",    "new_#{singular_name}_path",         options[:options]
-      assert_named_route "#{full_prefix}/1",      "#{singular_name}_path",             options[:options].merge(:id => '1')
-      assert_named_route "#{full_prefix}/1;edit", "edit_#{singular_name}_path",        options[:options].merge(:id => '1')
-      assert_named_route "#{full_prefix}/1.xml",  "formatted_#{singular_name}_path",   options[:options].merge(:format => 'xml', :id => '1')
+      name_prefix = options[:name_prefix]
+
+      assert_named_route "#{full_prefix}",        "#{name_prefix}#{controller_name}_path",           options[:options]
+      assert_named_route "#{full_prefix}.xml",    "formatted_#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
+      assert_named_route "#{full_prefix}/new",    "#{name_prefix}new_#{singular_name}_path",         options[:options]
+      assert_named_route "#{full_prefix}/1",      "#{name_prefix}#{singular_name}_path",             options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1;edit", "#{name_prefix}edit_#{singular_name}_path",        options[:options].merge(:id => '1')
+      assert_named_route "#{full_prefix}/1.xml",  "formatted_#{name_prefix}#{singular_name}_path",   options[:options].merge(:format => 'xml', :id => '1')
       yield options[:options] if block_given?
     end