diff --git a/app/models/account.rb b/app/models/account.rb
index 761efd2fa..df0b845b0 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,5 +1,5 @@
 class Account < ApplicationRecord
-  include Account::Storage, Entropic, MultiTenant, Seedeable
+  include Account::Storage, Entropic, MultiTenantable, Seedeable
 
   has_one :join_code
   has_many :users, dependent: :destroy
diff --git a/app/models/concerns/multi_tenant.rb b/app/models/account/multi_tenantable.rb
similarity index 86%
rename from app/models/concerns/multi_tenant.rb
rename to app/models/account/multi_tenantable.rb
index 28c16b2c4..7d1ef5d39 100644
--- a/app/models/concerns/multi_tenant.rb
+++ b/app/models/account/multi_tenantable.rb
@@ -1,4 +1,4 @@
-module MultiTenant
+module Account::MultiTenantable
   extend ActiveSupport::Concern
 
   included do
diff --git a/test/models/account/multi_tenant_test.rb b/test/models/account/multi_tenantable_test.rb
similarity index 90%
rename from test/models/account/multi_tenant_test.rb
rename to test/models/account/multi_tenantable_test.rb
index fe5ebde00..ae1b189a3 100644
--- a/test/models/account/multi_tenant_test.rb
+++ b/test/models/account/multi_tenantable_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class MultiTenantTest < ActiveSupport::TestCase
+class Account::MultiTenantableTest < ActiveSupport::TestCase
   test "accepting_signups? is true when multi_tenant is enabled" do
     with_multi_tenant_mode(true) do
       assert Account.accepting_signups?