15 files changed, 81 insertions, 79 deletions
diff --git a/lib/.DS_Store b/lib/.DS_Store
new file mode 100644
index 0000000000..4bb82d51a5
--- /dev/null
+++ b/lib/.DS_Store
diff --git a/lib/action_mailbox.rb b/lib/action_mailbox.rb
new file mode 100644
index 0000000000..f638dc3f80
--- /dev/null
+++ b/lib/action_mailbox.rb
@@ -0,0 +1,10 @@
+require "action_mailbox/engine"
+
+module ActionMailbox
+  extend ActiveSupport::Autoload
+
+  autoload :Base
+  autoload :Router
+  autoload :Callbacks
+  autoload :Routing
+end
diff --git a/lib/action_mailroom/mailbox.rb b/lib/action_mailbox/base.rb
index 936054810f..476c343415 100644
--- a/lib/action_mailroom/mailbox.rb
+++ b/lib/action_mailbox/base.rb
@@ -1,11 +1,11 @@
 require "active_support/rescuable"
 
-require "action_mailroom/mailbox/callbacks"
-require "action_mailroom/mailbox/routing"
+require "action_mailbox/callbacks"
+require "action_mailbox/routing"
 
-class ActionMailroom::Mailbox
+class ActionMailbox::Base
   include ActiveSupport::Rescuable
-  include Callbacks, Routing
+  include ActionMailbox::Callbacks, ActionMailbox::Routing
 
   attr_reader :inbound_email
   delegate :mail, :bounced!, to: :inbound_email
diff --git a/lib/action_mailbox/callbacks.rb b/lib/action_mailbox/callbacks.rb
new file mode 100644
index 0000000000..33caaafd2a
--- /dev/null
+++ b/lib/action_mailbox/callbacks.rb
@@ -0,0 +1,26 @@
+require "active_support/callbacks"
+
+module ActionMailbox
+  module Callbacks
+    extend  ActiveSupport::Concern
+    include ActiveSupport::Callbacks
+
+    included do
+      define_callbacks :process
+    end
+
+    module ClassMethods
+      def before_processing(*methods, &block)
+        set_callback(:process, :before, *methods, &block)
+      end
+
+      def after_processing(*methods, &block)
+        set_callback(:process, :after, *methods, &block)
+      end
+
+      def around_processing(*methods, &block)
+        set_callback(:process, :around, *methods, &block)
+      end
+    end
+  end
+end
diff --git a/lib/action_mailbox/engine.rb b/lib/action_mailbox/engine.rb
new file mode 100644
index 0000000000..92852a0fa3
--- /dev/null
+++ b/lib/action_mailbox/engine.rb
@@ -0,0 +1,14 @@
+require "rails/engine"
+
+module ActionMailbox
+  class Engine < Rails::Engine
+    isolate_namespace ActionMailbox
+    config.eager_load_namespaces << ActionMailbox
+
+    initializer "action_mailbox.config" do
+      config.after_initialize do |app|
+        # Configure
+      end
+    end
+  end
+end
diff --git a/lib/action_mailroom/router.rb b/lib/action_mailbox/router.rb
index 29ba803e03..8ba3ad0bae 100644
--- a/lib/action_mailroom/router.rb
+++ b/lib/action_mailbox/router.rb
@@ -1,4 +1,4 @@
-class ActionMailroom::Router
+class ActionMailbox::Router
   class RoutingError < StandardError; end
 
   def initialize
@@ -33,4 +33,4 @@ class ActionMailroom::Router
     end
 end
 
-require "action_mailroom/router/route"
+require "action_mailbox/router/route"
diff --git a/lib/action_mailroom/router/route.rb b/lib/action_mailbox/router/route.rb
index 6d0b922275..7be4407339 100644
--- a/lib/action_mailroom/router/route.rb
+++ b/lib/action_mailbox/router/route.rb
@@ -1,4 +1,4 @@
-class ActionMailroom::Router::Route
+class ActionMailbox::Router::Route
   class InvalidAddressError < StandardError; end
 
   attr_reader :address, :mailbox_name
diff --git a/lib/action_mailbox/routing.rb b/lib/action_mailbox/routing.rb
new file mode 100644
index 0000000000..b40e2774e4
--- /dev/null
+++ b/lib/action_mailbox/routing.rb
@@ -0,0 +1,17 @@
+module ActionMailbox
+  module Routing
+    extend ActiveSupport::Concern
+
+    class_methods do
+      attr_reader :router
+
+      def routing(routes)
+        (@router ||= ActionMailbox::Router.new).add_routes(routes)
+      end
+
+      def route(inbound_email)
+        @router.route(inbound_email)
+      end
+    end
+  end
+end
diff --git a/lib/action_mailroom/test_helper.rb b/lib/action_mailbox/test_helper.rb
index 3e1ff87839..65a15a1281 100644
--- a/lib/action_mailroom/test_helper.rb
+++ b/lib/action_mailbox/test_helper.rb
@@ -1,6 +1,6 @@
 require "mail"
 
