diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index a3afc23e6a..4c48d2bed6 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -9,8 +9,8 @@ module ActionMailer
       ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController)
     end
 
-    require "action_mailer/railties/subscriber"
-    subscriber ActionMailer::Railties::Subscriber.new
+    require "action_mailer/railties/log_subscriber"
+    log_subscriber ActionMailer::Railties::LogSubscriber.new
 
     initializer "action_mailer.logger" do
       ActionMailer::Base.logger ||= Rails.logger
diff --git a/actionmailer/lib/action_mailer/railties/subscriber.rb b/actionmailer/lib/action_mailer/railties/log_subscriber.rb
similarity index 89%
rename from actionmailer/lib/action_mailer/railties/subscriber.rb
rename to actionmailer/lib/action_mailer/railties/log_subscriber.rb
index cff852055c..d1b3dd33af 100644
--- a/actionmailer/lib/action_mailer/railties/subscriber.rb
+++ b/actionmailer/lib/action_mailer/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActionMailer
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       def deliver(event)
         recipients = Array(event.payload[:to]).join(', ')
         info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
diff --git a/actionmailer/test/subscriber_test.rb b/actionmailer/test/log_subscriber_test.rb
similarity index 79%
rename from actionmailer/test/subscriber_test.rb
rename to actionmailer/test/log_subscriber_test.rb
index 3d1736d64f..edd7c84d29 100644
--- a/actionmailer/test/subscriber_test.rb
+++ b/actionmailer/test/log_subscriber_test.rb
@@ -1,10 +1,10 @@
 require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_mailer/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "action_mailer/railties/log_subscriber"
 
-class AMSubscriberTest < ActionMailer::TestCase
-  include Rails::Subscriber::TestHelper
-  Rails::Subscriber.add(:action_mailer, ActionMailer::Railties::Subscriber.new)
+class AMLogSubscriberTest < ActionMailer::TestCase
+  include Rails::LogSubscriber::TestHelper
+  Rails::LogSubscriber.add(:action_mailer, ActionMailer::Railties::LogSubscriber.new)
 
   class TestMailer < ActionMailer::Base
     def basic
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 55a5c22ac0..015a8212c4 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -6,8 +6,8 @@ module ActionController
   class Railtie < Rails::Railtie
     railtie_name :action_controller
 
-    require "action_controller/railties/subscriber"
-    subscriber ActionController::Railties::Subscriber.new
+    require "action_controller/railties/log_subscriber"
+    log_subscriber ActionController::Railties::LogSubscriber.new
 
     initializer "action_controller.logger" do
       ActionController::Base.logger ||= Rails.logger
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
similarity index 97%
rename from actionpack/lib/action_controller/railties/subscriber.rb
rename to actionpack/lib/action_controller/railties/log_subscriber.rb
index 4499e82292..df9ffa1717 100644
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ b/actionpack/lib/action_controller/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       INTERNAL_PARAMS = %w(controller action format _method only_path)
 
       def start_processing(event)
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index d9e2557d89..03f18ac172 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -5,8 +5,8 @@ module ActionView
   class Railtie < Rails::Railtie
     railtie_name :action_view
 
-    require "action_view/railties/subscriber"
-    subscriber ActionView::Railties::Subscriber.new
+    require "action_view/railties/log_subscriber"
+    log_subscriber ActionView::Railties::LogSubscriber.new
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
diff --git a/actionpack/lib/action_view/railties/subscriber.rb b/actionpack/lib/action_view/railties/log_subscriber.rb
similarity index 92%
rename from actionpack/lib/action_view/railties/subscriber.rb
rename to actionpack/lib/action_view/railties/log_subscriber.rb
index 803f19379c..9487a10706 100644
--- a/actionpack/lib/action_view/railties/subscriber.rb
+++ b/actionpack/lib/action_view/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActionView
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       def render_template(event)
         message = "Rendered #{from_rails_root(event.payload[:identifier])}"
         message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index ed8e324938..4d2a7b9b5a 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -1,30 +1,30 @@
 require 'active_record_unit'
 require 'active_record/railties/controller_runtime'
 require 'fixtures/project'
-require 'rails/subscriber/test_helper'
-require 'action_controller/railties/subscriber'
+require 'rails/log_subscriber/test_helper'
+require 'action_controller/railties/log_subscriber'
 
 ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime
 
