diff --git a/chef/roles/os-block-storage-api.rb b/chef/roles/os-block-storage-api.rb
index e0ee610..a0b5818 100644
--- a/chef/roles/os-block-storage-api.rb
+++ b/chef/roles/os-block-storage-api.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-cinder-api"] }
+        "processes" => { "ProcessMatch" => ["cinder-api\" \"cinder-api"] }
       }
     }
   }
diff --git a/chef/roles/os-block-storage-scheduler.rb b/chef/roles/os-block-storage-scheduler.rb
index 5e78e88..c254690 100644
--- a/chef/roles/os-block-storage-scheduler.rb
+++ b/chef/roles/os-block-storage-scheduler.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-cinder-scheduler"] }
+        "processes" => { "ProcessMatch" => ["cinder-scheduler\" \"cinder-scheduler"] }
       }
     }
   }
diff --git a/chef/roles/os-block-storage-worker.rb b/chef/roles/os-block-storage-worker.rb
index cd6ad23..5d6e01d 100644
--- a/chef/roles/os-block-storage-worker.rb
+++ b/chef/roles/os-block-storage-worker.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-cinder-volume", "iscsid", "multipathd"] }
+        "processes" => { "ProcessMatch" => ["cinder-volume\" \"cinder-volume", "iscsid\" \"iscsid", "multipathd\" \"multipathd"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-api-metadata.rb b/chef/roles/os-compute-api-metadata.rb
index 87a65f1..36ec59b 100644
--- a/chef/roles/os-compute-api-metadata.rb
+++ b/chef/roles/os-compute-api-metadata.rb
@@ -4,7 +4,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-metadata-api"] }
+        "processes" => { "ProcessMatch" => ["nova-metadata-api\" \"nova-metadata-api"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-api-os-compute.rb b/chef/roles/os-compute-api-os-compute.rb
index c148ab7..5c1bf31 100644
--- a/chef/roles/os-compute-api-os-compute.rb
+++ b/chef/roles/os-compute-api-os-compute.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-api"] }
+        "processes" => { "ProcessMatch" => ["nova-api\" \"nova-api"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-cert.rb b/chef/roles/os-compute-cert.rb
index 5eb6d7b..d6ca8f2 100644
--- a/chef/roles/os-compute-cert.rb
+++ b/chef/roles/os-compute-cert.rb
@@ -4,7 +4,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-cert"] }
+        "processes" => { "ProcessMatch" => ["nova-cert\" \"nova-cert"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-scheduler.rb b/chef/roles/os-compute-scheduler.rb
index 9ffa272..3881389 100644
--- a/chef/roles/os-compute-scheduler.rb
+++ b/chef/roles/os-compute-scheduler.rb
@@ -14,7 +14,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-scheduler", "openstack-nova-conductor"] }
+        "processes" => { "ProcessMatch" => ["nova-scheduler\" \"nova-scheduler", "nova-conductor\" \"nova-conductor"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-vncproxy.rb b/chef/roles/os-compute-vncproxy.rb
index 2a1dec5..2b08850 100644
--- a/chef/roles/os-compute-vncproxy.rb
+++ b/chef/roles/os-compute-vncproxy.rb
@@ -4,7 +4,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-xvpvncproxy", "openstack-nova-novncproxy"] }
+        "processes" => { "ProcessMatch" => ["nova-xvpvncproxy\" \"nova-xvpvncproxy", "nova-novncproxy\" \"nova-novncproxy"] }
       }
     }
   }
diff --git a/chef/roles/os-compute-worker.rb b/chef/roles/os-compute-worker.rb
index cdf1f84..7128ef1 100644
--- a/chef/roles/os-compute-worker.rb
+++ b/chef/roles/os-compute-worker.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-nova-compute"] }
+        "processes" => { "ProcessMatch" => ["nova-compute\" \"nova-compute"] }
       }
     }
   }
diff --git a/chef/roles/os-dashboard.rb b/chef/roles/os-dashboard.rb
index 23f64ab..43a3062 100644
--- a/chef/roles/os-dashboard.rb
+++ b/chef/roles/os-dashboard.rb
@@ -4,7 +4,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["httpd"]}
+        "processes" => { "ProcessMatch" => ["httpd\" \"httpd"]}
       }
     }
   }
