diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 51b96d9bf..d7f952aed 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 2000`
-# on 2023-03-05 00:33:33 UTC using RuboCop version 1.44.1.
+# on 2023-07-06 00:42:04 UTC using RuboCop version 1.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,7 +18,7 @@ RSpec/AnyInstance:
   Exclude:
     - 'spec/furniture/marketplace/checkouts_controller_request_spec.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -32,15 +32,11 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/tasks/release_after_build_spec.rb'
 
-# Offense count: 23
+# Offense count: 2
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
   Exclude:
-    - 'spec/models/membership_spec.rb'
-    - 'spec/policies/room_policy_spec.rb'
     - 'spec/requests/rsvps_controller_request_spec.rb'
-    - 'spec/requests/spaces_controller_request_spec.rb'
-    - 'spec/support/shared_examples/a_space_member_only_route.rb'
 
 # Offense count: 1
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
@@ -54,12 +50,12 @@ RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/models/blueprint_spec.rb'
 
-# Offense count: 4
+# Offense count: 1
 RSpec/LetSetup:
   Exclude:
     - 'spec/policies/membership_policy_spec.rb'
 
-# Offense count: 6
+# Offense count: 3
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -71,7 +67,7 @@ RSpec/NamedSubject:
 # Offense count: 6
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
-# Include: db/migrate/*.rb
+# Include: db/**/*.rb
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20201001203403_add_room_access_level_default.rb'
@@ -83,12 +79,14 @@ Rails/BulkChangeTable:
 
 # Offense count: 2
 # Configuration parameters: Include.
-# Include: db/migrate/*.rb
+# Include: db/**/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/20200724231439_sprout_initial_domain_model.rb'
+    - 'db/schema.rb'
 
 # Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: slashes, arguments
 Rails/FilePath:
@@ -96,27 +94,21 @@ Rails/FilePath:
     - 'app/controllers/application_controller.rb'
     - 'config/application.rb'
     - 'config/environments/development.rb'
-    - 'config/initializers/assets.rb'
     - 'config/initializers/gretel.rb'
     - 'spec/rails_helper.rb'
 
-# Offense count: 3
+# Offense count: 1
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/invitation.rb'
 
-# Offense count: 2
+# Offense count: 1
 Rails/I18nLocaleTexts:
   Exclude:
     - 'app/mailers/authenticated_session_mailer.rb'
 
-# Offense count: 1
-Rails/OutputSafety:
-  Exclude:
-    - 'app/components/card_component.rb'
-
 # Offense count: 9
 # Configuration parameters: Include.
 # Include: db/**/*.rb
diff --git a/db/migrate/20230706003709_formally_rename_marketplace_order_notifications_table.rb b/db/migrate/20230706003709_formally_rename_marketplace_order_notifications_table.rb
new file mode 100644
index 000000000..f99232d97
--- /dev/null
+++ b/db/migrate/20230706003709_formally_rename_marketplace_order_notifications_table.rb
@@ -0,0 +1,7 @@
+class FormallyRenameMarketplaceOrderNotificationsTable < ActiveRecord::Migration[7.0]
+  def change
+    safety_assured do
+      rename_table :marketplace_order_notification_methods, :marketplace_notification_methods
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ee9c68863..e73b98fb1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_06_15_002110) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_06_003709) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"