diff --git a/attributes/default.rb b/attributes/default.rb
index 664353e6..835b67ad 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -119,51 +119,10 @@ when "fedora"
     "nova_vncproxy_consoleauth_packages" => ["openstack-nova"],
     "libvirt_packages" => ["libvirt"],
     "libvirt_service" => "libvirtd",
+    "mysql_service" => "mysqld",
     "common_packages" => ["openstack-nova"],
     "iscsi_helper" => "ietadm",
     "package_overrides" => "",
-    "monit_commands" => {
-      "mysqld" => {
-        "start" => "/usr/sbin/service mysqld start",
-        "stop" => "/usr/sbin/service mysqld stop"
-      },
-      "nova-compute" => {
-        "start" => "/usr/sbin/service openstack-nova-compute start",
-        "stop" => "/usr/sbin/service openstack-nova-compute stop"
-      },
-      "nova-network" => {
-        "start" => "/usr/sbin/service openstack-nova-network start",
-        "stop" => "/usr/sbin/service openstack-nova-network stop"
-      },
-      "nova-scheduler" => {
-        "start" => "/usr/sbin/service openstack-nova-scheduler start",
-        "stop" => "/usr/sbin/service openstack-nova-scheduler stop"
-      },
-      "nova-volume" => {
-        "start" => "/usr/sbin/service openstack-nova-volume start",
-        "stop" => "/usr/sbin/service openstack-nova-volume stop"
-      },
-      "nova-api-os-compute" => {
-        "start" => "/usr/sbin/service openstack-nova-api-os-compute start",
-        "stop" => "/usr/sbin/service openstack-nova-api-os-compute stop"
-      },
-      "nova-api-os-volume" => {
-        "start" => "/usr/sbin/service openstack-nova-api-os-volume start",
-        "stop" => "/usr/sbin/service openstack-nova-api-os-volume stop"
-      },
-      "nova-api-ec2" => {
-        "start" => "/usr/sbin/service openstack-nova-api-ec2 start",
-        "stop" => "/usr/sbin/service openstack-nova-api-ec2 stop"
-      },
-      "nova-api-metadata" => {
-        "start" => "/usr/sbin/service openstack-nova-api-metadata start",
-        "stop" => "/usr/sbin/service openstack-nova-api-metadata stop"
-      },
-      "libvirt-bin" => {
-        "start" => "/usr/sbin/service libvirt-bin start",
-        "stop" => "/usr/sbin/service libvirt-bin stop"
-      }
-    }
   }
 when "ubuntu"
   default["nova"]["platform"] = {
@@ -189,55 +148,9 @@ when "ubuntu"
     "nova_vncproxy_consoleauth_service" => "nova-consoleauth",
     "libvirt_packages" => ["libvirt-bin"],
     "libvirt_service" => "libvirt-bin",
+    "mysql_service" => "mysql",
     "common_packages" => ["nova-common"],
     "iscsi_helper" => "tgtadm",
-    "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'",
-    "monit_commands" => {
-      "mysqld" => {
-        "start" => "/usr/sbin/service mysql start",
-        "stop" => "/usr/sbin/service mysql stop"
-      },
-      "nova-compute" => {
-        "start" => "/usr/sbin/service nova-compute start",
-        "stop" => "/usr/sbin/service nova-compute stop"
-      },
-      "nova-network" => {
-        "start" => "/usr/sbin/service nova-network start",
-        "stop" => "/usr/sbin/service nova-network stop"
-      },
-      "nova-scheduler" => {
-        "start" => "/usr/sbin/service nova-scheduler start",
-        "stop" => "/usr/sbin/service nova-scheduler stop"
-      },
-      "nova-volume" => {
-        "start" => "/usr/sbin/service nova-volume start",
-        "stop" => "/usr/sbin/service nova-volume stop"
-      },
-      "nova-api-os-compute" => {
-        "start" => "/usr/sbin/service nova-api-os-compute start",
-        "stop" => "/usr/sbin/service nova-api-os-compute stop"
-      },
-      "nova-api-os-volume" => {
-        "start" => "/usr/sbin/service nova-api-os-volume start",
-        "stop" => "/usr/sbin/service nova-api-os-volume stop"
-      },
-      "nova-api-ec2" => {
-        "start" => "/usr/sbin/service nova-api-ec2 start",
-        "stop" => "/usr/sbin/service nova-api-ec2 stop"
-      },
-      "nova-api-metadata" => {
-        "start" => "/usr/sbin/service nova-api-metadata start",
-        "stop" => "/usr/sbin/service nova-api-metadata stop"
-      },
-      "nova-consoleauth" => {
-        "start" => "/usr/sbin/service nova-consoleauth start",
-        "stop" => "/usr/sbin/service nova-consoleauth stop"
-      },
-      "libvirt-bin" => {
-        "start" => "/usr/sbin/service libvirt-bin start",
-        "stop" => "/usr/sbin/service libvirt-bin stop"
-      }
-    }
-
+    "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
   }
 end
diff --git a/recipes/api-ec2-monitoring.rb b/recipes/api-ec2-monitoring.rb
index 63e7e271..95946b66 100644
--- a/recipes/api-ec2-monitoring.rb
+++ b/recipes/api-ec2-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-api-ec2" do
     process_name "nova-api-ec2"
