diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 9280a1c2d3e9b3df430e436794665f3c9631821e..42356be1ea3ed0c1a3edb645f39662f34bcaf855 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -131,8 +131,8 @@ def test_view_paths_override_at_request_time
     assert_equal "Hello overridden world!", @response.body
   end
 
-  def test_override_view_paths_with_custom_resolver
-    resolver_class = Class.new(ActionView::PathResolver) do
+  def test_decorate_view_paths_with_custom_resolver
+    decorator_class = Class.new(ActionView::PathResolver) do
       def initialize(path_set)
         @path_set = path_set
       end
@@ -140,7 +140,7 @@ def initialize(path_set)
       def find_all(*args)
         @path_set.find_all(*args).collect do |template|
           ::ActionView::Template.new(
-            "Customized body",
+            "Decorated body",
             template.identifier,
             template.handler,
             {
@@ -152,12 +152,12 @@ def find_all(*args)
       end
     end
 
-    resolver = resolver_class.new(TestController.view_paths)
-    TestController.view_paths = ActionView::PathSet.new.push(resolver)
+    decorator = decorator_class.new(TestController.view_paths)
+    TestController.view_paths = ActionView::PathSet.new.push(decorator)
 
     get :hello_world
     assert_response :success
-    assert_equal "Customized body", @response.body
+    assert_equal "Decorated body", @response.body
   end
 
   def test_inheritance