7 files changed, 16 insertions, 14 deletions
diff --git a/actioncable/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb
index 041dc5e890..f44d0fdfb7 100644
--- a/actioncable/lib/action_cable/server/base.rb
+++ b/actioncable/lib/action_cable/server/base.rb
@@ -47,7 +47,7 @@ module ActionCable
 
       # Adapter used for all streams/broadcasting.
       def adapter
-        @adapter ||= config.storage_adapter.new(self)
+        @adapter ||= config.subscription_adapter.new(self)
       end
 
       # All the identifiers applied to the connection class associated with this server.
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index c43928d898..344ae0ad5d 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -30,12 +30,14 @@ module ActionCable
         end
       end
 
-      # Returns constant of storage adapter specified in config/cable.yml
+      # Returns constant of subscription adapter specified in config/cable.yml
       # If the adapter cannot be found, this will default to the Redis adapter
-      def storage_adapter
+      def subscription_adapter
         # Defaults to redis if no adapter is set
         adapter = cable.fetch('adapter') { 'redis' }
-        "ActionCable::StorageAdapter::#{adapter.camelize}".constantize
+        adapter.camelize
+        adapter = 'PostgreSQL' if adapter == 'Postgresql'
+        "ActionCable::SubscriptionAdapter::#{adapter}".constantize
       end
     end
   end
diff --git a/actioncable/lib/action_cable/storage_adapter.rb b/actioncable/lib/action_cable/storage_adapter.rb
deleted file mode 100644
index a4fe12c770..0000000000
--- a/actioncable/lib/action_cable/storage_adapter.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ActionCable
-  module StorageAdapter
-    autoload :Base, 'action_cable/storage_adapter/base'
-    autoload :PostgreSQL, 'action_cable/storage_adapter/postgresql'
-    autoload :Redis, 'action_cable/storage_adapter/redis'
-  end
-end
diff --git a/actioncable/lib/action_cable/subscription_adapter.rb b/actioncable/lib/action_cable/subscription_adapter.rb
new file mode 100644
index 0000000000..287d2b9611
--- /dev/null
+++ b/actioncable/lib/action_cable/subscription_adapter.rb
@@ -0,0 +1,7 @@
+module ActionCable
+  module SubscriptionAdapter
+    autoload :Base, 'action_cable/subscription_adapter/base'
+    autoload :PostgreSQL, 'action_cable/subscription_adapter/postgresql'
+    autoload :Redis, 'action_cable/subscription_adapter/redis'
+  end
+end
diff --git a/actioncable/lib/action_cable/storage_adapter/base.rb b/actioncable/lib/action_cable/subscription_adapter/base.rb
index 4330bc28f1..11910803e8 100644
--- a/actioncable/lib/action_cable/storage_adapter/base.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/base.rb
@@ -1,5 +1,5 @@
 module ActionCable
-  module StorageAdapter
+  module SubscriptionAdapter
     class Base
       attr_reader :logger, :server
 
diff --git a/actioncable/lib/action_cable/storage_adapter/postgresql.rb b/actioncable/lib/action_cable/subscription_adapter/postgresql.rb
index 1d8460e2ea..f55b56a2b5 100644
--- a/actioncable/lib/action_cable/storage_adapter/postgresql.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/postgresql.rb
@@ -7,7 +7,7 @@ rescue Gem::LoadError => e
 end
 
 module ActionCable
-  module StorageAdapter
+  module SubscriptionAdapter
     class PostgreSQL < Base
       # The storage instance used for broadcasting. Not intended for direct user use.
       def broadcast(channel, payload)
diff --git a/actioncable/lib/action_cable/storage_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb
index 62a3971ec7..c6d8371f16 100644
--- a/actioncable/lib/action_cable/storage_adapter/redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb
@@ -6,7 +6,7 @@ rescue Gem::LoadError => e
 end
 
 module ActionCable
-  module StorageAdapter
+  module SubscriptionAdapter
     class Redis < Base
       def broadcast(channel, payload)
         redis_conn.publish(channel, payload)