diff --git a/gso/workflows/edge_port/create_edge_port.py b/gso/workflows/edge_port/create_edge_port.py
index 6e88ad538e989e82e0cb6c3d30a6400500bdac03..1580de718f843ccf58983ce10b097467c77ba8c3 100644
--- a/gso/workflows/edge_port/create_edge_port.py
+++ b/gso/workflows/edge_port/create_edge_port.py
@@ -104,7 +104,7 @@ def initialize_subscription(
     service_type: EdgePortType,
     speed: PhysicalPortCapacity,
     encapsulation: EncapsulationType,
-    edge_port_name: str,
+    name: str,
     minimum_links: int,
     geant_ga_id: str | None,
     mac_address: str | None,
@@ -116,18 +116,18 @@ def initialize_subscription(
 ) -> State:
     """Initialise the subscription object in the service database."""
     router = Router.from_subscription(node).router
-    subscription.edge_port.edge_port_node = router
+    subscription.edge_port.node = router
     subscription.edge_port.edge_port_type = service_type
-    subscription.edge_port.edge_port_enable_lacp = enable_lacp
-    subscription.edge_port.edge_port_member_speed = speed
-    subscription.edge_port.edge_port_encapsulation = encapsulation
-    subscription.edge_port.edge_port_name = edge_port_name
-    subscription.edge_port.edge_port_minimum_links = minimum_links
-    subscription.edge_port.edge_port_ignore_if_down = ignore_if_down
-    subscription.edge_port.edge_port_geant_ga_id = geant_ga_id
-    subscription.edge_port.edge_port_mac_address = mac_address
+    subscription.edge_port.enable_lacp = enable_lacp
+    subscription.edge_port.member_speed = speed
+    subscription.edge_port.encapsulation = encapsulation
+    subscription.edge_port.edge_port_name = name
+    subscription.edge_port.minimum_links = minimum_links
+    subscription.edge_port.ignore_if_down = ignore_if_down
+    subscription.edge_port.geant_ga_id = geant_ga_id
+    subscription.edge_port.mac_address = mac_address
     partner_name = get_partner_by_id(partner).name
-    subscription.description = (f"Edge Port {edge_port_name} on {router.router_fqdn}, "
+    subscription.description = (f"Edge Port {name} on {router.router_fqdn}, "
                                 f"{partner_name}, {geant_ga_id or ""}")
     subscription.edge_port.edge_port_description = description
     for member in ae_members: