diff --git a/brian_polling_manager/gws_indirect.py b/brian_polling_manager/gws_indirect.py
index 8852c57a4b81abdf13fef4255f09316e6afb88a5..64d2a57e25aef29505532fe32671e37ad6f7c101 100644
--- a/brian_polling_manager/gws_indirect.py
+++ b/brian_polling_manager/gws_indirect.py
@@ -1,3 +1,4 @@
+import re
 from brian_polling_manager import sensu
 
 
@@ -19,14 +20,15 @@ class DSCP32CountersCheck(sensu.AbstractCheck):
 
     @sensu.AbstractCheck.name.getter
     def name(self):
-        return f'dscp32-{self.service["name"]}'
+        name = re.sub(r'[\s_-]+', '_', self.service['name'])
+        return f'dscp32-{name}'
 
     @sensu.AbstractCheck.command.getter
     def command(self):
         return self.sensu_check_params['command'].format(
             script=self.sensu_check_params['script'],
             measurement=self.sensu_check_params['measurement'],
-            service=self.service['name'])
+            service=self.service['id'])
 
     @sensu.AbstractCheck.proxy_entity_name.getter
     def proxy_entity_name(self):