-class ControllerRuntimeSubscriberTest < ActionController::TestCase
-  class SubscriberController < ActionController::Base
+class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
+  class LogSubscriberController < ActionController::Base
     def show
       render :inline => "<%= Project.all %>"
     end
   end
   
-  include Rails::Subscriber::TestHelper
-  tests SubscriberController
+  include Rails::LogSubscriber::TestHelper
+  tests LogSubscriberController
 
   def setup
     @old_logger = ActionController::Base.logger
-    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
+    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
     super
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
diff --git a/actionpack/test/controller/subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
similarity index 86%
rename from actionpack/test/controller/subscriber_test.rb
rename to actionpack/test/controller/log_subscriber_test.rb
index d7c1166f14..182f343b2f 100644
--- a/actionpack/test/controller/subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -1,9 +1,9 @@
 require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_controller/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "action_controller/railties/log_subscriber"
 
 module Another
-  class SubscribersController < ActionController::Base
+  class LogSubscribersController < ActionController::Base
     def show
       render :nothing => true
     end
@@ -35,9 +35,9 @@ module Another
   end
 end
 
-class ACSubscriberTest < ActionController::TestCase
-  tests Another::SubscribersController
-  include Rails::Subscriber::TestHelper
+class ACLogSubscriberTest < ActionController::TestCase
+  tests Another::LogSubscribersController
+  include Rails::LogSubscriber::TestHelper
 
   def setup
     @old_logger = ActionController::Base.logger
@@ -46,13 +46,13 @@ class ACSubscriberTest < ActionController::TestCase
     ActionController::Base.page_cache_directory = @cache_path
     ActionController::Base.cache_store = :file_store, @cache_path
 
-    Rails::Subscriber.add(:action_controller, ActionController::Railties::Subscriber.new)
+    Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new)
     super
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     FileUtils.rm_rf(@cache_path)
     ActionController::Base.logger = @old_logger
   end
@@ -65,7 +65,7 @@ class ACSubscriberTest < ActionController::TestCase
     get :show
     wait
     assert_equal 2, logs.size
-    assert_equal "Processing by Another::SubscribersController#show as HTML", logs.first
+    assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
   end
 
   def test_process_action
diff --git a/actionpack/test/template/subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
similarity index 88%
rename from actionpack/test/template/subscriber_test.rb
rename to actionpack/test/template/log_subscriber_test.rb
index 8bacab7088..2eb2484cf5 100644
--- a/actionpack/test/template/subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -1,22 +1,22 @@
 require "abstract_unit"
-require "rails/subscriber/test_helper"
-require "action_view/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "action_view/railties/log_subscriber"
 require "controller/fake_models"
 
-class AVSubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
+class AVLogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
 
   def setup
     @old_logger = ActionController::Base.logger
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
     Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH))
-    Rails::Subscriber.add(:action_view, ActionView::Railties::Subscriber.new)
+    Rails::LogSubscriber.add(:action_view, ActionView::Railties::LogSubscriber.new)
     super
   end
 
   def teardown
     super
-    Rails::Subscriber.subscribers.clear
+    Rails::LogSubscriber.log_subscribers.clear
     ActionController::Base.logger = @old_logger
   end
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f30eba4f06..c6dde078ca 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -552,7 +552,7 @@ module ActiveRecord #:nodoc:
       def colorize_logging(*args)
         ActiveSupport::Deprecation.warn "ActiveRecord::Base.colorize_logging and " <<
           "config.active_record.colorize_logging are deprecated. Please use " << 
-          "Rails::Subscriber.colorize_logging or config.colorize_logging instead", caller
+          "Rails::LogSubscriber.colorize_logging or config.colorize_logging instead", caller
       end
       alias :colorize_logging= :colorize_logging
 
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index e70b0d1bfb..b38bd9a644 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -20,8 +20,8 @@ module ActiveRecord
     end
 
     # TODO If we require the wrong file, the error never comes up.
-    require "active_record/railties/subscriber"
-    subscriber ActiveRecord::Railties::Subscriber.new
+    require "active_record/railties/log_subscriber"
+    log_subscriber ActiveRecord::Railties::LogSubscriber.new
 
     initializer "active_record.initialize_timezone" do
       ActiveRecord::Base.time_zone_aware_attributes = true
