diff --git a/migrations/2021-05-15-071601_assets/up.sql b/migrations/2021-05-15-071601_assets/up.sql
index f414b95980..1fdaecb4c9 100644
--- a/migrations/2021-05-15-071601_assets/up.sql
+++ b/migrations/2021-05-15-071601_assets/up.sql
@@ -119,15 +119,15 @@ CREATE TABLE tts_models (
   -- they're approved, but unapproved models won't show up in public indices.
   -- This is independent of other visibility controls (is_mod_disabled, deleted_at,
   -- and creator_set_visibility)
-  is_mod_public_listing_approved BOOLEAN DEFAULT NULL,
+  is_public_listing_approved BOOLEAN DEFAULT NULL,
+
+  -- Extremely popular models may be locked from deletion or modification by users.
+  is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
 
   -- In this case, a moderator disables it from being used for inference.
   -- This also disables it for the creator.
   -- Unlike deletion, it remains "visible" to those that have access.
-  is_mod_disabled BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Extremely popular models may be locked from deletion or modification by users.
-  is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
+  is_locked_from_use BOOLEAN NOT NULL DEFAULT FALSE,
 
   -- If a moderator has comments.
   maybe_mod_comments VARCHAR(255) DEFAULT NULL,
@@ -159,8 +159,9 @@ CREATE TABLE tts_models (
   KEY index_creator_ip_address_last_update (creator_ip_address_last_update),
   KEY index_creator_set_visibility (creator_set_visibility),
   KEY index_private_bucket_hash (private_bucket_hash),
-  KEY index_is_mod_public_listing_approved (is_mod_public_listing_approved),
-  KEY index_is_mod_disabled (is_mod_disabled)
+  KEY index_is_public_listing_approved (is_public_listing_approved),
+  KEY index_is_locked_from_user_modification (is_locked_from_user_modification),
+  KEY index_is_locked_from_use (is_locked_from_use)
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
@@ -271,15 +272,15 @@ CREATE TABLE w2l_templates (
   -- they're approved, but unapproved templates won't show up in public indices.
   -- This is independent of other visibility controls (is_mod_disabled, deleted_at,
   -- and creator_set_visibility)
-  is_mod_public_listing_approved BOOLEAN DEFAULT NULL,
+  is_public_listing_approved BOOLEAN DEFAULT NULL,
+
+  -- Extremely popular models may be locked from deletion or modification by users.
+  is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
 
   -- In this case, a moderator disables it from being used for inference.
   -- This also disables it for the creator.
   -- Unlike deletion, it remains "visible" to those that have access.
-  is_mod_disabled BOOLEAN NOT NULL DEFAULT FALSE,
-
-  -- Extremely popular models may be locked from deletion or modification by users.
-  is_locked_from_user_modification BOOLEAN NOT NULL DEFAULT FALSE,
+  is_locked_from_use BOOLEAN NOT NULL DEFAULT FALSE,
 
   -- If a moderator has comments.
   maybe_mod_comments VARCHAR(255) DEFAULT NULL,
@@ -312,7 +313,8 @@ CREATE TABLE w2l_templates (
   KEY index_creator_ip_address_last_update (creator_ip_address_last_update),
   KEY index_creator_set_visibility (creator_set_visibility),
   KEY index_private_bucket_hash (private_bucket_hash),
-  KEY index_is_mod_public_listing_approved (is_mod_public_listing_approved),
-  KEY index_is_mod_disabled (is_mod_disabled)
+  KEY index_is_public_listing_approved (is_public_listing_approved),
+  KEY index_is_locked_from_user_modification (is_locked_from_user_modification),
+  KEY index_is_locked_from_use (is_locked_from_use)
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
diff --git a/migrations/2021-05-15-212918_inference_results/up.sql b/migrations/2021-05-15-212918_inference_results/up.sql
index f5d6045263..8e3ed05ed8 100644
--- a/migrations/2021-05-15-212918_inference_results/up.sql
+++ b/migrations/2021-05-15-212918_inference_results/up.sql
@@ -70,10 +70,6 @@ CREATE TABLE tts_results (
 
   -- ========== MODERATION DETAILS ==========
 
-  -- In this case, a moderator hides it from public.
-  -- It won't appear in lists on profiles or otherwise.
-  is_mod_hidden_from_public BOOLEAN NOT NULL DEFAULT FALSE,
-
   -- If a moderator has comments.
   maybe_mod_comments VARCHAR(255) DEFAULT NULL,
 
@@ -97,7 +93,6 @@ CREATE TABLE tts_results (
   KEY fk_maybe_creator_anonymous_visitor_token (maybe_creator_anonymous_visitor_token),
   KEY fk_maybe_mod_user_token (maybe_mod_user_token),
   KEY index_creator_ip_address (creator_ip_address),
-  KEY index_is_mod_hidden_from_public(is_mod_hidden_from_public),
   KEY index_user_deleted_at(user_deleted_at),
   KEY index_mod_deleted_at(mod_deleted_at)
 
@@ -156,10 +151,6 @@ CREATE TABLE w2l_results (
 
   -- ========== MODERATION DETAILS ==========
 
-  -- In this case, a moderator hides it from public.
-  -- It won't appear in lists on profiles or otherwise.
-  is_mod_hidden_from_public BOOLEAN NOT NULL DEFAULT FALSE,
-
   -- If a moderator has comments.
   maybe_mod_comments VARCHAR(255) DEFAULT NULL,
 
@@ -184,7 +175,6 @@ CREATE TABLE w2l_results (
   KEY fk_maybe_tts_inference_result_token (maybe_tts_inference_result_token),
   KEY fk_maybe_mod_user_token (maybe_mod_user_token),
   KEY index_creator_ip_address (creator_ip_address),
-  KEY index_is_mod_hidden_from_public(is_mod_hidden_from_public),
   KEY index_user_deleted_at(user_deleted_at),
   KEY index_mod_deleted_at(mod_deleted_at)