diff --git a/chef/roles/os-ha.rb b/chef/roles/os-ha.rb
index a8c8ea4..af1fc52 100644
--- a/chef/roles/os-ha.rb
+++ b/chef/roles/os-ha.rb
@@ -4,7 +4,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["haproxy", "keepalived"]}
+        "processes" => { "ProcessMatch" => ["haproxy\" \"haproxy", "keepalived\" \"keepalived"]}
       }
     }
   }
diff --git a/chef/roles/os-identity.rb b/chef/roles/os-identity.rb
index 7faf10b..ee374cc 100644
--- a/chef/roles/os-identity.rb
+++ b/chef/roles/os-identity.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-keystone"] }
+        "processes" => { "ProcessMatch" => ["keystone\" \"keystone"] }
       }
     }
   }
diff --git a/chef/roles/os-image-api.rb b/chef/roles/os-image-api.rb
index cb7014f..d533cff 100644
--- a/chef/roles/os-image-api.rb
+++ b/chef/roles/os-image-api.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-glance-api"] }
+        "processes" => { "ProcessMatch" => ["glance-api\" \"glance-api"] }
       }
     }
   }
diff --git a/chef/roles/os-image-registry.rb b/chef/roles/os-image-registry.rb
index b79ecdf..c4eebd0 100644
--- a/chef/roles/os-image-registry.rb
+++ b/chef/roles/os-image-registry.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["openstack-glance-registry"] }
+        "processes" => { "ProcessMatch" => ["glance-registry\" \"glance-registry"] }
       }
     }
   }
diff --git a/chef/roles/os-network-server.rb b/chef/roles/os-network-server.rb
index e2f894c..0b64c6b 100644
--- a/chef/roles/os-network-server.rb
+++ b/chef/roles/os-network-server.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["quantum-server"] }
+        "processes" => { "ProcessMatch" => ["quantum-server\" \"quantum-server"] }
       }
     }
   }
diff --git a/chef/roles/os-network.rb b/chef/roles/os-network.rb
index 0083344..806f6f1 100644
--- a/chef/roles/os-network.rb
+++ b/chef/roles/os-network.rb
@@ -16,7 +16,10 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["quantum-dhcp-agent", "quantum-l3-agent", "quantum-openvswitch-agent", "quantum-metadata-agent"] }
+        "processes" => { "ProcessMatch" => ["quantum-dhcp-agent\" \"quantum-dhcp-agent",
+                                            "quantum-l3-agent\" \"quantum-l3-agent",
+                                            "quantum-openvswitch-agent\" \"quantum-openvswitch-agent",
+                                            "quantum-metadata-agent\" \"quantum-metadata-agent"] }
       }
     }
   }
diff --git a/chef/roles/os-ops-database.rb b/chef/roles/os-ops-database.rb
index 7388caa..ff243af 100644
--- a/chef/roles/os-ops-database.rb
+++ b/chef/roles/os-ops-database.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["mysqld"] }
+        "processes" => { "ProcessMatch" => ["mysqld\" \"mysqld"] }
       }
     }
   }
diff --git a/chef/roles/os-ops-messaging.rb b/chef/roles/os-ops-messaging.rb
index 2b5da61..d380c10 100644
--- a/chef/roles/os-ops-messaging.rb
+++ b/chef/roles/os-ops-messaging.rb
@@ -12,7 +12,7 @@ override_attributes(
   "collectd" => {
     "rhel" => {
       "plugins" => {
-        "processes" => { "Process" => ["rabbitmq-server"] }
+        "processes" => { "ProcessMatch" => ["rabbitmq-server\" \"rabbitmq-server"] }
       }
     },
     "included_plugins" => {"rabbitmq"=>{}}