diff --git a/activerecord/lib/active_record/railties/subscriber.rb b/activerecord/lib/active_record/railties/log_subscriber.rb
similarity index 91%
rename from activerecord/lib/active_record/railties/subscriber.rb
rename to activerecord/lib/active_record/railties/log_subscriber.rb
index fd873dbff8..48b25032ce 100644
--- a/activerecord/lib/active_record/railties/subscriber.rb
+++ b/activerecord/lib/active_record/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActiveRecord
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       def sql(event)
         name = '%s (%.1fms)' % [event.payload[:name], event.duration]
         sql  = event.payload[:sql].squeeze(' ')
diff --git a/activerecord/test/cases/subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
similarity index 75%
rename from activerecord/test/cases/subscriber_test.rb
rename to activerecord/test/cases/log_subscriber_test.rb
index 5328d4468b..f0197ddf77 100644
--- a/activerecord/test/cases/subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -1,11 +1,11 @@
 require "cases/helper"
 require "models/developer"
-require "rails/subscriber/test_helper"
-require "active_record/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "active_record/railties/log_subscriber"
 
-class SubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
-  Rails::Subscriber.add(:active_record, ActiveRecord::Railties::Subscriber.new)
+class LogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
+  Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
 
   def setup
     @old_logger = ActiveRecord::Base.logger
diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb
index 7e35fdc0eb..27c88415f6 100644
--- a/activeresource/lib/active_resource/railtie.rb
+++ b/activeresource/lib/active_resource/railtie.rb
@@ -5,8 +5,8 @@ module ActiveResource
   class Railtie < Rails::Railtie
     railtie_name :active_resource
 
-    require "active_resource/railties/subscriber"
-    subscriber ActiveResource::Railties::Subscriber.new
+    require "active_resource/railties/log_subscriber"
+    log_subscriber ActiveResource::Railties::LogSubscriber.new
 
     initializer "active_resource.set_configs" do |app|
       app.config.active_resource.each do |k,v|
diff --git a/activeresource/lib/active_resource/railties/subscriber.rb b/activeresource/lib/active_resource/railties/log_subscriber.rb
similarity index 88%
rename from activeresource/lib/active_resource/railties/subscriber.rb
rename to activeresource/lib/active_resource/railties/log_subscriber.rb
index fb98061b71..86806a93d0 100644
--- a/activeresource/lib/active_resource/railties/subscriber.rb
+++ b/activeresource/lib/active_resource/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActiveResource
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       def request(event)
         result = event.payload[:result]
         info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}"
diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb
similarity index 69%
rename from activeresource/test/cases/subscriber_test.rb
rename to activeresource/test/cases/log_subscriber_test.rb
index fb890e86cb..56709b6fd3 100644
--- a/activeresource/test/cases/subscriber_test.rb
+++ b/activeresource/test/cases/log_subscriber_test.rb
@@ -1,12 +1,12 @@
 require "abstract_unit"
 require "fixtures/person"
-require "rails/subscriber/test_helper"
-require "active_resource/railties/subscriber"
+require "rails/log_subscriber/test_helper"
+require "active_resource/railties/log_subscriber"
 require "active_support/core_ext/hash/conversions"
 
-class SubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
-  Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new)
+class LogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
+  Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new)
 
   def setup
     @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person')
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 3e96decb8c..06d57765bc 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -9,7 +9,7 @@ module ActiveSupport
   #   end
   #
   # You can consume those events and the information they provide by registering
-  # a subscriber. For instance, let's store all instrumented events in an array:
+  # a log subscriber. For instance, let's store all instrumented events in an array:
   #
   #   @events = []
   #
@@ -35,7 +35,7 @@ module ActiveSupport
   #   end
   #
   # Notifications ships with a queue implementation that consumes and publish events
-  # to subscribers in a thread. You can use any queue implementation you want.
+  # to log subscribers in a thread. You can use any queue implementation you want.
   #
   module Notifications
     autoload :Instrumenter, 'active_support/notifications/instrumenter'
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
index 0ec23da073..05de4946a5 100644
--- a/activesupport/lib/active_support/notifications/fanout.rb
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -1,10 +1,10 @@
 module ActiveSupport
   module Notifications
     # This is a default queue implementation that ships with Notifications. It
