diff --git a/json_datacite.py b/json_datacite.py
index b2b7ce8cf..88dae9c5f 100644
--- a/json_datacite.py
+++ b/json_datacite.py
@@ -176,9 +176,9 @@ def get_subjects(combi):
         subjects.append({'subjectScheme': 'OECD FOS 2007', 'subject': discipline})
 
     # Assume that there is only one keyword field,
-    # either called HierarchicalKeyword or Keyword
-    if "HierarchicalKeyword" in combi:
-        subjects.extend(combi["HierarchicalKeyword"])
+    # either called TreeKeyword or Keyword
+    if "TreeKeyword" in combi:
+        subjects.extend(combi["TreeKeyword"])
     else:
         for keyword in combi.get('Keyword', []):
             subjects.append({'subject': keyword, 'subjectScheme': 'Keyword'})
diff --git a/json_landing_page.py b/json_landing_page.py
index 662d0305c..59ecc1b1d 100644
--- a/json_landing_page.py
+++ b/json_landing_page.py
@@ -103,8 +103,8 @@ def json_landing_page_create_json_landing_page(ctx, zone, template_name, combi_j
         keywords.append({'subject': keyword, 'subjectScheme': 'Keyword'})
 
     # From core-2 and default-3 Tag is renamed to Keyword
-    if "HierarchicalKeyword" in json_data:
-        keywords.extend(json_data.get("HierarchicalKeyword"))
+    if "TreeKeyword" in json_data:
+        keywords.extend(json_data.get("TreeKeyword"))
     else:
         for keyword in json_data.get('Keyword', []):
             keywords.append({'subject': keyword, 'subjectScheme': 'Keyword'})
diff --git a/schemas/epos-msl-0/metadata.json b/schemas/epos-msl-0/metadata.json
index 36c991d39..d308ddc6a 100644
--- a/schemas/epos-msl-0/metadata.json
+++ b/schemas/epos-msl-0/metadata.json
@@ -841,7 +841,7 @@
     "Version",
     "Language",
     "Collected",
-    "HierarchicalKeyword",
+    "TreeKeyword",
     "Retention_Period",
     "Data_Type",
     "Data_Classification",
@@ -997,7 +997,7 @@
         }
       }
     },
-    "HierarchicalKeyword": {
+    "TreeKeyword": {
       "type": "array",
       "additionalProperties": false,
       "title": "Keywords",
diff --git a/schemas/epos-msl-0/uischema.json b/schemas/epos-msl-0/uischema.json
index ccc1c37aa..b9a7402fa 100644
--- a/schemas/epos-msl-0/uischema.json
+++ b/schemas/epos-msl-0/uischema.json
@@ -44,9 +44,9 @@
       }
     }
   },
-  "HierarchicalKeyword": {
+  "TreeKeyword": {
     "ui:description": "Adding (searchable) keywords to your data package.",
-    "ui:field": "hierarchical_keyword_selector",
+    "ui:field": "tree_keyword_selector",
     "ui:data": "https://raw.githubusercontent.com/UtrechtUniversity/msl_vocabularies/refs/heads/main/vocabularies/combined/editor/1.3/editor_1-3.json",
     "ui:subjectScheme": "EPOS MSL",
     "ui:schemeUri": "https://github.com/UtrechtUniversity/msl_vocabularies"