diff --git a/server.conf.in b/server.conf.in
index 94fb850d..77a27e18 100644
--- a/server.conf.in
+++ b/server.conf.in
@@ -57,8 +57,8 @@ listen = 127.0.0.1:8080
 ; See http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00 for details.
 ; A supported TURN server is https://code.google.com/p/rfc5766-turn-server/.
 ;turnSecret = the-default-turn-shared-secret-do-not-keep
-; Enable adding TURN servers inside of the clientside webui under settings
-;turnURIsClientSideSetable = false
+; Enable adding TURN servers inside of the client side webui under settings
+;turnClientSideSetable = false
 ; Enable renegotiation support. Set to true to tell clients that they can
 ; renegotiate peer connections when required. Firefox support is not complete,
 ; so do not enable if you want compatibility with Firefox clients.
diff --git a/src/app/spreed-webrtc-server/config.go b/src/app/spreed-webrtc-server/config.go
index a815f0fa..6cfa1b2f 100644
--- a/src/app/spreed-webrtc-server/config.go
+++ b/src/app/spreed-webrtc-server/config.go
@@ -39,7 +39,7 @@ type Config struct {
 	Renegotiation                   bool            // Renegotiation flag
 	StunURIs                        []string        // STUN server URIs
 	TurnURIs                        []string        // TURN server URIs
-	TurnURIsClientSideSetable       bool            // Enable TURN server customization under settings in web ui
+	TurnClientSideSetable           bool            // Enable TURN server customization under settings in web ui
 	Tokens                          bool            // True when we got a tokens file
 	Version                         string          // Server version number
 	UsersEnabled                    bool            // Flag if users are enabled
@@ -109,15 +109,15 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
 	log.Println("Enabled modules:", modules)
 
 	return &Config{
-		Title:                     container.GetStringDefault("app", "title", "Spreed WebRTC"),
-		ver:                       ver,
-		S:                         fmt.Sprintf("static/ver=%s", ver),
-		B:                         basePath,
-		Token:                     serverToken,
-		Renegotiation:             container.GetBoolDefault("app", "renegotiation", false),
-		StunURIs:                  stunURIs,
-		TurnURIs:                  turnURIs,
-		TurnURIsClientSideSetable: container.GetBoolDefault("app", "turnURIsClientSideSetable", false),
+		Title:                           container.GetStringDefault("app", "title", "Spreed WebRTC"),
+		ver:                             ver,
+		S:                               fmt.Sprintf("static/ver=%s", ver),
+		B:                               basePath,
+		Token:                           serverToken,
+		Renegotiation:                   container.GetBoolDefault("app", "renegotiation", false),
+		StunURIs:                        stunURIs,
+		TurnURIs:                        turnURIs,
+		TurnClientSideSetable:           container.GetBoolDefault("app", "turnClientSideSetable", false),
 		Tokens:                          tokens,
 		Version:                         version,
 		UsersEnabled:                    container.GetBoolDefault("users", "enabled", false),
diff --git a/static/js/mediastream/api.js b/static/js/mediastream/api.js
index 4cb09f02..058b523c 100644
--- a/static/js/mediastream/api.js
+++ b/static/js/mediastream/api.js
@@ -151,7 +151,7 @@ define(['jquery', 'underscore', 'ua-parser'], function($, _, uaparser) {
 
 		switch (dataType) {
 			case "Self":
-				console.log("Self received", data);
+				//console.log("Self received", data);
 				if (data.Token) {
 					this.connector.token = data.Token;
 				}
diff --git a/static/js/services/constraints.js b/static/js/services/constraints.js
index 6dbf409d..eefb8c5a 100644
--- a/static/js/services/constraints.js
+++ b/static/js/services/constraints.js
@@ -143,7 +143,6 @@
 				iceServers.push(createIceServers(service.stun));
 			}
 			if (service.turn && service.turn.urls && service.turn.urls.length) {
-				console.log('iceServers', service.turn);
 				iceServers.push(createIceServers(service.turn.urls, service.turn.username, service.turn.password));
 			}
 			webrtc.settings.pcConfig.iceServers = iceServers;
@@ -186,7 +185,6 @@
 			// Setters for TURN and STUN data.
 			turn: function(turnData) {
 				service.turn = turnData;
-				console.log("turnData", service.turn);
 			},
 			stun: function(stunData) {
 				service.stun = stunData;
@@ -213,4 +211,4 @@
 
 	}];
 
- });
+ });
\ No newline at end of file
diff --git a/static/js/services/turnsettings.js b/static/js/services/turnsettings.js
index 995a8cda..4401394c 100644
--- a/static/js/services/turnsettings.js
+++ b/static/js/services/turnsettings.js
@@ -29,7 +29,7 @@ define(["angular"], function(angular) {
 	 */
 	return ['mediaStream', 'appData', 'constraints', function(mediaStream, appData, constraints) {
 
-		var preferClientSideTurnSettings = mediaStream.config.TurnURIsClientSideSetable;
+		var preferClientSideTurnSettings = mediaStream.config.TurnClientSideSetable;
 		var turnConfigServer = null;
 
 		/**