-    # just pushes events to all registered subscribers.
+    # just pushes events to all registered log subscribers.
     class Fanout
       def initialize
-        @subscribers = []
+        @log_subscribers = []
       end
 
       def bind(pattern)
@@ -12,11 +12,11 @@ module ActiveSupport
       end
 
       def subscribe(pattern = nil, &block)
-        @subscribers << Subscriber.new(pattern, &block)
+        @log_subscribers << LogSubscriber.new(pattern, &block)
       end
 
       def publish(*args)
-        @subscribers.each { |s| s.publish(*args) }
+        @log_subscribers.each { |s| s.publish(*args) }
       end
 
       # This is a sync queue, so there is not waiting.
@@ -41,7 +41,7 @@ module ActiveSupport
         end
       end
 
-      class Subscriber #:nodoc:
+      class LogSubscriber #:nodoc:
         def initialize(pattern, &block)
           @pattern = pattern
           @block = block
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index 545811a376..779771553c 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -26,7 +26,7 @@ module Notifications
       assert_equal [[:foo]], @events
     end
 
-    def test_subscriber_with_pattern
+    def test_log_subscriber_with_pattern
       events = []
       @notifier.subscribe('1') { |*args| events << args }
 
@@ -38,7 +38,7 @@ module Notifications
       assert_equal [['1'], ['1.a']], events
     end
 
-    def test_subscriber_with_pattern_as_regexp
+    def test_log_subscriber_with_pattern_as_regexp
       events = []
       @notifier.subscribe(/\d/) { |*args| events << args }
 
@@ -50,7 +50,7 @@ module Notifications
       assert_equal [['1'], ['a.1'], ['1.a']], events
     end
 
-    def test_multiple_subscribers
+    def test_multiple_log_subscribers
       @another = []
       @notifier.subscribe { |*args| @another << args }
       @notifier.publish :foo
diff --git a/railties/guides/source/3_0_release_notes.textile b/railties/guides/source/3_0_release_notes.textile
index 639e775bf5..4b0dc72908 100644
--- a/railties/guides/source/3_0_release_notes.textile
+++ b/railties/guides/source/3_0_release_notes.textile
@@ -435,7 +435,7 @@ As well as the following deprecations:
 * I18n error messages for ActiveRecord should be changed from :en.activerecord.errors.template to <tt>:en.errors.template</tt>.
 * <tt>model.errors.on</tt> is deprecated in favour of <tt>model.errors[]</tt>
 * validates_presence_of => validates... :presence => true
-* <tt>ActiveRecord::Base.colorize_logging</tt> and <tt>config.active_record.colorize_logging</tt> are deprecated in favour of <tt>Rails::Subscriber.colorize_logging</tt> or <tt>config.colorize_logging</tt>
+* <tt>ActiveRecord::Base.colorize_logging</tt> and <tt>config.active_record.colorize_logging</tt> are deprecated in favour of <tt>Rails::LogSubscriber.colorize_logging</tt> or <tt>config.colorize_logging</tt>
 
 NOTE: While an implementation of State Machine has been in Active Record edge for some months now, it has been removed from the Rails 3.0 release.
 
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index b7a39fd5a7..3d3151bd8f 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -7,7 +7,7 @@ require 'active_support/core_ext/logger'
 require 'rails/application'
 require 'rails/version'
 require 'rails/deprecation'
-require 'rails/subscriber'
+require 'rails/log_subscriber'
 require 'rails/ruby_version_check'
 
 require 'active_support/railtie'
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index b20e53f2de..0714b34b31 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -49,17 +49,17 @@ module Rails
         end
       end
 
-      # Initialize rails subscriber on top of notifications.
-      initializer :initialize_subscriber do
+      # Initialize rails log subscriber on top of notifications.
+      initializer :initialize_log_subscriber do
         require 'active_support/notifications'
 
         if config.colorize_logging == false
-          Rails::Subscriber.colorize_logging = false
+          Rails::LogSubscriber.colorize_logging = false
           config.generators.colorize_logging = false
         end
 
         ActiveSupport::Notifications.subscribe do |*args|
-          Rails::Subscriber.dispatch(args)
+          Rails::LogSubscriber.dispatch(args)
         end
       end
 
