diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml
index 14f8997..1ceb405 100644
--- a/mysql/defaults.yaml
+++ b/mysql/defaults.yaml
@@ -21,7 +21,7 @@ Ubuntu:
         nice: 0
       mysqld:
         user: mysql
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
         socket: /var/run/mysqld/mysqld.sock
         port: 3306
         basedir: /usr
@@ -34,7 +34,6 @@ Ubuntu:
         max_allowed_packet: 16M
         thread_stack: 192K
         thread_cache_size: 8
-        myisam_recover: BACKUP
         query_cache_limit: 1M
         query_cache_size: 16M
         log_error: /var/log/mysql/error.log
@@ -66,7 +65,7 @@ Debian:
         nice: 0
       mysqld:
         user: mysql
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
         socket: /var/run/mysqld/mysqld.sock
         port: 3306
         basedir: /usr
@@ -79,7 +78,6 @@ Debian:
         max_allowed_packet: 16M
         thread_stack: 192K
         thread_cache_size: 8
-        myisam_recover: BACKUP
         query_cache_limit: 1M
         query_cache_size: 16M
         expire_logs_days: 10
@@ -106,7 +104,7 @@ CentOS:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -125,7 +123,7 @@ RedHat:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -143,7 +141,7 @@ Fedora:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -233,7 +231,7 @@ Amazon:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -286,7 +284,7 @@ Gentoo:
         user: mysql
         port: 3306
         socket: /var/run/mysqld/mysqld.sock
-        pid_file: /var/run/mysqld/mysqld.pid
+        pid-file: /var/run/mysqld/mysqld.pid
         log_error: /var/log/mysql/mysqld.err
         basedir: /usr
         datadir: /var/lib/mysql