diff --git a/model_nodes/node_callback_models.py b/model_nodes/node_callback_models.py
index 5bdfc01..792b6e2 100644
--- a/model_nodes/node_callback_models.py
+++ b/model_nodes/node_callback_models.py
@@ -110,7 +110,7 @@ CALLBACK_FORM_DESCRIPTOR = FormDescriptor(
             name="then_row",
             type="row",
             label="Then",
-            link_port=LinkPort(id="then_output", label="Then"),
+            link_port=LinkPort(id=0, label="Then"),
         ),
     ]
 )
diff --git a/model_nodes/node_each_models.py b/model_nodes/node_each_models.py
index 24c4fa8..bc48537 100644
--- a/model_nodes/node_each_models.py
+++ b/model_nodes/node_each_models.py
@@ -43,7 +43,7 @@ EACH_FORM_DESCRIPTOR = FormDescriptor(
             name="list_row",
             type="row",
             label="List",
-            link_port=LinkPort(id="then_output", label="Then"),
+            link_port=LinkPort(id=0, label="Then"),
             elements=[
                 LineElement(
                     name="list",
@@ -57,7 +57,7 @@ EACH_FORM_DESCRIPTOR = FormDescriptor(
             name="else_row",
             type="row",
             label="Alternative path",
-            link_port=LinkPort(id="else_output", label="Else"),
+            link_port=LinkPort(id=1, label="Else"),
         ),
     ]
 )
diff --git a/model_nodes/node_run_models.py b/model_nodes/node_run_models.py
index 221e167..6c9b655 100644
--- a/model_nodes/node_run_models.py
+++ b/model_nodes/node_run_models.py
@@ -71,7 +71,7 @@ RUN_FORM_DESCRIPTOR = FormDescriptor(
             name="then_row",
             type="row",
             label="Then",
-            link_port=LinkPort(id="then_output", label="Then"),
+            link_port=LinkPort(id=0, label="Then"),
         ),
     ]
 )
diff --git a/model_nodes/node_switch_models.py b/model_nodes/node_switch_models.py
index 9a6f2cb..e28e43a 100644
--- a/model_nodes/node_switch_models.py
+++ b/model_nodes/node_switch_models.py
@@ -44,7 +44,7 @@ SWITCH_FORM_DESCRIPTOR = FormDescriptor(
             name="switch_row",
             type="row",
             label="Switch condition",
-            link_port=LinkPort(id="case_1_output", label="case_1", is_addable=True),
+            link_port=LinkPort(id=0, label="case_1", is_addable=True),
             elements=[
                 AreaElement(
                     name="switch_value",
@@ -58,7 +58,7 @@ SWITCH_FORM_DESCRIPTOR = FormDescriptor(
             name="default_row",
             type="row",
             label="Default",
-            link_port=LinkPort(id="default_output", label="default"),
+            link_port=LinkPort(id=0, label="default"),
         ),
     ]
 )
diff --git a/model_nodes/node_trigger_models.py b/model_nodes/node_trigger_models.py
index edde11e..d3a4fec 100644
--- a/model_nodes/node_trigger_models.py
+++ b/model_nodes/node_trigger_models.py
@@ -70,7 +70,7 @@ TRIGGER_FORM_DESCRIPTOR = FormDescriptor(
             name="then_row",
             type="row",
             label="Then",
-            link_port=LinkPort(id="then_output", label="Then"),
+            link_port=LinkPort(id=0, label="Then"),
         ),
     ]
 )
diff --git a/model_nodes/node_wait_models.py b/model_nodes/node_wait_models.py
index 7ae5b4c..1759df5 100644
--- a/model_nodes/node_wait_models.py
+++ b/model_nodes/node_wait_models.py
@@ -84,7 +84,7 @@ WAIT_FORM_DESCRIPTOR = FormDescriptor(
             name="then_row",
             type="row",
             label="Transition",
-            link_port=LinkPort(id="then_output", label="then"),
+            link_port=LinkPort(id=0, label="then"),
         ),
     ]
 )
diff --git a/model_nodes/node_while_models.py b/model_nodes/node_while_models.py
index 8d94c48..c41d2c5 100644
--- a/model_nodes/node_while_models.py
+++ b/model_nodes/node_while_models.py
@@ -44,7 +44,7 @@ WHILE_FORM_DESCRIPTOR = FormDescriptor(
             name="condition_row",
             type="row",
             label="Parameter",
-            link_port=LinkPort(id="then_output", label="Then"),
+            link_port=LinkPort(id=0, label="Then"),
             elements=[
                 AreaElement(
                     name="condition",
@@ -58,7 +58,7 @@ WHILE_FORM_DESCRIPTOR = FormDescriptor(
             name="else_row",
             type="row",
             label="Alternative path",
-            link_port=LinkPort(id="else_output", label="Else"),
+            link_port=LinkPort(id=0, label="Else"),
         ),
     ]
 )