diff --git a/railties/lib/rails/subscriber.rb b/railties/lib/rails/log_subscriber.rb
similarity index 69%
rename from railties/lib/rails/subscriber.rb
rename to railties/lib/rails/log_subscriber.rb
index 8c62f562d9..c867b92b6b 100644
--- a/railties/lib/rails/subscriber.rb
+++ b/railties/lib/rails/log_subscriber.rb
@@ -2,15 +2,15 @@ require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/notifications'
 
 module Rails
-  # Rails::Subscriber is an object set to consume ActiveSupport::Notifications
-  # on initialization with solely purpose of logging. The subscriber dispatches
+  # Rails::LogSubscriber is an object set to consume ActiveSupport::Notifications
+  # on initialization with solely purpose of logging. The log subscriber dispatches
   # notifications to a regirested object based on its given namespace.
   #
-  # An example would be ActiveRecord subscriber responsible for logging queries:
+  # An example would be ActiveRecord log subscriber responsible for logging queries:
   #
   #   module ActiveRecord
   #     class Railtie
-  #       class Subscriber < Rails::Subscriber
+  #       class LogSubscriber < Rails::LogSubscriber
   #         def sql(event)
   #           "#{event.payload[:name]} (#{event.duration}) #{event.payload[:sql]}"
   #         end
@@ -20,19 +20,19 @@ module Rails
   #
   # It's finally registed as:
   #
-  #   Rails::Subscriber.add :active_record, ActiveRecord::Railtie::Subscriber.new
+  #   Rails::LogSubscriber.add :active_record, ActiveRecord::Railtie::LogSubscriber.new
   #
-  # So whenever a "active_record.sql" notification arrive to Rails::Subscriber,
+  # So whenever a "active_record.sql" notification arrive to Rails::LogSubscriber,
   # it will properly dispatch the event (ActiveSupport::Notifications::Event) to
   # the sql method.
   #
-  # This is useful because it avoids spanning several subscribers just for logging
+  # This is useful because it avoids spanning several log subscribers just for logging
   # purposes(which slows down the main thread). Besides of providing a centralized
   # facility on top of Rails.logger.
   # 
-  # Subscriber also has some helpers to deal with logging and automatically flushes
+  # Log subscriber also has some helpers to deal with logging and automatically flushes
   # all logs when the request finishes (via action_dispatch.callback notification).
-  class Subscriber
+  class LogSubscriber
     mattr_accessor :colorize_logging
     self.colorize_logging = true
 
@@ -50,30 +50,30 @@ module Rails
     CYAN       = "\e[36m"
     WHITE      = "\e[37m"
 
-    def self.add(namespace, subscriber)
-      subscribers[namespace.to_sym] = subscriber
+    def self.add(namespace, log_subscriber)
+      log_subscribers[namespace.to_sym] = log_subscriber
     end
 
-    def self.subscribers
-      @subscribers ||= {}
+    def self.log_subscribers
+      @log_subscribers ||= {}
     end
 
     def self.dispatch(args)
       namespace, name = args[0].split(".")
-      subscriber = subscribers[namespace.to_sym]
+      log_subscriber = log_subscribers[namespace.to_sym]
 
-      if subscriber.respond_to?(name) && subscriber.logger
+      if log_subscriber.respond_to?(name) && log_subscriber.logger
         begin
-          subscriber.send(name, ActiveSupport::Notifications::Event.new(*args))
+          log_subscriber.send(name, ActiveSupport::Notifications::Event.new(*args))
         rescue Exception => e
           Rails.logger.error "Could not log #{args[0].inspect} event. #{e.class}: #{e.message}"
         end
       end
     end
 
-    # Flush all subscribers' logger.
+    # Flush all log_subscribers' logger.
     def self.flush_all!
-      loggers = subscribers.values.map(&:logger)
+      loggers = log_subscribers.values.map(&:logger)
       loggers.uniq!
       loggers.each { |l| l.flush if l.respond_to?(:flush) }
     end
diff --git a/railties/lib/rails/subscriber/test_helper.rb b/railties/lib/rails/log_subscriber/test_helper.rb
similarity index 68%
rename from railties/lib/rails/subscriber/test_helper.rb
rename to railties/lib/rails/log_subscriber/test_helper.rb
index 39b4117372..9ede56cad4 100644
--- a/railties/lib/rails/subscriber/test_helper.rb
+++ b/railties/lib/rails/log_subscriber/test_helper.rb
@@ -1,13 +1,13 @@
-require 'rails/subscriber'
+require 'rails/log_subscriber'
 
 module Rails
