Index: server/Slim/Plugin/MusicMagic/Settings.pm
===================================================================
--- server/Slim/Plugin/MusicMagic/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/MusicMagic/Settings.pm	(working copy)
@@ -59,11 +59,11 @@
 );
 
 sub name {
-	return 'MUSICMAGIC';
+	return Slim::Web::HTTP::protectName('MUSICMAGIC');
 }
 
 sub page {
-	return 'plugins/MusicMagic/settings/musicmagic.html';
+	return Slim::Web::HTTP::protectURI('plugins/MusicMagic/settings/musicmagic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/InfoBrowser/Settings.pm
===================================================================
--- server/Slim/Plugin/InfoBrowser/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/InfoBrowser/Settings.pm	(working copy)
@@ -25,11 +25,11 @@
 }
 
 sub name {
-	return 'PLUGIN_INFOBROWSER';
+	return Slim::Web::HTTP::protectName('PLUGIN_INFOBROWSER');
 }
 
 sub page {
-	return 'plugins/InfoBrowser/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/InfoBrowser/settings/basic.html');
 }
 
 sub handler {
Index: server/Slim/Plugin/xPL/Settings.pm
===================================================================
--- server/Slim/Plugin/xPL/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/xPL/Settings.pm	(working copy)
@@ -19,11 +19,11 @@
 });
 
 sub name {
-	return 'PLUGIN_XPL';
+	return Slim::Web::HTTP::protectName('PLUGIN_XPL');
 }
 
 sub page {
-	return 'plugins/xPL/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/xPL/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/RSSNews/Settings.pm
===================================================================
--- server/Slim/Plugin/RSSNews/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/RSSNews/Settings.pm	(working copy)
@@ -71,11 +71,11 @@
 });
 
 sub name {
-	return 'PLUGIN_RSSNews';
+	return Slim::Web::HTTP::protectName('PLUGIN_RSSNews');
 }
 
 sub page {
-	return 'plugins/RSSNews/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/RSSNews/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/iTunes/Settings.pm
===================================================================
--- server/Slim/Plugin/iTunes/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/iTunes/Settings.pm	(working copy)
@@ -48,11 +48,11 @@
 'itunes');
 
 sub name {
-	return 'ITUNES';
+	return Slim::Web::HTTP::protectName('ITUNES');
 }
 
 sub page {
-	return 'plugins/iTunes/settings/itunes.html';
+	return Slim::Web::HTTP::protectURI('plugins/iTunes/settings/itunes.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/CLI/Settings.pm
===================================================================
--- server/Slim/Plugin/CLI/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/CLI/Settings.pm	(working copy)
@@ -20,11 +20,11 @@
 $prefs->setChange(\&Slim::Plugin::CLI::Plugin::cli_socket_change, 'cliport');
 
 sub name {
-	return 'PLUGIN_CLI';
+	return Slim::Web::HTTP::protectName('PLUGIN_CLI');
 }
 
 sub page {
-	return 'plugins/CLI/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/CLI/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/Rescan/Settings.pm
===================================================================
--- server/Slim/Plugin/Rescan/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/Rescan/Settings.pm	(working copy)
@@ -21,11 +21,11 @@
 });
 
 sub name {
-	return 'PLUGIN_RESCAN_MUSIC_LIBRARY';
+	return Slim::Web::HTTP::protectName('PLUGIN_RESCAN_MUSIC_LIBRARY');
 }
 
 sub page {
-	return 'plugins/Rescan/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/Rescan/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/RadioTime/Settings.pm
===================================================================
--- server/Slim/Plugin/RadioTime/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/RadioTime/Settings.pm	(working copy)
@@ -17,11 +17,11 @@
 });
 
 sub name {
-	return 'PLUGIN_RADIOTIME_MODULE_NAME';
+	return Slim::Web::HTTP::protectName('PLUGIN_RADIOTIME_MODULE_NAME');
 }
 
 sub page {
-	return 'plugins/RadioTime/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/RadioTime/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/DateTime/Settings.pm
===================================================================
--- server/Slim/Plugin/DateTime/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/DateTime/Settings.pm	(working copy)
@@ -26,11 +26,11 @@
 };
 
 sub name {
-	return 'PLUGIN_SCREENSAVER_DATETIME';
+	return Slim::Web::HTTP::protectName('PLUGIN_SCREENSAVER_DATETIME');
 }
 
 sub page {
-	return 'plugins/DateTime/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/DateTime/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/Podcast/Settings.pm
===================================================================
--- server/Slim/Plugin/Podcast/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/Podcast/Settings.pm	(working copy)
@@ -56,11 +56,11 @@
 });
 
 sub name {
-	return 'PLUGIN_PODCAST';
+	return Slim::Web::HTTP::protectName('PLUGIN_PODCAST');
 }
 
 sub page {
-	return 'plugins/Podcast/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/Podcast/settings/basic.html');
 }
 
 sub handler {
Index: server/Slim/Plugin/AudioScrobbler/Settings.pm
===================================================================
--- server/Slim/Plugin/AudioScrobbler/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/AudioScrobbler/Settings.pm	(working copy)
@@ -17,11 +17,11 @@
 my $log   = logger('plugin.audioscrobbler');
 
 sub name {
-	return 'PLUGIN_AUDIOSCROBBLER_MODULE_NAME';
+	return Slim::Web::HTTP::protectName('PLUGIN_AUDIOSCROBBLER_MODULE_NAME');
 }
 
 sub page {
-	return 'plugins/AudioScrobbler/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/AudioScrobbler/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/Favorites/Settings.pm
===================================================================
--- server/Slim/Plugin/Favorites/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/Favorites/Settings.pm	(working copy)
@@ -13,11 +13,11 @@
 my $prefs = preferences('plugin.favorites');
 
 sub name {
-	return 'FAVORITES';
+	return Slim::Web::HTTP::protectName('FAVORITES');
 }
 
 sub page {
-	return 'plugins/Favorites/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/Favorites/settings/basic.html');
 }
 
 sub prefs {
Index: server/Slim/Plugin/RS232/Settings.pm
===================================================================
--- server/Slim/Plugin/RS232/Settings.pm	(revision 14281)
+++ server/Slim/Plugin/RS232/Settings.pm	(working copy)
@@ -15,11 +15,11 @@
 $prefs->setChange(\&Slim::Plugin::RS232::Plugin::cliOverRS232Change, 'clioverrs232enable');
 
 sub name {
-	return 'PLUGIN_RS232_NAME';
+	return Slim::Web::HTTP::protectName('PLUGIN_RS232_NAME');
 }
 
 sub page {
-	return 'plugins/RS232/settings/basic.html';
+	return Slim::Web::HTTP::protectURI('plugins/RS232/settings/basic.html');
 }
 
 sub prefs {