diff --git a/manifests/nagios/objects/add_contactgroups.pp b/manifests/nagios/objects/add_contactgroups.pp
index ebadf71..58577e2 100644
--- a/manifests/nagios/objects/add_contactgroups.pp
+++ b/manifests/nagios/objects/add_contactgroups.pp
@@ -20,6 +20,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 # @summary  Define populates /etc/nagios/conf.d/nagios_add_contactgroups through
 #   external puppet rules.
+# @param [string] ng_contactgroup_name Specify the short name of the
+#   contact group.
+# @param  [string]  ng_contactgroup_alias Specify the alias (long name) of the
+#   contact group
+# @param  [string] ng_contactgroup_register Specify whether the contact group
+#   should be registered in Nagios.
 ################################################################################
 define cd_nagios::nagios::objects::add_contactgroups (
 
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index bacd990..c734c59 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -37,7 +37,7 @@ class cd_nagios::server::service (
       enable      => true,
     }
 
-    @@nagios_service { "check_nagios${::hostname}":
+    @@nagios_service { "check_nagios_${::hostname}":
         check_command       => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
         use                 => 'generic-service',
         host_name           => $::fqdn,