diff --git a/system/options.nix b/system/options.nix
index b3ccfa0b01e6..116dd4bb30f0 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1660,17 +1660,17 @@
 	description = "User account under which MySQL runs";
       };
       
-      datadir = mkOption {
+      dataDir = mkOption {
         default = "/var/mysql";
 	description = "Location where MySQL stores its table files";
       };
       
-      log_error = mkOption {
+      logError = mkOption {
         default = "/var/log/mysql_err.log";
 	description = "Location of the MySQL error logfile";
       };
       
-      pid_file = mkOption {
+      pidFile = mkOption {
         default = "/var/mysql/mysql.pid";
 	description = "Location of the file which stores the PID of the MySQL server";
       };
diff --git a/upstart-jobs/mysql.nix b/upstart-jobs/mysql.nix
index 311f6747acf4..8a8f924bf17d 100644
--- a/upstart-jobs/mysql.nix
+++ b/upstart-jobs/mysql.nix
@@ -5,8 +5,8 @@ let
 cfg = config.services.mysql;
 mysqlService = import ../services/mysql {
 	inherit (pkgs) stdenv mysql;
-	inherit (cfg) port user datadir
-		log_error pid_file;
+	inherit (cfg) port user dataDir
+		logError pidFile;
 };
 
 in