diff --git a/theses.yaml b/theses.yaml
index 93dd266..f4e7d88 100644
--- a/theses.yaml
+++ b/theses.yaml
@@ -14,14 +14,15 @@ stages:
           translations:
             en-eu: "Application created"
         predicate:
-          - - tag: variable
-            - var:
-              - tag: previous-node
-              - previous-node: "antrag als hochschullehrer"
-          - - tag: variable
-            - var:
-              - tag: previous-node
-              - previous-node: "antrag als betreuer"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "antrag als hochschullehrer"
+              - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "antrag als betreuer"
   - label: "bestaetigung"
     display-label:
       fallback: "Bestätigung"
@@ -37,10 +38,11 @@ stages:
           translations:
             en-eu: "Application confirmed by “verantwortlichem Hochschullehrer/verantwortliche Hochschullehrerin”"
         predicate:
-          - - tag: variable
-            - var:
-              - tag: previous-node
-              - previous-node: "antrag bestaetigen als hochschullehrer"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "antrag bestaetigen als hochschullehrer"
       - mode: required
         show-when: always
         display-label:
@@ -49,10 +51,11 @@ stages:
           translations:
             en-eu: "Application confirmed by student"
         predicate:
-          - - tag: variable
-            - var:
-              - tag: previous-node
-              - previous-node: "antrag bestaetigen als student"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "antrag bestaetigen als student"
       - mode: required
         show-when: always
         display-label:
@@ -61,10 +64,11 @@ stages:
           translations:
             en-eu: "Day of registration submitted"
         predicate:
-          - - tag: variable
-              var:
-                tag: payload-filled
-                payload-filled: "anmeldetag"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: payload-filled
+                  payload-filled: "anmeldetag"
   - label: "anmeldung"
     display-label:
       fallback: "Anmeldung"
@@ -80,18 +84,19 @@ stages:
           translations:
             en-eu: "Thesis registered"
         predicate:
-          - - tag: variable
-            - var:
-              - tag: previous-node
-                previous-node: "anmelden, bestaetigt student&hochschullehrer, anmeldetag"
-          - - tag: variable
-            - var:
-              - tag: previous-node
-                previous-node: "anmelden, bestaetigt student&hochschullehrer"
-          - - tag: variable
-            - var:
-              - tag: previous-node
-                previous-node: "anmelden, bestaetigt student"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "anmelden, bestaetigt student&hochschullehrer, anmeldetag"
+              - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "anmelden, bestaetigt student&hochschullehrer"
+              - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "anmelden, bestaetigt student"
   - label: "abgabe"
     display-label:
       fallback: "Abgabe"
@@ -107,14 +112,15 @@ stages:
           translations:
             en-eu: "Thesis submitted"
         predicate:
-          - - tag: variable
-            - var:
-              tag: previous-node
-              previous-node: "datei hochladen"
-          - - tag: variable
-            - var:
-              tag: previous-node
-              previous-node: "init hochladen"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "datei hochladen"
+              - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "init hochladen"
   - label: "benotung"
     display-label:
       fallback: "Benotung"
@@ -130,10 +136,11 @@ stages:
           translations:
             en-eu: "Grade for presentation submitted"
         predicate:
-          - - tag: variable
-              var:
-                tag: payload-filled
-                payload-filled: "note, vortrag"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: payload-filled
+                  payload-filled: "note, vortrag"
       - mode: required
         show-when: always
         display-label:
@@ -142,10 +149,11 @@ stages:
           translations:
             en-eu: "Day of presentation submitted"
         predicate:
-          - - tag: variable
-              var:
-                tag: payload-filled
-                payload-filled: "vortragtag"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: payload-filled
+                  payload-filled: "vortragtag"
       - mode: required
         show-when: always
         display-label:
@@ -154,10 +162,11 @@ stages:
           translations:
             en-eu: "Grade for thesis submitted"
         predicate:
-          - - tag: variable
-              var:
-                tag: payload-filled
-                payload-filled: "note, arbeit"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: payload-filled
+                  payload-filled: "note, arbeit"
       - mode: required
         show-when: always
         display-label: 
@@ -166,10 +175,11 @@ stages:
           translations:
             en-eu: "Grade registration confirmed by examination office"
         predicate:
-          - - tag: variable
-            - var:
-              tag: previous-node
-              previous-node: "note ist eingetragen"
+          dnf-terms:
+            - - tag: variable
+                var:
+                  tag: previous-node
+                  previous-node: "note ist eingetragen"
 
 nodes:
   "antrag":