-  class Subscriber
-    # Provides some helpers to deal with testing subscribers by setting up
+  class LogSubscriber
+    # Provides some helpers to deal with testing log subscribers by setting up
     # notifications. Take for instance ActiveRecord subscriber tests:
     #
-    #   class SyncSubscriberTest < ActiveSupport::TestCase
-    #     include Rails::Subscriber::TestHelper
-    #     Rails::Subscriber.add(:active_record, ActiveRecord::Railties::Subscriber.new)
+    #   class SyncLogSubscriberTest < ActiveSupport::TestCase
+    #     include Rails::LogSubscriber::TestHelper
+    #     Rails::LogSubscriber.add(:active_record, ActiveRecord::Railties::LogSubscriber.new)
     # 
     #     def test_basic_query_logging
     #       Developer.all
@@ -17,18 +17,18 @@ module Rails
     #       assert_match /SELECT \* FROM "developers"/, @logger.logged(:debug).last
     #     end
     # 
-    #     class SyncSubscriberTest < ActiveSupport::TestCase
-    #       include Rails::Subscriber::SyncTestHelper
-    #       include SubscriberTest
+    #     class SyncLogSubscriberTest < ActiveSupport::TestCase
+    #       include Rails::LogSubscriber::SyncTestHelper
+    #       include LogSubscriberTest
     #     end
     # 
-    #     class AsyncSubscriberTest < ActiveSupport::TestCase
-    #       include Rails::Subscriber::AsyncTestHelper
-    #       include SubscriberTest
+    #     class AsyncLogSubscriberTest < ActiveSupport::TestCase
+    #       include Rails::LogSubscriber::AsyncTestHelper
+    #       include LogSubscriberTest
     #     end
     #   end
     #
-    # All you need to do is to ensure that your subscriber is added to Rails::Subscriber,
+    # All you need to do is to ensure that your log subscriber is added to Rails::Subscriber,
     # as in the second line of the code above. The test helpers is reponsible for setting
     # up the queue, subscriptions and turning colors in logs off.
     #
@@ -42,8 +42,8 @@ module Rails
         @logger   = MockLogger.new
         @notifier = ActiveSupport::Notifications::Notifier.new(queue)
 
-        Rails::Subscriber.colorize_logging = false
-        @notifier.subscribe { |*args| Rails::Subscriber.dispatch(args) }
+        Rails::LogSubscriber.colorize_logging = false
+        @notifier.subscribe { |*args| Rails::LogSubscriber.dispatch(args) }
 
         set_logger(@logger)
         ActiveSupport::Notifications.notifier = @notifier
@@ -80,7 +80,7 @@ module Rails
         @notifier.wait
       end
 
-      # Overwrite if you use another logger in your subscriber:
+      # Overwrite if you use another logger in your log subscriber:
       #
       #   def logger
       #     ActiveRecord::Base.logger = @logger
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index de21fb4f10..2efe224e94 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -1,9 +1,9 @@
-require 'rails/subscriber'
+require 'rails/log_subscriber'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
-    class Logger < Rails::Subscriber
+    class Logger < Rails::LogSubscriber
       def initialize(app)
         @app = app
       end
@@ -26,7 +26,7 @@ module Rails
         end
 
         def after_dispatch(env)
-          Rails::Subscriber.flush_all!
+          Rails::LogSubscriber.flush_all!
         end
 
     end
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index c038d0ac70..67afae5862 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -32,8 +32,8 @@ module Rails
         subclasses.map { |p| p.railtie_name }
       end
 
-      def subscriber(subscriber)
-        Rails::Subscriber.add(railtie_name, subscriber)
+      def log_subscriber(log_subscriber)
+        Rails::LogSubscriber.add(railtie_name, log_subscriber)
       end
 
       def rake_tasks(&blk)
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index 061bb34c19..b99cf5bb4f 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
       ActiveSupport::Notifications.notifier.wait
     end
 
-    test "rails subscribers are added" do
+    test "rails log_subscribers are added" do
       add_to_config <<-RUBY
         config.colorize_logging = false
       RUBY
