diff --git a/main.star b/main.star
index 9508a5a..857f780 100644
--- a/main.star
+++ b/main.star
@@ -2,13 +2,11 @@
 vars = import_module("github.com/logos-co/wakurtosis/src/system_variables.star")
 
 # Module Imports
-waku = import_module(vars.WAKU_MODULE)
 prometheus = import_module(vars.PROMETHEUS_MODULE)
 grafana = import_module(vars.GRAFANA_MODULE)
 args_parser = import_module(vars.ARGUMENT_PARSER_MODULE)
 wls = import_module(vars.WLS_MODULE)
 nodes = import_module(vars.NODE_BUILDERS_MODULE)
-nomos = import_module(vars.NOMOS_MODULE)
 
 
 def run(plan, args):
diff --git a/src/node_builders.star b/src/node_builders.star
index 68aeb7b..feecb0c 100644
--- a/src/node_builders.star
+++ b/src/node_builders.star
@@ -147,12 +147,12 @@ def instantiate_services(plan, network_topology, testing):
     all_services_information = plan.add_services(
         configs = all_services
     )
-    services_information = add_service_information(plan, all_services_information, network_topology)
+    services_information = add_services_information(plan, all_services_information, network_topology)
 
     return services_information
 
 
-def add_service_information(plan, all_services_information, network_topology):
+def add_services_information(plan, all_services_information, network_topology):
     new_services_information = {}
 
     for service_name in all_services_information:
@@ -192,7 +192,7 @@ service_dispatcher = {
         connect_peers = waku.connect_wakunode_to_peers
     ),
     "nim-waku": struct(
-        prepare_service = prepare_gowaku_service,
+        prepare_service = prepare_nwaku_service,
         add_service_information = _add_waku_service_information,
         create_id = waku.create_waku_id,
         connect_peers = waku.connect_wakunode_to_peers