diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index b007965d4..0e05f18ff 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -424,8 +424,8 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 #define OSD_PRESET_OPTIONS_COUNT 2
 const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] =
 {
-	{ COsdSetup::PRESET_LCD_A, LOCALE_OSD_PRESET_SCREEN_A },
-	{ COsdSetup::PRESET_LCD_B, LOCALE_OSD_PRESET_SCREEN_B }
+	{ COsdSetup::PRESET_SCREEN_A, LOCALE_OSD_PRESET_SCREEN_A },
+	{ COsdSetup::PRESET_SCREEN_B, LOCALE_OSD_PRESET_SCREEN_B }
 };
 
 #define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index 6b65fa7de..c259af321 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -104,8 +104,8 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 
 		enum
 		{
-			PRESET_LCD_A,
-			PRESET_LCD_B
+			PRESET_SCREEN_A,
+			PRESET_SCREEN_B
 		};
 		
 		COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF);
diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp
index be593c285..4add79391 100644
--- a/src/gui/screensetup.cpp
+++ b/src/gui/screensetup.cpp
@@ -119,13 +119,13 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
 					case 1:
 					    {
 						switch (g_settings.screen_preset) {
-							case COsdSetup::PRESET_LCD_B:
+							case COsdSetup::PRESET_SCREEN_B:
 								g_settings.screen_StartX_lcd_b_1 = g_settings.screen_StartX;
 								g_settings.screen_StartY_lcd_b_1 = g_settings.screen_StartY;
 								g_settings.screen_EndX_lcd_b_1   = g_settings.screen_EndX;
 								g_settings.screen_EndY_lcd_b_1   = g_settings.screen_EndY;
 								break;
-							case COsdSetup::PRESET_LCD_A:
+							case COsdSetup::PRESET_SCREEN_A:
 							default:
 								g_settings.screen_StartX_lcd_a_1 = g_settings.screen_StartX;
 								g_settings.screen_StartY_lcd_a_1 = g_settings.screen_StartY;
@@ -140,13 +140,13 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
 					default:
 					    {
 						switch (g_settings.screen_preset) {
-							case COsdSetup::PRESET_LCD_B:
+							case COsdSetup::PRESET_SCREEN_B:
 								g_settings.screen_StartX_lcd_b_0 = g_settings.screen_StartX;
 								g_settings.screen_StartY_lcd_b_0 = g_settings.screen_StartY;
 								g_settings.screen_EndX_lcd_b_0   = g_settings.screen_EndX;
 								g_settings.screen_EndY_lcd_b_0   = g_settings.screen_EndY;
 								break;
-							case COsdSetup::PRESET_LCD_A:
+							case COsdSetup::PRESET_SCREEN_A:
 							default:
 								g_settings.screen_StartX_lcd_a_0 = g_settings.screen_StartX;
 								g_settings.screen_StartY_lcd_a_0 = g_settings.screen_StartY;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index a2af0975a..7f78f794d 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -974,7 +974,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.screen_EndX_lcd_b_1   = configfile.getInt32("screen_EndX_lcd_b_1"  , 1888 - g_settings.screen_StartX_lcd_b_1 - 1);
 	g_settings.screen_EndY_lcd_b_1   = configfile.getInt32("screen_EndY_lcd_b_1"  , 1062 - g_settings.screen_StartY_lcd_b_1 - 1);
 
-	g_settings.screen_preset       = configfile.getInt32("screen_preset", COsdSetup::PRESET_LCD_A);
+	g_settings.screen_preset       = configfile.getInt32("screen_preset", COsdSetup::PRESET_SCREEN_A);
 	setScreenSettings();
 
 	// avoid configuration mismatch
@@ -1258,13 +1258,13 @@ void CNeutrinoApp::setScreenSettings()
 		case 1:
 		    {
 			switch (g_settings.screen_preset) {
-				case COsdSetup::PRESET_LCD_B:
+				case COsdSetup::PRESET_SCREEN_B:
 					g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_1;
 					g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_1;
 					g_settings.screen_EndX   = g_settings.screen_EndX_lcd_b_1;
 					g_settings.screen_EndY   = g_settings.screen_EndY_lcd_b_1;
 					break;
-				case COsdSetup::PRESET_LCD_A:
+				case COsdSetup::PRESET_SCREEN_A:
 				default:
 					g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_1;
 					g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_1;
@@ -1279,13 +1279,13 @@ void CNeutrinoApp::setScreenSettings()
 		default:
 		    {
 			switch (g_settings.screen_preset) {
-				case COsdSetup::PRESET_LCD_B:
+				case COsdSetup::PRESET_SCREEN_B:
 					g_settings.screen_StartX = g_settings.screen_StartX_lcd_b_0;
 					g_settings.screen_StartY = g_settings.screen_StartY_lcd_b_0;
 					g_settings.screen_EndX   = g_settings.screen_EndX_lcd_b_0;
 					g_settings.screen_EndY   = g_settings.screen_EndY_lcd_b_0;
 					break;
-				case COsdSetup::PRESET_LCD_A:
+				case COsdSetup::PRESET_SCREEN_A:
 				default:
 					g_settings.screen_StartX = g_settings.screen_StartX_lcd_a_0;
 					g_settings.screen_StartY = g_settings.screen_StartY_lcd_a_0;