diff --git a/gso/workflows/l3_core_service/base_migrate_l3_core_service.py b/gso/workflows/l3_core_service/base_migrate_l3_core_service.py
index 7c734d61444d9531428d474c10b8d6385f8afd1d..de2cae8950883b8c43affa8631339902cf09bc0e 100644
--- a/gso/workflows/l3_core_service/base_migrate_l3_core_service.py
+++ b/gso/workflows/l3_core_service/base_migrate_l3_core_service.py
@@ -55,12 +55,12 @@ def initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
         skip_moodi: bool = False
         is_human_initiated_wf: bool = True
         source_edge_port: source_edge_port_selector | str  # type: ignore[valid-type]
-        expected_ipv4_received_routes: int | None = None
-        expected_ipv4_advertised_routes: int | None = None
-        expected_ipv6_received_routes: int | None = None
-        expected_ipv6_advertised_routes: int | None = None
+        expected_number_of_ipv4_received_routes: int | None = None
+        expected_number_of_ipv4_advertised_routes: int | None = None
+        expected_number_of_ipv6_received_routes: int | None = None
+        expected_number_of_ipv6_advertised_routes: int | None = None
 
-    source_ep_user_input = yield L3CoreServiceSourceEdgePortSelectionForm
+    source_ep_input = yield L3CoreServiceSourceEdgePortSelectionForm
 
     def _destination_edge_port_selector(pid: UUIDstr) -> Choice:
         existing_ep_list = [ap.sbp.edge_port.owner_subscription_id for ap in ap_list]
@@ -81,9 +81,9 @@ def initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
         destination_edge_port: _destination_edge_port_selector(partner_id) | str  # type: ignore[valid-type]
 
     destination_ep_user_input = yield L3CoreServiceEdgePortSelectionForm
-    if source_ep_user_input.is_human_initiated_wf:
+    if source_ep_input.is_human_initiated_wf:
         summary_input = {
-            "source_edge_port": EdgePort.from_subscription(source_ep_user_input.source_edge_port).description,
+            "source_edge_port": EdgePort.from_subscription(source_ep_input.source_edge_port).description,
             "destination_edge_port": EdgePort.from_subscription(
                 destination_ep_user_input.destination_edge_port
             ).description,
@@ -92,18 +92,18 @@ def initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
 
     return (
         {"subscription_id": subscription.subscription_id, "subscription": subscription}
-        | source_ep_user_input.model_dump()
+        | source_ep_input.model_dump()
         | destination_ep_user_input.model_dump()
         | {
-            IS_HUMAN_INITIATED_WF_KEY: source_ep_user_input.is_human_initiated_wf,
-            SKIP_MOODI_KEY: source_ep_user_input.skip_moodi,
+            IS_HUMAN_INITIATED_WF_KEY: source_ep_input.is_human_initiated_wf,
+            SKIP_MOODI_KEY: source_ep_input.skip_moodi,
         }
         | {
             MOODI_EXTRA_KWARGS_KEY: {
-                "expected_ipv4_received_routes": source_ep_user_input.expected_ipv4_received_routes,
-                "expected_ipv4_advertised_routes": source_ep_user_input.expected_ipv4_advertised_routes,
-                "expected_ipv6_received_routes": source_ep_user_input.expected_ipv6_received_routes,
-                "expected_ipv6_advertised_routes": source_ep_user_input.expected_ipv6_advertised_routes,
+                "expected_number_of_ipv4_received_routes": source_ep_input.expected_number_of_ipv4_received_routes,
+                "expected_number_of_ipv4_advertised_routes": source_ep_input.expected_number_of_ipv4_advertised_routes,
+                "expected_number_of_ipv6_received_routes": source_ep_input.expected_number_of_ipv6_received_routes,
+                "expected_number_of_ipv6_advertised_routes": source_ep_input.expected_number_of_ipv6_advertised_routes,
             }
         }
     )