Rename plugin_name to railtie_name and engine_name.

3 files changed, 11 insertions, 15 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index e0bd12497f..c29cd0ef2c 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -71,7 +71,7 @@ module Rails
       end
 
       def config_keys
-        (Railtie.plugin_names + Engine.plugin_names).map { |n| n.to_s }.uniq
+        (Railtie.railtie_names + Engine.engine_names).map { |n| n.to_s }.uniq
       end
 
       def options
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 6f724963b2..842785875a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -9,6 +9,9 @@ module Rails
     class << self
       attr_accessor :called_from
 
+      alias :engine_name  :railtie_name
+      alias :engine_names :railtie_names
+
       def inherited(base)
         unless abstract_railtie?(base)
           base.called_from = begin
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 6424be5a55..3cf358d75f 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -22,25 +22,18 @@ module Rails
         end
       end
 
-      # TODO This should be called railtie_name and engine_name
-      def plugin_name(plugin_name = nil)
-        @plugin_name ||= name.demodulize.underscore
-        @plugin_name = plugin_name if plugin_name
-        @plugin_name
+      def railtie_name(railtie_name = nil)
+        @railtie_name ||= name.demodulize.underscore
+        @railtie_name = railtie_name if railtie_name
+        @railtie_name
       end
 
-      # TODO Deprecate me
-      def plugins
-        subclasses
-      end
-
-      # TODO Deprecate me
-      def plugin_names
-        plugins.map { |p| p.plugin_name }
+      def railtie_names
+        subclasses.map { |p| p.railtie_name }
       end
 
       def subscriber(subscriber)
-        Rails::Subscriber.add(plugin_name, subscriber)
+        Rails::Subscriber.add(railtie_name, subscriber)
       end
 
       def rake_tasks(&blk)