-    start_cmd platform_options["monit_commands"]["nova-api-ec2"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-api-ec2"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["api_ec2_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["api_ec2_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/api-metadata-monitoring.rb b/recipes/api-metadata-monitoring.rb
index 2059015d..a5a0e49b 100644
--- a/recipes/api-metadata-monitoring.rb
+++ b/recipes/api-metadata-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-api-metadata" do
     process_name "nova-api-metadata"
-    start_cmd platform_options["monit_commands"]["nova-api-metadata"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-api-metadata"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_api_metadata_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_api_metadata_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/api-os-compute-monitoring.rb b/recipes/api-os-compute-monitoring.rb
index 31a31833..933aca6d 100644
--- a/recipes/api-os-compute-monitoring.rb
+++ b/recipes/api-os-compute-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-api-os-compute" do
     process_name "nova-api-os-compute"
-    start_cmd platform_options["monit_commands"]["nova-api-os-compute"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-api-os-compute"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["api_os_compute_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["api_os_compute_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/api-os-volume-monitoring.rb b/recipes/api-os-volume-monitoring.rb
index 8947f085..74cfecdb 100644
--- a/recipes/api-os-volume-monitoring.rb
+++ b/recipes/api-os-volume-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-api-os-volume" do
     process_name "nova-api-os-volume"
-    start_cmd platform_options["monit_commands"]["nova-api-os-volume"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-api-os-volume"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["api_os_volume_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["api_os_volume_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/compute-monitoring.rb b/recipes/compute-monitoring.rb
index 6076ced1..6a9f29bd 100644
--- a/recipes/compute-monitoring.rb
+++ b/recipes/compute-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-compute" do
     process_name "nova-compute"
-    start_cmd platform_options["monit_commands"]["nova-compute"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-compute"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_compute_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_compute_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/libvirt-monitoring.rb b/recipes/libvirt-monitoring.rb
index 2b0b0437..b82a0e77 100644
--- a/recipes/libvirt-monitoring.rb
+++ b/recipes/libvirt-monitoring.rb
@@ -48,8 +48,8 @@ if node["enable_monit"]
 
   monit_procmon "libvirt-bin" do
     process_name "libvirtd"
-    start_cmd platform_options["monit_commands"]["libvirt-bin"]["start"]
-    stop_cmd platform_options["monit_commands"]["libvirt-bin"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["libvirt_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["libvirt_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/network-monitoring.rb b/recipes/network-monitoring.rb
index c0b1a430..5e5ba210 100644
--- a/recipes/network-monitoring.rb
+++ b/recipes/network-monitoring.rb
@@ -27,8 +27,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-network" do
     process_name "nova-network"
-    start_cmd platform_options["monit_commands"]["nova-network"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-network"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_network_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_network_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/nova-db-monitoring.rb b/recipes/nova-db-monitoring.rb
index 274634b4..09647592 100644
--- a/recipes/nova-db-monitoring.rb
+++ b/recipes/nova-db-monitoring.rb
@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: nova
-# Recipe:: nova-db
+# Recipe:: nova-db-monitoring
 #
 # Copyright 2009, Rackspace Hosting, Inc.
 #
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "mysqld" do
     process_name "mysqld"
-    start_cmd platform_options["monit_commands"]["mysqld"]["start"]
-    stop_cmd platform_options["monit_commands"]["mysqld"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["mysql_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["mysql_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/scheduler-monitoring.rb b/recipes/scheduler-monitoring.rb
index 894ded45..30c9e1a6 100644
--- a/recipes/scheduler-monitoring.rb
+++ b/recipes/scheduler-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-scheduler" do
     process_name "nova-scheduler"
-    start_cmd platform_options["monit_commands"]["nova-scheduler"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-scheduler"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_scheduler_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_scheduler_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/vncproxy-monitoring.rb b/recipes/vncproxy-monitoring.rb
index ace6bf58..d876160f 100644
--- a/recipes/vncproxy-monitoring.rb
+++ b/recipes/vncproxy-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-consoleauth" do
     process_name "nova-consoleauth"
-    start_cmd platform_options["monit_commands"]["nova-consoleauth"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-consoleauth"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_vncproxy_consoleauth_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_vncproxy_consoleauth_service"] + " stop"
   end
 end
 ########################################
diff --git a/recipes/volume-monitoring.rb b/recipes/volume-monitoring.rb
index 100195f6..a0dcef72 100644
--- a/recipes/volume-monitoring.rb
+++ b/recipes/volume-monitoring.rb
@@ -26,8 +26,8 @@ if node["enable_monit"]
 
   monit_procmon "nova-volume" do
     process_name "nova-volume"
-    start_cmd platform_options["monit_commands"]["nova-volume"]["start"]
-    stop_cmd platform_options["monit_commands"]["nova-volume"]["stop"]
+    start_cmd "/usr/sbin/service " + platform_options["nova_volume_service"] + " start"
+    stop_cmd "/usr/sbin/service " + platform_options["nova_volume_service"] + " stop"
   end
 end
 ########################################