diff --git a/elk_metrics_6x/vars/variables.yml b/elk_metrics_6x/vars/variables.yml
index 1a72ea37..25e85064 100644
--- a/elk_metrics_6x/vars/variables.yml
+++ b/elk_metrics_6x/vars/variables.yml
@@ -104,59 +104,59 @@ apm_port: 8200
 # Beat options
 heartbeat_services:
   - group: "{{ groups['galera_all'] | default([]) }}"
-    name: galera HTTP
+    name: galera
     ports:
       - 9200
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['galera_all'] | default([]) }}"
-    name: galera TCP
+    name: galera
     ports:
       - 3306
     type: tcp
   - group: "{{ groups['repo_all'] | default([]) }}"
-    name: repo git
+    name: repo-git
     ports:
       - 9418
     type: tcp
   - group: "{{ groups['repo_all'] | default([]) }}"
-    name: repo server
+    name: repo-server
     ports:
       - 8181
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['repo_all'] | default([]) }}"
-    name: repo acng
+    name: repo-acng
     ports:
       - 3142
     type: http
     method: HEAD
     path: "/acng-report.html"
   - group: "{{ groups['glance_api'] | default([]) }}"
-    name: glance api
+    name: glance-api
     ports:
       - 9292
     type: http
     method: HEAD
     path: "/healthcheck"
   - group: "{{ groups['glance_api'] | default([]) }}"
-    name: glance registry
+    name: glance-registry
     ports:
       - 9191
     type: http
     method: HEAD
     path: "/healthcheck"
   - group: "{{ groups['gnocchi_all'] | default([]) }}"
-    name: gnocchi api
+    name: gnocchi-api
     ports:
       - 8041
     type: http
     method: HEAD
     path: "/healthcheck"
   - group: "{{ groups['heat_api_cfn'] | default([]) }}"
-    name: heat cfn api
+    name: heat-cfn-api
     ports:
       - 8000
     type: http
@@ -165,7 +165,7 @@ heartbeat_services:
     check_response:
       status: 300
   - group: "{{ groups['heat_api'] | default([]) }}"
-    name: heat api
+    name: heat-api
     ports:
       - 8004
     type: http
@@ -174,7 +174,7 @@ heartbeat_services:
     check_response:
       status: 300
   - group: "{{ groups['keystone_all'] | default([]) }}"
-    name: keystone api
+    name: keystone-api
     ports:
       - 5000
     type: http
@@ -183,42 +183,42 @@ heartbeat_services:
     check_response:
       status: 300
   - group: "{{ groups['neutron_server'] | default([]) }}"
-    name: neutron server
+    name: neutron-server
     ports:
       - 9696
     type: http
     method: GET
     path: "/"
   - group: "{{ groups['nova_api_metadata'] | default([]) }}"
-    name: nova api metadata
+    name: nova-api-metadata
     ports:
       - 8775
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['nova_api_os_compute'] | default([]) }}"
-    name: nova api compute
+    name: nova-api-compute
     ports:
       - 8774
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['nova_api_placement'] | default([]) }}"
-    name: nova api placement
+    name: nova-api-placement
     ports:
       - 8780
     type: http
     method: GET
     path: "/"
   - group: "{{ groups['nova_console'] | default([]) }}"
-    name: nova console
+    name: nova-console
     ports:
       - 6080
       - 6082
       - 6083
     type: tcp
   - group: "{{ groups['cinder_api'] | default([]) }}"
-    name: cinder api
+    name: cinder-api
     ports:
       - 8776
     type: http
@@ -235,83 +235,83 @@ heartbeat_services:
     method: HEAD
     path: "/"
   - group: "{{ groups['sahara_api'] | default([]) }}"
-    name: sahara api
+    name: sahara-api
     ports:
       - 8386
     type: http
     method: HEAD
     path: "/healthcheck"
   - group: "{{ groups['swift_proxy'] | default([]) }}"
-    name: swift proxy
+    name: swift-proxy
     ports:
       - 8080
     type: http
     method: HEAD
     path: "/healthcheck"
   - group: "{{ groups['aodh_api'] | default([]) }}"
-    name: aodh api
+    name: aodh-api
     ports:
       - 8042
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['ironic_api'] | default([]) }}"
-    name: ironic api
+    name: ironic-api
     ports:
       - 6385
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['rabbitmq_all'] | default([]) }}"
-    name: rabbitmq management
+    name: rabbitmq-management
     ports:
       - 15672
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['rabbitmq_all'] | default([]) }}"
-    name: rabbitmq access
+    name: rabbitmq-access
     ports:
       - 5672
       - 5671
     type: tcp
   - group: "{{ groups['magnum_all'] | default([]) }}"
-    name: magnum api
+    name: magnum-api
     ports:
       - 9511
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['trove_api'] | default([]) }}"
-    name: trove api
+    name: trove-api
     ports:
       - 8779
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['barbican_api'] | default([]) }}"
-    name: barbican api
+    name: barbican-api
     ports:
       - 9311
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['designate_api'] | default([]) }}"
-    name: designate api
+    name: designate-api
     ports:
       - 9001
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['octavia_all'] | default([]) }}"
-    name: octavia api
+    name: octavia-api
     ports:
       - 9876
     type: http
     method: HEAD
     path: "/"
   - group: "{{ groups['tacker_all'] | default([]) }}"
-    name: tracker api
+    name: tacker-api
     ports:
       - 9890
     type: http