diff --git a/manifests/nagios/objects/add_contact_rules.pp b/manifests/nagios/objects/add_contact_rules.pp
index a1b8bf4..4cb232f 100644
--- a/manifests/nagios/objects/add_contact_rules.pp
+++ b/manifests/nagios/objects/add_contact_rules.pp
@@ -26,7 +26,7 @@ class confdroid_nagios::nagios::objects::add_contact_rules (
       selrole  => object_r,
       seltype  => nagios_etc_t,
       seluser  => system_u,
-      notify   => Service[$ng_service],
+      notify   => Service[$ng_nagios_service],
     }
 
     # manage file header
diff --git a/manifests/server/access.pp b/manifests/server/access.pp
index afc9dcc..daa24ab 100644
--- a/manifests/server/access.pp
+++ b/manifests/server/access.pp
@@ -17,7 +17,7 @@ define confdroid_nagios::server::access (
   $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
   $ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file
   $ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule
-  $ng_service       = $confdroid_nagios::params::ng_nagios_service
+  $ng_nagios_service       = $confdroid_nagios::params::ng_nagios_service
 
   if $fqdn == $ng_nagios_server {
     # create password rules
diff --git a/templates/nagios/cgi_cfg.erb b/templates/nagios/cgi_cfg.erb
index 104f8cc..6c96778 100644
--- a/templates/nagios/cgi_cfg.erb
+++ b/templates/nagios/cgi_cfg.erb
@@ -22,7 +22,7 @@ default_user_name=<%= @ng_def_user_name %>
 authorized_for_system_information=<%= @ng_nagios_admin %>,<%= @ng_sysinfo_auth %>
 authorized_for_configuration_information=<%= @ng_nagios_admin %>,<%= @ng_confinfo_auth %>
 authorized_for_system_commands=<%= @ng_nagios_admin %>,<%= @ng_command_auth %>
-authorized_for_all_services=<%= @ng_nagios_admin %>,<%= @ng_serviceview_auth %>
+authorized_for_all_services=<%= @ng_nagios_admin %>,<%= @ng_nagios_serviceview_auth %>
 authorized_for_all_hosts=<%= @ng_nagios_admin %>,<%= @ng_hostview_auth %>
 authorized_for_all_service_commands=<%= @ng_nagios_admin %>,<%= @ng_svc_cmd_auth %>
 authorized_for_all_host_commands=<%= @ng_nagios_admin %>,<%= @ng_host_cmd_auth %>
diff --git a/templates/nagios/svcgroups_cfg_rule.erb b/templates/nagios/svcgroups_cfg_rule.erb
index 4d5e62b..2df143d 100644
--- a/templates/nagios/svcgroups_cfg_rule.erb
+++ b/templates/nagios/svcgroups_cfg_rule.erb
@@ -1,6 +1,6 @@
 
 define servicegroup {
-  servicegroup_name   <%= @ng_servicegroup_name %>
-  alias               <%= @ng_servicegroup_alias %>
-  register            <%= @ng_servicegroup_register %>
+  servicegroup_name   <%= @ng_nagios_servicegroup_name %>
+  alias               <%= @ng_nagios_servicegroup_alias %>
+  register            <%= @ng_nagios_servicegroup_register %>
   }
diff --git a/templates/nagios/templates_cfg_rule.erb b/templates/nagios/templates_cfg_rule.erb
index 7daa9ef..dc0d626 100644
--- a/templates/nagios/templates_cfg_rule.erb
+++ b/templates/nagios/templates_cfg_rule.erb
@@ -4,9 +4,9 @@ define <%= @ng_template_object %>{
   name                          <%= @ng_template_object_name %>
   service_notification_period   <%= @ng_svc_notification_period %>
   host_notification_period      <%= @ng_host_notification_period %>
-  service_notification_options  <%= @ng_service_notification_options %>
+  service_notification_options  <%= @ng_nagios_service_notification_options %>
   host_notification_options     <%= @ng_host_notification_options %>
-  service_notification_commands <%= @ng_service_notification_commands %>
+  service_notification_commands <%= @ng_nagios_service_notification_commands %>
   host_notification_commands    <%= @ng_host_notification_commands %>
   register                      <%= @ng_object_register %>
   }
@@ -114,7 +114,7 @@ define <%= @ng_template_object %>{
   check_interval                <%= @ng_check_interval %>
   retry_interval                <%= @ng_retry_interval %>
   contact_groups                <%= @ng_contact_groups %>
-  notification_options          <%= @ng_service_notification_options %>
+  notification_options          <%= @ng_nagios_service_notification_options %>
   notification_interval         <%= @ng_notification_interval %>
   notification_period           <%= @ng_notification_period %>
   register                      <%= @ng_object_register %>