6 files changed, 10 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 22360735b9..5c0d754ad6 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -62,7 +62,7 @@ module ActionController #:nodoc:
       end
 
       def log_event(name, before, after, instrumenter_id, payload)
-        if name.to_s =~ /actioncontroller\.((read|write|expire|exist)_(fragment|page)\??)/
+        if name.to_s =~ /action_controller\.((read|write|expire|exist)_(fragment|page)\??)/
           key_or_path = payload[:key] || payload[:path]
           human_name  = $1.humanize
           duration    = (after - before) * 1000
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 91f781a44d..a0c5ed797e 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -111,7 +111,7 @@ module ActionController #:nodoc:
       end
 
       def instrument_fragment_cache(name, key)
-        ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :key => key){ yield }
+        ActiveSupport::Notifications.instrument("action_controller.#{name}", :key => key){ yield }
       end
     end
   end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 4498abcdbe..5797eeebd6 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -109,7 +109,7 @@ module ActionController #:nodoc:
           end
 
           def instrument_page_cache(name, path)
-            ActiveSupport::Notifications.instrument("actioncontroller.#{name}", :path => path){ yield }
+            ActiveSupport::Notifications.instrument("action_controller.#{name}", :path => path){ yield }
           end
       end
 
diff --git a/actionpack/lib/action_controller/metal/logger.rb b/actionpack/lib/action_controller/metal/logger.rb
index 0dcab86f10..bf5f3b774f 100644
--- a/actionpack/lib/action_controller/metal/logger.rb
+++ b/actionpack/lib/action_controller/metal/logger.rb
@@ -15,7 +15,7 @@ module ActionController
     attr_internal :view_runtime
 
     def process_action(action)
-      ActiveSupport::Notifications.instrument("actioncontroller.process_action",
+      ActiveSupport::Notifications.instrument("action_controller.process_action",
         :controller => self, :action => action) do
         super
       end
@@ -51,7 +51,7 @@ module ActionController
       # This is the hook invoked by ActiveSupport::Notifications.subscribe.
       # If you need to log any event, overwrite the method and do it here.
       def log_event(name, before, after, instrumenter_id, payload) #:nodoc:
-        if name == "actioncontroller.process_action"
+        if name == "action_controller.process_action"
           duration     = [(after - before) * 1000, 0.01].max
           controller   = payload[:controller]
           request      = controller.request
@@ -67,7 +67,7 @@ module ActionController
           message << " [#{request.request_uri rescue "unknown"}]"
 
           logger.info(message)
-        elsif name == "actionview.render_template"
+        elsif name == "action_view.render_template"
           # TODO Make render_template logging work if you are using just ActionView
           duration = (after - before) * 1000
           message = "Rendered #{payload[:identifier]}"
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 4459ef6124..67a8ee4472 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -215,12 +215,12 @@ module ActionView
         options = @options
 
         if @collection
-          ActiveSupport::Notifications.instrument("actionview.render_collection",
+          ActiveSupport::Notifications.instrument("action_view.render_collection",
             :path => @path, :count => @collection.size) do
             render_collection
           end
         else
-          content = ActiveSupport::Notifications.instrument("actionview.render_partial",
+          content = ActiveSupport::Notifications.instrument("action_view.render_partial",
             :path => @path) do
             render_partial
           end
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 578cfe1177..2fdfad694d 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -93,7 +93,7 @@ module ActionView
     def _render_template(template, layout = nil, options = {})
       locals = options[:locals] || {}
 
-      content = ActiveSupport::Notifications.instrument("actionview.render_template",
+      content = ActiveSupport::Notifications.instrument("action_view.render_template",
                 :identifier => template.identifier, :layout => (layout ? layout.identifier : nil)) do
         template.render(self, locals)
       end
@@ -109,7 +109,7 @@ module ActionView
     end
 
     def _render_layout(layout, locals, &block)
-      ActiveSupport::Notifications.instrument("actionview.render_layout",
+      ActiveSupport::Notifications.instrument("action_view.render_layout",
         :identifier => layout.identifier) do
         layout.render(self, locals){ |*name| _layout_for(*name, &block) }
       end