diff --git a/railties/test/log_subscriber_test.rb b/railties/test/log_subscriber_test.rb
new file mode 100644
index 0000000000..be176df1bb
--- /dev/null
+++ b/railties/test/log_subscriber_test.rb
@@ -0,0 +1,119 @@
+require 'abstract_unit'
+require 'rails/log_subscriber/test_helper'
+
+class MyLogSubscriber < Rails::LogSubscriber
+  attr_reader :event
+
+  def some_event(event)
+    @event = event
+    info event.name
+  end
+
+  def foo(event)
+    debug "debug"
+    info "info"
+    warn "warn"
+  end
+
+  def bar(event)
+    info "#{color("cool", :red)}, #{color("isn't it?", :blue, true)}"
+  end
+
+  def puke(event)
+    raise "puke"
+  end
+end
+
+class SyncLogSubscriberTest < ActiveSupport::TestCase
+  include Rails::LogSubscriber::TestHelper
+
+  def setup
+    super
+    @log_subscriber = MyLogSubscriber.new
+    Rails::LogSubscriber.instance_variable_set(:@log_tailer, nil)
+  end
+
+  def teardown
+    super
+    Rails::LogSubscriber.log_subscribers.clear
+    Rails::LogSubscriber.instance_variable_set(:@log_tailer, nil)
+  end
+
+  def instrument(*args, &block)
+    ActiveSupport::Notifications.instrument(*args, &block)
+  end
+
+  def test_proxies_method_to_rails_logger
+    @log_subscriber.foo(nil)
+    assert_equal %w(debug), @logger.logged(:debug)
+    assert_equal %w(info), @logger.logged(:info)
+    assert_equal %w(warn), @logger.logged(:warn)
+  end
+
+  def test_set_color_for_messages
+    Rails::LogSubscriber.colorize_logging = true
+    @log_subscriber.bar(nil)
+    assert_equal "\e[31mcool\e[0m, \e[1m\e[34misn't it?\e[0m", @logger.logged(:info).last
+  end
+
+  def test_does_not_set_color_if_colorize_logging_is_set_to_false
+    @log_subscriber.bar(nil)
+    assert_equal "cool, isn't it?", @logger.logged(:info).last
+  end
+
+  def test_event_is_sent_to_the_registered_class
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    instrument "my_log_subscriber.some_event"
+    wait
+    assert_equal %w(my_log_subscriber.some_event), @logger.logged(:info)
+  end
+
+  def test_event_is_an_active_support_notifications_event
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    instrument "my_log_subscriber.some_event"
+    wait
+    assert_kind_of ActiveSupport::Notifications::Event, @log_subscriber.event
+  end
+
+  def test_does_not_send_the_event_if_it_doesnt_match_the_class
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    instrument "my_log_subscriber.unknown_event"
+    wait
+    # If we get here, it means that NoMethodError was raised.
+  end
+
+  def test_does_not_send_the_event_if_logger_is_nil
+    Rails.logger = nil
+    @log_subscriber.expects(:some_event).never
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    instrument "my_log_subscriber.some_event"
+    wait
+  end
+
+  def test_flushes_loggers
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    Rails::LogSubscriber.flush_all!
+    assert_equal 1, @logger.flush_count
+  end
+
+  def test_flushes_the_same_logger_just_once
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    Rails::LogSubscriber.add :another, @log_subscriber
+    Rails::LogSubscriber.flush_all!
+    wait
+    assert_equal 1, @logger.flush_count
+  end
+
+  def test_logging_does_not_die_on_failures
+    Rails::LogSubscriber.add :my_log_subscriber, @log_subscriber
+    instrument "my_log_subscriber.puke"
+    instrument "my_log_subscriber.some_event"
+    wait
+
+    assert_equal 1, @logger.logged(:info).size
+    assert_equal 'my_log_subscriber.some_event', @logger.logged(:info).last
+
+    assert_equal 1, @logger.logged(:error).size
+    assert_equal 'Could not log "my_log_subscriber.puke" event. RuntimeError: puke', @logger.logged(:error).last
+  end
+end
\ No newline at end of file
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index b723e08281..9eb4e9993a 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -51,12 +51,12 @@ module RailtiesTest
       assert_equal "bar",   Bar.config.foo.bar
     end
 
-    test "railtie can add subscribers" do
+    test "railtie can add log subscribers" do
       begin
