diff --git a/resources/server/bin-dev/code-web.js b/resources/server/bin-dev/code-web.js
index d5276fb41d0..0fdb7c76d2c 100644
--- a/resources/server/bin-dev/code-web.js
+++ b/resources/server/bin-dev/code-web.js
@@ -61,7 +61,7 @@ if (ENABLE_SYNC) {
 }
 
 // Connection Token
-serverArgs.push('--connectionToken', '00000');
+serverArgs.push('--connection-token', '00000');
 
 // Server should really only listen from localhost
 serverArgs.push('--host', '127.0.0.1');
diff --git a/src/vs/server/remoteExtensionHostAgentServer.ts b/src/vs/server/remoteExtensionHostAgentServer.ts
index d755bca9589..89cc2b57878 100644
--- a/src/vs/server/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/remoteExtensionHostAgentServer.ts
@@ -914,8 +914,8 @@ export class RemoteExtensionHostAgentServer extends Disposable {
 
 function parseConnectionToken(args: ServerParsedArgs): { connectionToken: string; connectionTokenIsMandatory: boolean; } {
 	if (args['connection-secret']) {
-		if (args['connectionToken']) {
-			console.warn(`Please do not use the argument connectionToken at the same time as connection-secret.`);
+		if (args['connection-token']) {
+			console.warn(`Please do not use the argument connection-token at the same time as connection-secret.`);
 			process.exit(1);
 		}
 		let rawConnectionToken = fs.readFileSync(args['connection-secret']).toString();
@@ -926,7 +926,7 @@ function parseConnectionToken(args: ServerParsedArgs): { connectionToken: string
 		}
 		return { connectionToken: rawConnectionToken, connectionTokenIsMandatory: true };
 	} else {
-		return { connectionToken: args['connectionToken'] || generateUuid(), connectionTokenIsMandatory: false };
+		return { connectionToken: args['connection-token'] || generateUuid(), connectionTokenIsMandatory: false };
 	}
 }
 
diff --git a/src/vs/server/serverEnvironmentService.ts b/src/vs/server/serverEnvironmentService.ts
index 2e8a3ef9394..3715cfb25c1 100644
--- a/src/vs/server/serverEnvironmentService.ts
+++ b/src/vs/server/serverEnvironmentService.ts
@@ -11,7 +11,7 @@ import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/envi
 
 export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
 	'port': { type: 'string' },
-	'connectionToken': { type: 'string' },
+	'connection-token': { type: 'string' },
 	'connection-secret': { type: 'string', description: nls.localize('connection-secret', "Path to file that contains the connection token. This will require that all incoming connections know the secret.") },
 	'host': { type: 'string' },
 	'socket-path': { type: 'string' },
@@ -58,7 +58,7 @@ export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
 
 export interface ServerParsedArgs {
 	port?: string;
-	connectionToken?: string;
+	'connection-token'?: string;
 	/**
 	 * A path to a filename which will be read on startup.
 	 * Consider placing this file in a folder readable only by the same user (a `chmod 0700` directory).