diff --git a/core/modules/commands/server.js b/core/modules/commands/server.js
index a7d6cc023..da8a3f0a6 100644
--- a/core/modules/commands/server.js
+++ b/core/modules/commands/server.js
@@ -36,13 +36,13 @@ Command.prototype.execute = function() {
 		variables: {
 			port: this.params[0],
 			host: this.params[6],
-			rootTiddler: this.params[1],
-			renderType: this.params[2],
-			serveType: this.params[3],
+			roottiddler: this.params[1],
+			rendertype: this.params[2],
+			servetype: this.params[3],
 			username: this.params[4],
 			password: this.params[5],
 			pathprefix: this.params[7],
-			debugLevel: this.params[8]
+			debuglevel: this.params[8]
 		}
 	});
 	var nodeServer = this.server.listen();
diff --git a/core/modules/server/authenticators/header.js b/core/modules/server/authenticators/header.js
index 00c1f83ea..95a7ffe28 100644
--- a/core/modules/server/authenticators/header.js
+++ b/core/modules/server/authenticators/header.js
@@ -14,7 +14,7 @@ Authenticator for trusted header authentication
 
 function HeaderAuthenticator(server) {
 	this.server = server;
-	this.header = server.get("authenticatedUserHeader");
+	this.header = server.get("authenticateduserheader");
 }
 
 /*
diff --git a/core/modules/server/routes/get-index.js b/core/modules/server/routes/get-index.js
index 30d970a8a..bde3fb67c 100644
--- a/core/modules/server/routes/get-index.js
+++ b/core/modules/server/routes/get-index.js
@@ -17,8 +17,8 @@ exports.method = "GET";
 exports.path = /^\/$/;
 
 exports.handler = function(request,response,state) {
-	response.writeHead(200, {"Content-Type": state.server.get("serveType")});
-	var text = state.wiki.renderTiddler(state.server.get("renderType"),state.server.get("rootTiddler"));
+	response.writeHead(200, {"Content-Type": state.server.get("servetype")});
+	var text = state.wiki.renderTiddler(state.server.get("rendertype"),state.server.get("roottiddler"));
 	response.end(text,"utf8");
 };
 
diff --git a/core/modules/server/server.js b/core/modules/server/server.js
index 6daaeaa0d..4a30a104a 100644
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -62,10 +62,10 @@ function Server(options) {
 Server.prototype.defaultVariables = {
 	port: "8080",
 	host: "127.0.0.1",
-	rootTiddler: "$:/core/save/all",
-	renderType: "text/plain",
-	serveType: "text/html",
-	debugLevel: "none"
+	roottiddler: "$:/core/save/all",
+	rendertype: "text/plain",
+	servetype: "text/html",
+	debuglevel: "none"
 };
 
 Server.prototype.get = function(name) {
@@ -158,7 +158,7 @@ Server.prototype.requestHandler = function(request,response) {
 	// Find the route that matches this path
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
-	if(self.get("debugLevel") !== "none") {
+	if(self.get("debuglevel") !== "none") {
 		console.log("Request path:",JSON.stringify(state.urlInfo));
 		console.log("Request headers:",JSON.stringify(request.headers));
 		console.log("authenticatedUsername:",state.authenticatedUsername);