-        class Foo < Rails::Railtie ; subscriber(Rails::Subscriber.new) ; end
-        assert_kind_of Rails::Subscriber, Rails::Subscriber.subscribers[:foo]
+        class Foo < Rails::Railtie ; log_subscriber(Rails::LogSubscriber.new) ; end
+        assert_kind_of Rails::LogSubscriber, Rails::LogSubscriber.log_subscribers[:foo]
       ensure
-        Rails::Subscriber.subscribers.clear
+        Rails::LogSubscriber.log_subscribers.clear
       end
     end
 
diff --git a/railties/test/subscriber_test.rb b/railties/test/subscriber_test.rb
deleted file mode 100644
index f6c895093f..0000000000
--- a/railties/test/subscriber_test.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'abstract_unit'
-require 'rails/subscriber/test_helper'
-
-class MySubscriber < Rails::Subscriber
-  attr_reader :event
-
-  def some_event(event)
-    @event = event
-    info event.name
-  end
-
-  def foo(event)
-    debug "debug"
-    info "info"
-    warn "warn"
-  end
-
-  def bar(event)
-    info "#{color("cool", :red)}, #{color("isn't it?", :blue, true)}"
-  end
-
-  def puke(event)
-    raise "puke"
-  end
-end
-
-class SyncSubscriberTest < ActiveSupport::TestCase
-  include Rails::Subscriber::TestHelper
-
-  def setup
-    super
-    @subscriber = MySubscriber.new
-    Rails::Subscriber.instance_variable_set(:@log_tailer, nil)
-  end
-
-  def teardown
-    super
-    Rails::Subscriber.subscribers.clear
-    Rails::Subscriber.instance_variable_set(:@log_tailer, nil)
-  end
-
-  def instrument(*args, &block)
-    ActiveSupport::Notifications.instrument(*args, &block)
-  end
-
-  def test_proxies_method_to_rails_logger
-    @subscriber.foo(nil)
-    assert_equal %w(debug), @logger.logged(:debug)
-    assert_equal %w(info), @logger.logged(:info)
-    assert_equal %w(warn), @logger.logged(:warn)
-  end
-
-  def test_set_color_for_messages
-    Rails::Subscriber.colorize_logging = true
-    @subscriber.bar(nil)
-    assert_equal "\e[31mcool\e[0m, \e[1m\e[34misn't it?\e[0m", @logger.logged(:info).last
-  end
-
-  def test_does_not_set_color_if_colorize_logging_is_set_to_false
-    @subscriber.bar(nil)
-    assert_equal "cool, isn't it?", @logger.logged(:info).last
-  end
-
-  def test_event_is_sent_to_the_registered_class
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    instrument "my_subscriber.some_event"
-    wait
-    assert_equal %w(my_subscriber.some_event), @logger.logged(:info)
-  end
-
-  def test_event_is_an_active_support_notifications_event
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    instrument "my_subscriber.some_event"
-    wait
-    assert_kind_of ActiveSupport::Notifications::Event, @subscriber.event
-  end
-
-  def test_does_not_send_the_event_if_it_doesnt_match_the_class
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    instrument "my_subscriber.unknown_event"
-    wait
-    # If we get here, it means that NoMethodError was raised.
-  end
-
-  def test_does_not_send_the_event_if_logger_is_nil
-    Rails.logger = nil
-    @subscriber.expects(:some_event).never
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    instrument "my_subscriber.some_event"
-    wait
-  end
-
-  def test_flushes_loggers
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    Rails::Subscriber.flush_all!
-    assert_equal 1, @logger.flush_count
-  end
-
-  def test_flushes_the_same_logger_just_once
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    Rails::Subscriber.add :another, @subscriber
-    Rails::Subscriber.flush_all!
-    wait
-    assert_equal 1, @logger.flush_count
-  end
-
-  def test_logging_does_not_die_on_failures
-    Rails::Subscriber.add :my_subscriber, @subscriber
-    instrument "my_subscriber.puke"
-    instrument "my_subscriber.some_event"
-    wait
-
-    assert_equal 1, @logger.logged(:info).size
-    assert_equal 'my_subscriber.some_event', @logger.logged(:info).last
-
-    assert_equal 1, @logger.logged(:error).size
-    assert_equal 'Could not log "my_subscriber.puke" event. RuntimeError: puke', @logger.logged(:error).last
-  end
-end
\ No newline at end of file