diff --git a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
index b4dccd4ece3bb5b347a1c8169a26d68112f5426b..6693c6b230694b2b04ed83e755ab415fae2e04a5 100644
--- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
@@ -125,11 +125,11 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='event',
-            name='teacher',
+            name='teachers',
             field=models.ManyToManyField(related_name='events', to='core.Person', verbose_name='Teachers')
         migrations.AddField(
             model_name='event',
-            name='group',
+            name='groups',
             field=models.ManyToManyField(related_name='group', to='core.Group', verbose_name='Groups'),
         ),
         migrations.AddField(
@@ -144,8 +144,8 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='event',
-            name='subject',
-            field=models.ManyToManyField(related_name='events', to='chronos.Subject', verbose_name='Subjects'),
+            name='rooms',
+            field=models.ManyToManyField(related_name='events', to='chronos.Room', verbose_name='Rooms'),
         ),
         migrations.AddField(
             model_name='absence',
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 7f3841114f88292e3e3308529c60c141696eef41..d4c90af6dc9dd9b2cfc67fd46d7ecfdefce1cab9 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -653,9 +653,9 @@ class Event(ExtensibleModel):
     absence_reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="absence_reason", verbose_name=_("Absence reason"))
     periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of event"), related_name="+")
     periodto = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of event"), related_name="+")
-    group = models.ManyToManyField("core.Group", related_name="events", verbose_name=_("Groups"))
-    subject = models.ManyToManyField("Subject", related_name="events", verbose_name=_("Subjects"))
-    teacher = models.ManyToManyField("core.Person", related_name="events", verbose_name=_("Teachers"))
+    groups = models.ManyToManyField("core.Group", related_name="events", verbose_name=_("Groups"))
+    rooms = models.ManyToManyField("Room", related_name="events", verbose_name=_("Rooms"))
+    teachers = models.ManyToManyField("core.Person", related_name="events", verbose_name=_("Teachers"))
     timefrom = models.DateTimeField(verbose_name=_("Effective start time of event"), null=True)
     timeto = models.DateTimeField(verbose_name=_("Effective end time of event"), null=True)