diff --git a/templates/411_process-ngcp-pro.yaml.tt2 b/templates/411_process-ngcp-pro.yaml.tt2
index c4bec43..7f0bac5 100644
--- a/templates/411_process-ngcp-pro.yaml.tt2
+++ b/templates/411_process-ngcp-pro.yaml.tt2
@@ -36,8 +36,8 @@ process:
   ngcp-snmp-agent:
     running: true
 
+  ngcp-voisniff:
+    running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' ? 'true' : 'false' %]
+
   snmpd:
     running: true
-
-  voisniff-ng:
-    running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' ? 'true' : 'false' %]
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 18e51f5..53088b5 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -45,7 +45,7 @@ service:
     enabled: [% general.process_handler == 'none' && kamailio.proxy.start == "yes" ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' && kamailio.proxy.start == "yes" ? 'true' : 'false' %]
 
-  mediator.service:
+  ngcp-mediator.service:
     enabled: [% general.process_handler == 'none' && mediator.enable == 'yes' ? 'true' : 'false' %]
     running: [% is_proxy && node_state == 'active' && mediator.enable == 'yes' ? 'true' : 'false' %]
 
@@ -97,7 +97,7 @@ service:
     enabled: false
     running: [% is_proxy && node_state == 'active' && pbx.enable == "yes" ? 'true' : 'false' %]
 
-  voisniff-ng.service:
+  ngcp-voisniff.service:
     enabled: false
     running: [% (is_proxy || is_lb || is_rtp) && node_state == 'active' && voisniff.daemon.start == 'yes' ? 'true' : 'false' %]