diff --git a/server.conf.in b/server.conf.in
index 77a27e18..231f4411 100644
--- a/server.conf.in
+++ b/server.conf.in
@@ -58,7 +58,7 @@ listen = 127.0.0.1:8080
 ; 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 client side webui under settings
-;turnClientSideSetable = false
+;clientSideTurn = 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 6cfa1b2f..08f2c9dc 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
-	TurnClientSideSetable           bool            // Enable TURN server customization under settings in web ui
+	ClientSideTurn                  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
@@ -117,7 +117,7 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
 		Renegotiation:                   container.GetBoolDefault("app", "renegotiation", false),
 		StunURIs:                        stunURIs,
 		TurnURIs:                        turnURIs,
-		TurnClientSideSetable:           container.GetBoolDefault("app", "turnClientSideSetable", false),
+		ClientSideTurn:                  container.GetBoolDefault("app", "clientSideTurn", false),
 		Tokens:                          tokens,
 		Version:                         version,
 		UsersEnabled:                    container.GetBoolDefault("users", "enabled", false),
diff --git a/static/js/directives/settings.js b/static/js/directives/settings.js
index 4cbfe48b..52bf07fa 100644
--- a/static/js/directives/settings.js
+++ b/static/js/directives/settings.js
@@ -70,7 +70,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
 			$scope.withUsers = mediaStream.config.UsersEnabled;
 			$scope.withUsersRegistration = mediaStream.config.UsersAllowRegistration;
 			$scope.withUsersMode = mediaStream.config.UsersMode;
-			$scope.withTurnCustomizable = turnSettings.showClientSideTurnOptions();
+			$scope.clientSideTurn = turnSettings.showClientSideTurnOptions();
 
 			_.each(availableLanguages, function(name, code) {
 				$scope.availableLanguages.push({
diff --git a/static/js/services/turnsettings.js b/static/js/services/turnsettings.js
index 3af99dc6..b02cf3db 100644
--- a/static/js/services/turnsettings.js
+++ b/static/js/services/turnsettings.js
@@ -27,7 +27,7 @@ define([], function() {
 	// See contraints.js for actual TURN configuration in use for a connection
 	return ['mediaStream', 'appData', 'constraints', function(mediaStream, appData, constraints) {
 
-		var preferClientSideTurnSettings = mediaStream.config.TurnClientSideSetable;
+		var clientSideTurn = mediaStream.config.ClientSideTurn;
 		var turnConfigServer = null;
 
 		// @param Object config Turn configuration object
@@ -35,7 +35,7 @@ define([], function() {
 		// @param String config.username
 		// @param String config.password
 		var updateTurnSettings = function(config) {
-			if (!preferClientSideTurnSettings) {
+			if (!clientSideTurn) {
 				return;
 			}
 			if (config.urls.length) {
@@ -46,7 +46,7 @@ define([], function() {
 			}
 		};
 
-		if (preferClientSideTurnSettings) {
+		if (clientSideTurn) {
 			// Overwrite server Turn settings with user settings when loading app
 			appData.e.one("userSettingsLoaded", function(event, loadedUser, user) {
 				if (user) {
@@ -63,7 +63,7 @@ define([], function() {
 
 		return {
 			showClientSideTurnOptions: function() {
-				return preferClientSideTurnSettings;
+				return clientSideTurn;
 			},
 			update: updateTurnSettings
 		};
diff --git a/static/partials/settings.html b/static/partials/settings.html
index 8bb9bcf8..d3c90f2b 100644
--- a/static/partials/settings.html
+++ b/static/partials/settings.html
@@ -283,7 +283,7 @@
             </div>
           </div>
 
-          <div ng-show="withTurnCustomizable">
+          <div ng-show="clientSideTurn">
               <legend>{{_('Turn')}}</legend>
               <div>
                 <div class="form-group">