-module ActionMailroom
+module ActionMailbox
   module TestHelper
     # Create an InboundEmail record using an eml fixture in the format of message/rfc822
     # referenced with +fixture_name+ located in +test/fixtures/files/fixture_name+.
@@ -14,7 +14,7 @@ module ActionMailroom
     end
 
     def create_inbound_email(io, filename: 'mail.eml', status: :processing)
-      ActionMailroom::InboundEmail.create_and_extract_message_id! \
+      ActionMailbox::InboundEmail.create_and_extract_message_id! \
         ActionDispatch::Http::UploadedFile.new(tempfile: io, filename: filename, type: 'message/rfc822'),
         status: status
     end
diff --git a/lib/action_mailroom/version.rb b/lib/action_mailbox/version.rb
index 64a9d8eacd..23c615dbbd 100644
--- a/lib/action_mailroom/version.rb
+++ b/lib/action_mailbox/version.rb
@@ -1,3 +1,3 @@
-module ActionMailroom
+module ActionMailbox
   VERSION = '0.1.0'
 end
diff --git a/lib/action_mailroom.rb b/lib/action_mailroom.rb
deleted file mode 100644
index e50d1c4ebe..0000000000
--- a/lib/action_mailroom.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "action_mailroom/engine"
-
-module ActionMailroom
-  extend ActiveSupport::Autoload
-
-  autoload :Mailbox
-  autoload :Router
-end
diff --git a/lib/action_mailroom/engine.rb b/lib/action_mailroom/engine.rb
deleted file mode 100644
index 6a8d4c23c0..0000000000
--- a/lib/action_mailroom/engine.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "rails/engine"
-
-module ActionMailroom
-  class Engine < Rails::Engine
-    isolate_namespace ActionMailroom
-    config.eager_load_namespaces << ActionMailroom
-
-    initializer "action_mailroom.config" do
-      config.after_initialize do |app|
-        # Configure
-      end
-    end
-  end
-end
diff --git a/lib/action_mailroom/mailbox/callbacks.rb b/lib/action_mailroom/mailbox/callbacks.rb
deleted file mode 100644
index ae5a461d8f..0000000000
--- a/lib/action_mailroom/mailbox/callbacks.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "active_support/callbacks"
-
-module ActionMailroom
-  class Mailbox
-    module Callbacks
-      extend  ActiveSupport::Concern
-      include ActiveSupport::Callbacks
-
-      included do
-        define_callbacks :process
-      end
-
-      module ClassMethods
-        def before_processing(*methods, &block)
-          set_callback(:process, :before, *methods, &block)
-        end
-
-        def after_processing(*methods, &block)
-          set_callback(:process, :after, *methods, &block)
-        end
-
-        def around_processing(*methods, &block)
-          set_callback(:process, :around, *methods, &block)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/action_mailroom/mailbox/routing.rb b/lib/action_mailroom/mailbox/routing.rb
deleted file mode 100644
index 9f082c8aa5..0000000000
--- a/lib/action_mailroom/mailbox/routing.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module ActionMailroom::Mailbox::Routing
-  extend ActiveSupport::Concern
-
-  class_methods do
-    attr_reader :router
-
-    def routing(routes)
-      (@router ||= ActionMailroom::Router.new).add_routes(routes)
-    end
-
-    def route(inbound_email)
-      @router.route(inbound_email)
-    end
-  end
-end
diff --git a/lib/tasks/action_mailroom.rake b/lib/tasks/action_mailbox.rake
index 5c929af119..b7c11934f8 100644
--- a/lib/tasks/action_mailroom.rake
+++ b/lib/tasks/action_mailbox.rake
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-namespace :action_mailroom do
+namespace :action_mailbox do
   # Prevent migration installation task from showing up twice.
   Rake::Task["install:migrations"].clear_comments
 
@@ -8,10 +8,10 @@ namespace :action_mailroom do
   task install: %w( environment copy_migration active_storage:install )
 
   task :copy_migration do
-    if Rake::Task.task_defined?("action_mailroom:install:migrations")
-      Rake::Task["action_mailroom:install:migrations"].invoke
+    if Rake::Task.task_defined?("action_mailbox:install:migrations")
+      Rake::Task["action_mailbox:install:migrations"].invoke
     else
-      Rake::Task["app:action_mailroom:install:migrations"].invoke
+      Rake::Task["app:action_mailbox:install:migrations"].invoke
     end
   end
 end