diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 7caf11f..b246b2c 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -101,7 +101,7 @@ service:
 
   ngcp-sems-b2b.service:
     enabled: false
-    running: {{if and [% is_proxy && (pbx.enable == "yes" || b2b.enable == "yes") ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    running: {{if and [% is_proxy && b2b.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
 
   ngcp-voisniff.service:
     enabled: false
diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2
index 84aa5de..ab1b7e2 100644
--- a/templates/821_network-ports-ngcp.yaml.tt2
+++ b/templates/821_network-ports-ngcp.yaml.tt2
@@ -177,22 +177,22 @@ port:
 
 [%  END -%]
 [%  IF b2b.enable == "yes" -%]
-  # sems-pbx
+  # sems-b2b
   tcp:[% b2b.bindport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-pbx
+  # sems-b2b
   tcp:[% b2b.xmlrpcport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-pbx
+  # sems-b2b
   udp:5048:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]
 
-  # sems-pbx
+  # sems-b2b
   udp:[% b2b.bindport %]:
     listening: {{.Vars.NODE_ACTIVE}}
     ip: ["[% sip_int_ips.0 %]"]