diff --git a/docker/initial-data.json b/docker/initial-data.json
index f2483f193..a47cd80fd 100644
--- a/docker/initial-data.json
+++ b/docker/initial-data.json
@@ -19,7 +19,7 @@
             ],
             "resource_ids": [],
             "organization_tag_ids": [],
-            "default_theme_id": 1,
+            "theme_id": 1,
             "theme_ids": [1]
         }
     },
@@ -77,7 +77,7 @@
             "primary_500": "#317796",
             "warn_500": "#f06400",
             "organization_id": 1,
-            "default_theme_for_organization_id": 1
+            "theme_for_organization_id": 1
         }
     },
     "committee": {
diff --git a/docs/example-data.json b/docs/example-data.json
index 193f7fea9..adbebbbc1 100644
--- a/docs/example-data.json
+++ b/docs/example-data.json
@@ -23,7 +23,7 @@
             "organization_tag_ids": [
                 1
             ],
-            "default_theme_id": 1,
+            "theme_id": 1,
             "theme_ids": [1]
         }
     },
@@ -340,7 +340,7 @@
             "primary_500": "#317796",
             "warn_500": "#f06400",
             "organization_id": 1,
-            "default_theme_for_organization_id": 1
+            "theme_for_organization_id": 1
         }
     },
     "organization_tag": {
diff --git a/docs/models.yml b/docs/models.yml
index a55dcce1c..72541d33f 100644
--- a/docs/models.yml
+++ b/docs/models.yml
@@ -116,11 +116,11 @@ organization:
     type: relation-list
     restriction_mode: B
     to: organization_tag/organization_id
-  default_theme_id:
+  theme_id:
     type: relation
     required: true
     restriction_mode: A
-    to: theme/default_theme_for_organization_id
+    to: theme/theme_for_organization_id
   theme_ids:
     type: relation-list
     restriction_mode: A
@@ -536,9 +536,9 @@ theme:
   warn_a700:
     restriction_mode: A
     type: color
-  default_theme_for_organization_id:
+  theme_for_organization_id:
     restriction_mode: A
-    to: organization/default_theme_id
+    to: organization/theme_id
     type: relation
   organization_id:
     required: true