diff --git a/aleksis/core/migrations/0045_auto_20221120_1420.py b/aleksis/core/migrations/0045_add_room_model.py
similarity index 89%
rename from aleksis/core/migrations/0045_auto_20221120_1420.py
rename to aleksis/core/migrations/0045_add_room_model.py
index 59ff1af5cd71779c533eaf32278828cbd672cf3e..575b0a67ff6613244dfea904d532dd69b85e03be 100644
--- a/aleksis/core/migrations/0045_auto_20221120_1420.py
+++ b/aleksis/core/migrations/0045_add_room_model.py
@@ -37,14 +37,14 @@ class Migration(migrations.Migration):
         ),
         migrations.AddConstraint(
             model_name='room',
-            constraint=models.UniqueConstraint(fields=('site_id', 'short_name'), name='unique_short_name_per_site_room'),
+            constraint=models.UniqueConstraint(fields=('site_id', 'short_name'), name='unique_room_short_name_per_site'),
         ),
         # Migrate data from Chronos table; deletion will be handled by Chronos
         migrations.RunSQL(
             """
             -- Use a temporary, empty source table in case Chronos is not installed
-            CREATE TEMPORARY TABLE IF NOT EXISTS chronos_rooms (LIKE core_rooms);
-            INSERT INTO core_rooms SELECT * FROM chronos_rooms;
+            CREATE TEMPORARY TABLE IF NOT EXISTS chronos_room (LIKE core_room);
+            INSERT INTO core_room SELECT * FROM chronos_room;
             """
         ),
     ]
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index c730eb272577c5a70572141f3551d55172bf04a2..67b7c5a7b88fe347f5343444800c20fcf7236506 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -1477,6 +1477,6 @@ class Room(ExtensibleModel):
         verbose_name_plural = _("Rooms")
         constraints = [
             models.UniqueConstraint(
-                fields=["site_id", "short_name"], name="unique_short_name_per_site_room"
+                fields=["site_id", "short_name"], name="unique_room_short_name_per_site"
             ),
         ]