Index: /Users/mh/Documents/workspace/Teststoff/HTML/EN/settings/server/basic.html
===================================================================
--- /Users/mh/Documents/workspace/Teststoff/HTML/EN/settings/server/basic.html	(revision 19063)
+++ /Users/mh/Documents/workspace/Teststoff/HTML/EN/settings/server/basic.html	(working copy)
@@ -13,10 +13,10 @@
 [% PROCESS settings/header.html %]
 
 	[% WRAPPER setting title="SETUP_LANGUAGE" desc="SETUP_LANGUAGE_DESC" %]
-		<select class="stdedit" name="language" id="language">
+		<select class="stdedit" name="pref_language" id="language">
 
 		[% FOREACH option = languageoptions %]
-			<option [% IF prefs.language == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
+			<option [% IF prefs.pref_language == option.key %]selected [% END %]value="[% option.key %]">[% option.value %]</option>
 		[%- END -%]
 		
 		</select>
@@ -24,11 +24,11 @@
 
 	[% WRAPPER settingSection %]
 		[% WRAPPER settingGroup title="SETUP_AUDIODIR" desc="SETUP_AUDIODIR_DESC" %]
-			<input type="text" class="stdedit selectFolder" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" size="40">
+			<input type="text" class="stdedit selectFolder" name="pref_audiodir" id="audiodir" value="[% prefs.pref_audiodir %]" size="40">
 		[% END %]
 
 		[% WRAPPER settingGroup title="SETUP_PLAYLISTDIR" desc="SETUP_PLAYLISTDIR_DESC" %]
-			<input type="text" class="stdedit selectFolder" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" size="40">
+			<input type="text" class="stdedit selectFolder" name="pref_playlistdir" id="playlistdir" value="[% prefs.pref_playlistdir %]" size="40">
 		[% END %]
 	[% END %]
 
@@ -33,7 +33,7 @@
 	[% END %]
 
 	[% WRAPPER setting title="SETUP_RESCAN" desc="SETUP_RESCAN_DESC" %]
-		<select class="stdedit" name="rescantype" id="rescantype" [% IF scanning %]disabled[% END %]>
+		<select class="stdedit" name="pref_rescantype" id="rescantype" [% IF scanning %]disabled[% END %]>
 
 		[% FOREACH option = {
 			'1rescan'   => 'SETUP_STANDARDRESCAN',
@@ -44,7 +44,7 @@
 		[%- END -%]
 		
 		</select>
-		<input name="rescan" type="submit" class="stdclick" value="[% "SETUP_RESCAN_BUTTON" | string %]" [% IF scanning %]disabled[% END %]><br/><br/>
+		<input name="pref_rescan" type="submit" class="stdclick" value="[% "SETUP_RESCAN_BUTTON" | string %]" [% IF scanning %]disabled[% END %]><br/><br/>
 		<a id="progressLink" href="[% webroot %]settings/server/status.html?player=[% playerid %]">[% IF scanning %][% "SETUP_VIEW_SCANNING" | string %][% ELSE %][% "SETUP_VIEW_NOT_SCANNING" | string %][% END %]</a>
 	[% END %]
 
Index: /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings/Server/Basic.pm
===================================================================
--- /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings/Server/Basic.pm	(revision 19058)
+++ /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings/Server/Basic.pm	(working copy)
@@ -76,7 +76,7 @@
 
 	if ( $paramRef->{'saveSettings'} ) {
 		my $curLang = preferences('server')->get('language');
-		my $lang    = $paramRef->{'language'};
+		my $lang    = $paramRef->{'pref_language'};
 
 		# Bug 5443, Change the MySQL collation if switching to a language that doesn't work right with UTF8 collation
 		if ( $lang && $lang ne $curLang ) {
Index: /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings.pm
===================================================================
--- /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings.pm	(revision 19058)
+++ /Users/mh/Documents/workspace/Teststoff/Slim/Web/Settings.pm	(working copy)
@@ -139,8 +139,12 @@
 	for my $pref (@prefs) {
 
 		if ($paramRef->{'saveSettings'}) {
+			if (!defined $paramRef->{'pref_' . $pref} && defined $paramRef->{$pref}) {
+				logBacktrace('Preference names without "pref_" prepended in the page template are deprecated: ' . $pref);
+				$paramRef->{'pref_' . $pref} = $paramRef->{$pref};
+			}
 
-			my (undef, $ok) = $prefsClass->set($pref, $paramRef->{$pref});
+			my (undef, $ok) = $prefsClass->set($pref, $paramRef->{'pref_' . $pref});
 
 			if ($ok) {
 				$paramRef->{'validated'}->{$pref} = 1; 
@@ -146,7 +150,7 @@
 				$paramRef->{'validated'}->{$pref} = 1; 
 			}
 			else { 
-				$paramRef->{'warning'} .= sprintf(Slim::Utils::Strings::string('SETTINGS_INVALIDVALUE'), $paramRef->{$pref}, $pref) . '<br/>';
+				$paramRef->{'warning'} .= sprintf(Slim::Utils::Strings::string('SETTINGS_INVALIDVALUE'), $paramRef->{'pref_' . $pref}, $pref) . '<br/>';
 				$paramRef->{'validated'}->{$pref} = 0;
 			}
 		}
@@ -152,9 +156,9 @@
 		}
 
 		$paramRef->{'validate'}->{$pref} = $prefsClass->hasValidator($pref);
-		$paramRef->{'prefs'}->{$pref} = $prefsClass->get($pref);
+		$paramRef->{'prefs'}->{'pref_' . $pref} = $prefsClass->get($pref);
 		if (defined $client && $pref eq 'playername') {
-			$client->execute(['name', $paramRef->{'prefs'}->{$pref}]);
+			$client->execute(['name', $paramRef->{'prefs'}->{'pref_' . $pref}]);
 		}
 	}