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 88c3a23daa25ad1c1c18bee9898d69900fcb0155..b4dccd4ece3bb5b347a1c8169a26d68112f5426b 100644
--- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
@@ -89,8 +89,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
-                ('name', models.CharField(max_length=10, verbose_name='Short name')),
-                ('longname', models.CharField(max_length=50, verbose_name='Long name')),
+                ('short_name', models.CharField(max_length=10, verbose_name='Short name')),
+                ('name', models.CharField(max_length=50, verbose_name='Long name')),
                 ('colour_fg', colorfield.fields.ColorField(default='#FFFFFF', max_length=18)),
                 ('colour_bg', colorfield.fields.ColorField(default='#FFFFFF', max_length=18)),
             ],
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 5a3f0606787f478abf8a35265c02b18935ee1250..7f3841114f88292e3e3308529c60c141696eef41 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -635,8 +635,8 @@ class Holiday(ExtensibleModel):
 
 
 class SupervisionArea(ExtensibleModel):
-    name = models.CharField(verbose_name=_("Short name"), max_length=10)
-    longname = models.CharField(verbose_name=_("Long name"), max_length=50)
+    short_name = models.CharField(verbose_name=_("Short name"), max_length=10)
+    name = models.CharField(verbose_name=_("Long name"), max_length=50)
     colour_fg = ColorField()
     colour_bg = ColorField()