diff --git a/src/l2/participant/cl/input_parser.star b/src/l2/participant/cl/input_parser.star
index 7a66d4a0..0027bc82 100644
--- a/src/l2/participant/cl/input_parser.star
+++ b/src/l2/participant/cl/input_parser.star
@@ -30,7 +30,7 @@ def parse(args, participant_name, network_params, registry):
 
 
 def parse_builder(args, participant_name, network_params, registry):
-    return _parse(args, participant_name, network_params, registry, "cl_builder")
+    return _parse(args, participant_name, network_params, registry, "clbuilder")
 
 
 def _parse(args, participant_name, network_params, registry, cl_kind):
@@ -60,8 +60,8 @@ def _parse(args, participant_name, network_params, registry, cl_kind):
     )
 
     cl_params["name"] = participant_name
-    cl_params["service_name"] = "op-cl-{}-{}-{}".format(
-        network_id, participant_name, cl_params["type"]
+    cl_params["service_name"] = "op-{}-{}-{}-{}".format(
+        cl_kind, network_id, participant_name, cl_params["type"]
     )
 
     # Draft of what the labels could look like
diff --git a/src/l2/participant/el/input_parser.star b/src/l2/participant/el/input_parser.star
index 6c82b360..818a8626 100644
--- a/src/l2/participant/el/input_parser.star
+++ b/src/l2/participant/el/input_parser.star
@@ -49,7 +49,7 @@ def parse_builder(el_args, participant_name, network_params, registry):
         participant_name=participant_name,
         network_params=network_params,
         registry=registry,
-        el_kind="el_builder",
+        el_kind="elbuilder",
     )
 
 
@@ -80,8 +80,8 @@ def _parse(el_args, default_args, participant_name, network_params, registry, el
     )
 
     el_params["name"] = participant_name
-    el_params["service_name"] = "op-el-{}-{}-{}".format(
-        network_id, participant_name, el_params["type"]
+    el_params["service_name"] = "op-{}-{}-{}-{}".format(
+        el_kind, network_id, participant_name, el_params["type"]
     )
 
     # Draft of what the labels could look like
diff --git a/test/l2/participant/el/launcher_test.star b/test/l2/participant/el/launcher_test.star
index 137740da..cd78b867 100644
--- a/test/l2/participant/el/launcher_test.star
+++ b/test/l2/participant/el/launcher_test.star
@@ -454,7 +454,7 @@ def test_l2_participant_el_launcher_op_rbuilder(plan):
     expect.eq(
         service_config.labels,
         {
-            "op.kind": "el_builder",
+            "op.kind": "elbuilder",
             "op.network.id": "2151908",
             "op.network.participant.name": "node0",
             "op.el.type": "op-rbuilder",
diff --git a/test/l2/participant/input_parser_test.star b/test/l2/participant/input_parser_test.star
index b555ad6c..5f0eee48 100644
--- a/test/l2/participant/input_parser_test.star
+++ b/test/l2/participant/input_parser_test.star
@@ -88,9 +88,9 @@ def test_l2_participant_input_parser_defaults(plan):
                     name="node0",
                     type="op-node",
                     image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.3",
-                    service_name="op-cl-1000-node0-op-node",
+                    service_name="op-clbuilder-1000-node0-op-node",
                     labels={
-                        "op.kind": "cl_builder",
+                        "op.kind": "clbuilder",
                         "op.network.id": "1000",
                         "op.network.participant.name": "node0",
                         "op.cl.type": "op-node",
@@ -130,9 +130,9 @@ def test_l2_participant_input_parser_defaults(plan):
                     name="node0",
                     type="op-geth",
                     image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:latest",
-                    service_name="op-el-1000-node0-op-geth",
+                    service_name="op-elbuilder-1000-node0-op-geth",
                     labels={
-                        "op.kind": "el_builder",
+                        "op.kind": "elbuilder",
                         "op.network.id": "1000",
                         "op.network.participant.name": "node0",
                         "op.el.type": "op-geth",
@@ -194,9 +194,9 @@ def test_l2_participant_input_parser_defaults(plan):
                     name="node1",
                     type="op-node",
                     image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.13.3",
-                    service_name="op-cl-1000-node1-op-node",
+                    service_name="op-clbuilder-1000-node1-op-node",
                     labels={
-                        "op.kind": "cl_builder",
+                        "op.kind": "clbuilder",
                         "op.network.id": "1000",
                         "op.network.participant.name": "node1",
                         "op.cl.type": "op-node",
@@ -236,9 +236,9 @@ def test_l2_participant_input_parser_defaults(plan):
                     name="node1",
                     type="op-geth",
                     image="us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:latest",
-                    service_name="op-el-1000-node1-op-geth",
+                    service_name="op-elbuilder-1000-node1-op-geth",
                     labels={
-                        "op.kind": "el_builder",
+                        "op.kind": "elbuilder",
                         "op.network.id": "1000",
                         "op.network.participant.name": "node1",
                         "op.el.type": "op-geth",