diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
index 0000bbe2a4..80f9c54e32 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             {% for host in groups['proxies'] %}{{host}}, http_bodhi2  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies'] %}{{host}}, http-bodhi2  {% if not loop.last %} , {% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2
index 7306ad7989..dec5c20378 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   fas
     alias               Fedora Account System
-    members         {% for host in groups['proxies'] %}{{host}}, http_accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, http_accounts, {% endfor %} db_fas01.phx2.fedoraproject.org,Check FAS DB
+    members         {% for host in groups['proxies'] %}{{host}}, http-accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, http-accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB
 
 }
diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
index ba73af7637..ae5baeb325 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             {% for host in groups['proxies'] %}{{host}}, http_fedoraproject.org_wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http_fedoraproject.org_wiki_non_cached  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki-non-cached  {% if not loop.last %} , {% endif %} {% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
index 0dba014c19..570d1f2727 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   freemedia
     alias               FreeMedia
-    members             {% for host in groups['sundries'] %}{{host}}, http_freemedia_internal  {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['sundries'] %}{{host}}, http-freemedia-internal  {% if not loop.last %} , {% endif %} {% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2
index 6330bd8179..bd78bd7e42 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   mirrorlist
     alias               Mirrorlist
-    members             {% for host in groups['proxies'] %}{{host}}, http_mirrors.fedoraproject.org_mirrorlist {% if not loop.last %} , {% endif %} {% endfor %}
+    members             {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {% if not loop.last %} , {% endif %} {% endfor %}
 
 }