diff --git a/acinclude.m4 b/acinclude.m4
index 42956bd07..3eadaaff4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -471,17 +471,29 @@ AC_ARG_WITH(boxtype,
 	esac], [BOXTYPE="coolstream"])
 
 AC_ARG_WITH(boxmodel,
-	[  --with-boxmodel         valid for coolstream: nevis, apollo
+	[  --with-boxmodel         valid for coolstream: hd1, hd2
                           valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
                           valid for ipbox: ip200, ip250, ip350, ip400],
 	[case "${withval}" in
-		nevis|apollo)
+		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 			;;
+		nevis|apollo)
+			if test "$BOXTYPE" = "coolstream"; then
+				if test "$withval" = "nevis"; then
+					BOXMODEL="hd1"
+				fi
+				if test "$withval" = "apollo"; then
+					BOXMODEL="hd2"
+				fi
+			else
+				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
+			fi
+			;;
 		dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
 			if test "$BOXTYPE" = "dreambox"; then
 				BOXMODEL="$withval"
@@ -499,7 +511,7 @@ AC_ARG_WITH(boxmodel,
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 			;;
-	esac], [BOXMODEL="nevis"]
+	esac], [BOXMODEL="hd1"]
 	[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
 		AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
 	fi])
@@ -514,8 +526,8 @@ AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
 AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 
-AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis")
-AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo")
+AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
 
 AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
 AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
@@ -543,10 +555,10 @@ elif test "$BOXTYPE" = "generic"; then
 fi
 
 # TODO: do we need more defines?
-if test "$BOXMODEL" = "nevis"; then
-	AC_DEFINE(BOXMODEL_NEVIS, 1, [coolstream hd1/neo/neo2/zee])
-elif test "$BOXMODEL" = "apollo"; then
-	AC_DEFINE(BOXMODEL_APOLLO, 1, [coolstream tank])
+if test "$BOXMODEL" = "hd1"; then
+	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
+elif test "$BOXMODEL" = "hd2"; then
+	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zeeČ/link])
 elif test "$BOXMODEL" = "dm500"; then
 	AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
 elif test "$BOXMODEL" = "ip200"; then
diff --git a/configure.ac b/configure.ac
index d2dcfbe26..55b5103db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 fi
 HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
-if test "$BOXMODEL" = "apollo"; then
+if test "$BOXMODEL" = "hd2"; then
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
 fi
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 7f822c6b1..6325ef80f 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -11,6 +11,6 @@ install_DATA = \
 	tuxtxt.ttf \
 	tuxtxt.otb
 
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 install_DATA += UnDotum.ttf
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index dcf9c8196..1d452bd8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,7 @@ neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp
 
 AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
 
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 MTDUTILSLIBS = \
 	system/mtdutils/libneutrino_system_mtdutils.a \
 	system/mtdutils/lib/libneutrino_system_mtdutils_lib.a
@@ -145,14 +145,14 @@ if BOXTYPE_COOL
 neutrino_LDADD += -lcoolstream-mt -lca-sc
 if ENABLE_TMSDK 
 else
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 neutrino_LDADD += -lca-ci -llnxtmvssUsr -llnxUKAL -llnxplatUsr -llnxtmasUsr -llnxdvbciUsr -llnxpvrUsr -llnxcssUsr -llnxnotifyqUsr -ltmpvrDataManager-cst -ltmpvrIndexStorage -llnxscsUsr
 else
 neutrino_LDADD += -lnxp
 endif
 endif
 
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 neutrino_LDADD += -liconv
 endif
 
diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp
index a7bd27acf..3af188521 100644
--- a/src/driver/fade.cpp
+++ b/src/driver/fade.cpp
@@ -55,14 +55,14 @@ void COSDFader::StartFadeIn()
 	fadeIn = true;
 	fadeOut = false;
 	fadeValue = 100;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
 #else
 	frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
 #endif
 
 	frameBuffer->setBlendLevel(fadeValue);
-#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
+#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
 	usleep(60000);
 #endif
 	fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -79,7 +79,7 @@ bool COSDFader::StartFadeOut()
 	if ((!fadeOut) && g_settings.widget_fade) {
 		fadeOut = true;
 		fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_UNIFORM_ALPHA); // Global alpha multiplied with pixel alpha
 #else
 		frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
@@ -93,12 +93,12 @@ void COSDFader::StopFade()
 {
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
 #else
 		frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
 #endif
-#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
+#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
 		usleep(60000);
 #endif
 		fadeIn = fadeOut = false;
@@ -124,12 +124,12 @@ bool COSDFader::FadeDone()
 			fadeValue = max_alpha;
 			g_RCInput->killTimer (fadeTimer);
 			fadeIn = false;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 			frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
 #else
 			frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
 #endif
-#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_APOLLO))
+#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
 			usleep(60000);
 #endif
 		} else
diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 7911f22df..20ff5a506 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -63,7 +63,7 @@ extern CPictureViewer * g_PicViewer;
 
 #define BACKGROUNDIMAGEWIDTH 720
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #ifndef FB_HW_ACCELERATION
 #define FB_HW_ACCELERATION
 #endif
@@ -582,7 +582,7 @@ void CFrameBuffer::setBlendLevel(int level)
 
 	if (ioctl(fd, FBIO_SETOPACITY, value))
 		printf("FBIO_SETOPACITY failed.\n");
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	   if(level == 100) // TODO: sucks.
 		   usleep(20000);
 #endif
@@ -735,7 +735,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
 	int w_align;
 	int offs_align;
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (_dx%4 != 0) {
 		w_align = GetWidth4FB_HW_ACC(x, _dx, true);
 		if (w_align < _dx)
diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp
index 4bb9a63cf..84f2fc7a6 100644
--- a/src/driver/pictureviewer/pictureviewer.cpp
+++ b/src/driver/pictureviewer/pictureviewer.cpp
@@ -856,7 +856,7 @@ bool CPictureViewer::checkfreemem(size_t bufsize)
 {
 	struct sysinfo info;
 	sysinfo( &info );
-	if(bufsize + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
+	if(bufsize*2 + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
 		dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] Error: Out of memory\n", __func__, __LINE__);
 		return false;
 	}
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index 0f7869e43..5c6458506 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -39,7 +39,7 @@
 #include <string>
 #include <vector>
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
 #include <cs_ir_generic.h>
 #endif
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index b6b2fafdc..ec1118fae 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -218,7 +218,7 @@ bool CScreenShot::SavePng()
 	png_set_compression_level(png_ptr, Z_BEST_SPEED);
 
 	png_set_bgr(png_ptr);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	png_set_invert_alpha(png_ptr);
 #endif
 	png_write_info(png_ptr, info_ptr);
diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp
index daf603e82..b0dc73f50 100644
--- a/src/driver/vfd.cpp
+++ b/src/driver/vfd.cpp
@@ -71,7 +71,7 @@ CVFD::CVFD()
 		has_led_segment = false;
 	}
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (fd >= 0) {
 		int ret = ioctl(fd, IOC_FP_GET_DISPLAY_CAPS, &caps);
 		if (ret < 0) {
@@ -372,7 +372,7 @@ void CVFD::showTime(bool force)
 					ShowText(timestr);
 				} else if (support_numbers && has_led_segment) {
 					ShowNumber((t->tm_hour*100) + t->tm_min);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 					ioctl(fd, IOC_FP_SET_COLON, 0x01);
 #endif
 				}
@@ -564,7 +564,7 @@ void CVFD::setMode(const MODES m, const char * const title)
 	if(fd < 0) return;
 
 	// Clear colon in display if it is still there
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (support_numbers && has_led_segment)
 		ioctl(fd, IOC_FP_SET_COLON, 0x00);
 #endif
@@ -815,7 +815,7 @@ void CVFD::ShowNumber(int number)
 	if (number < 0)
 		return;
 	
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int ret = ioctl(fd, IOC_FP_SET_NUMBER, number);
 	if(ret < 0) {
 		support_numbers = false;
diff --git a/src/driver/vfd.h b/src/driver/vfd.h
index 5f1c374a7..4a3ec64c0 100644
--- a/src/driver/vfd.h
+++ b/src/driver/vfd.h
@@ -76,7 +76,7 @@ class CVFD
 
 
 	private:
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		fp_display_caps_t		caps;
 #endif
 		MODES				mode;
diff --git a/src/drivertool.c b/src/drivertool.c
index 80432d776..4e753e868 100644
--- a/src/drivertool.c
+++ b/src/drivertool.c
@@ -32,7 +32,7 @@
 
 #include <cs_frontpanel.h>
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #ifdef HAVE_COOLSTREAM_CS_IR_GENERIC_H
 #include <cs_ir_generic.h>
 #endif
diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp
index 9267630da..3ddff948a 100644
--- a/src/eitd/edvbstring.cpp
+++ b/src/eitd/edvbstring.cpp
@@ -198,7 +198,7 @@ static unsigned long iso6937[96]={
 	0x0138, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142, 0x00F8, 0x0153, 0x00DF, 0x00FE, 0x0167, 0x014B, 0x00AD
 };
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 const unsigned short cGB2312UNI[] = {
 	// Start at 0xA100.so index have to be reduced. Maybe this can be optimized by removing the starts but for
 	// now just 'make it work' :).
@@ -2020,7 +2020,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid)
 {
 	int newtable = 0;
 	bool twochar = false;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	bool gb2312 = false;
 #endif
 	if (!len)
@@ -2070,7 +2070,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid)
 		break;
 	case 0x13:
 		++i;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
                 //printf("GB-2312-1980 enc.\n");
 		gb2312 = true;
 #endif
@@ -2116,7 +2116,7 @@ std::string convertDVBUTF8(const char *data, int len, int table, int tsidonid)
 //dprintf("recode:::: doVideoTexSuppl code %lX\n", code);
 		}
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		// GB2312 -> Unicode
 		if (gb2312 && !code) {
 			if (data[i] >= 0xA1) {
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 27f8cb3a4..848a747e3 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -94,7 +94,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT
 	{ 2, LOCALE_AUDIOMENU_MONORIGHT }
 };
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #define AUDIOMENU_SRS_OPTION_COUNT 3
 #else
 #define AUDIOMENU_SRS_OPTION_COUNT 2
@@ -103,7 +103,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_SRS_OPTIONS[AUDIOMENU_SRS_OPTION_COUN
 {
 	{ 0 , LOCALE_AUDIO_SRS_ALGO_LIGHT },
 	{ 1 , LOCALE_AUDIO_SRS_ALGO_NORMAL },
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	{ 2 , LOCALE_AUDIO_SRS_ALGO_HEAVY }
 #endif
 };
@@ -229,7 +229,7 @@ int CAudioSetup::showAudioSetup()
 	audioSettings->addItem(GenericMenuSeparatorLine);
 	audioSettings->addItem(as_oj_srsonoff);
 	audioSettings->addItem(as_oj_algo);
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	audioSettings->addItem(as_oj_noise);
 #endif
 	audioSettings->addItem(as_oj_volrev);
@@ -246,7 +246,7 @@ int CAudioSetup::showAudioSetup()
 	int res = audioSettings->exec(NULL, "");
 	selected = audioSettings->getSelected();
 	delete audioSettings;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	delete as_oj_noise;
 #endif
 	if (!g_settings.easymenu)
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index 28c195ee5..1ea62fc18 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -108,7 +108,7 @@ int CCAMMenuHandler::doMainMenu()
 
 	CMenuWidget* cammenu = new CMenuWidget(LOCALE_CI_SETTINGS, NEUTRINO_ICON_SETTINGS);
 	cammenu->addIntroItems();
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int fecount = CFEManager::getInstance()->getFrontendCount();
 	char fename[fecount+1][255];
 #endif
@@ -120,7 +120,7 @@ int CCAMMenuHandler::doMainMenu()
 		cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
 		cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		CMenuOptionChooser::keyval_ext feselect[fecount+1];
 		feselect[0].key = -1;
 		feselect[0].value = NONEXISTANT_LOCALE;
diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp
index a303038bc..bcaccf6c7 100644
--- a/src/gui/components/cc_item_picture.cpp
+++ b/src/gui/components/cc_item_picture.cpp
@@ -222,7 +222,7 @@ void CComponentsPicture::initCCItem()
 	{
 		float h_ratio = float(height)*100/(float)dy;
 		width = int(h_ratio*(float)dx/100);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		if (do_scale && (width > 10 || height > 10))
 			width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
 #endif
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index f57e84352..ec9379fc9 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1789,7 +1789,7 @@ void CMoviePlayerGui::addAudioFormat(int count, std::string &apidtitle, bool& en
 		case 6: /*DTS*/
 			if (apidtitle.find("DTS") == std::string::npos)
 				apidtitle.append(" (DTS)");
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 			enabled = false;
 #endif
 			break;
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 3bb5e4894..eeca7c65c 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -90,7 +90,7 @@ extern int allow_flash;
 #define FILEBROWSER_UPDATE_FILTER      "img"
 
 #define MTD_OF_WHOLE_IMAGE             0
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #define MTD_DEVICE_OF_UPDATE_PART      "/dev/mtd0"
 #else
 #define MTD_DEVICE_OF_UPDATE_PART      "/dev/mtd3"
@@ -321,7 +321,7 @@ bool CFlashUpdate::selectHttpImage(void)
 	newVersion = versions[selected];
 	file_md5 = md5s[selected];
 	fileType = fileTypes[selected];
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if(fileType < '3') {
 		int esize = CMTDInfo::getInstance()->getMTDEraseSize(sysfs);
 		printf("[update] erase size is %x\n", esize);
@@ -556,7 +556,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
 #endif
 	if(fileType < '3') {
 		//flash it...
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 		if (g_settings.apply_settings) {
 			if (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_APPLY_SETTINGS), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) == CMsgBox::mbrYes)
 				if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE)) {
@@ -624,7 +624,7 @@ CFlashExpert::CFlashExpert()
 {
 	selectedMTD = -1;
 	width = 40;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	forceOtherFilename = false;
 	otherFilename = "";
 	createimage_other = 0;
@@ -641,7 +641,7 @@ CFlashExpert* CFlashExpert::getInstance()
 
 bool CFlashExpert::checkSize(int mtd, std::string &backupFile)
 {
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	if (mtd < 0) return false;
 #endif
 	char errMsg[1024] = {0};
@@ -655,7 +655,7 @@ bool CFlashExpert::checkSize(int mtd, std::string &backupFile)
 	uint64_t btotal = 0, bused = 0;
 	long bsize = 0;
 	uint64_t backupRequiredSize = 0;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (mtd == -1) { // check disk space for image creation
 		if (!get_fs_usage("/", btotal, bused, &bsize)) {
 			snprintf(errMsg, sizeof(errMsg)-1, g_Locale->getText(LOCALE_FLASHUPDATE_READ_VOLUME_ERROR), "root0");
@@ -691,7 +691,7 @@ bool CFlashExpert::checkSize(int mtd, std::string &backupFile)
 	return true;
 }
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 bool CFlashExpert::readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable)
 {
 	FILE *fd = fopen(devtableFile.c_str(), "r");
@@ -775,7 +775,7 @@ void CFlashExpert::readmtd(int preadmtd)
 	netGetHostname(hostName);
 	std::string timeStr  = getNowTimeStr("_%Y%m%d_%H%M");
 	std::string tankStr  = "";
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int eSize = CMTDInfo::getInstance()->getMTDEraseSize(CMTDInfo::getInstance()->findMTDsystem());
 	if (preadmtd == 0) {
 		if (createimage_other == 0) {
@@ -793,7 +793,7 @@ void CFlashExpert::readmtd(int preadmtd)
 	else
 		filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + tankStr + ".img";
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	std::string title  = " (" + CMTDInfo::getInstance()->getMTDName(preadmtd) + ")";
 	std::string mountp = getJFFS2MountPoint(preadmtd);
 	if (preadmtd == 0) {
@@ -817,7 +817,7 @@ void CFlashExpert::readmtd(int preadmtd)
 	}
 
 	bool skipCheck = false;
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	if ((std::string)g_settings.update_dir == "/tmp")
 		skipCheck = true;
 #else
@@ -845,7 +845,7 @@ void CFlashExpert::readmtd(int preadmtd)
 		sprintf(message, g_Locale->getText(LOCALE_FLASHUPDATE_SAVESUCCESS), filename.c_str());
 		sleep(1);
 		hide();
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		if (!forceOtherFilename)
 			ShowHint(LOCALE_MESSAGEBOX_INFO, message);
 #else
@@ -907,7 +907,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey)
 	for(int lx=0;lx<mtdInfo->getMTDCount();lx++) {
 		char sActionKey[20];
 		bool enabled = true;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		// disable write uboot / uldr / env
 		if ((actionkey == "writemtd") && (lx == mtdInfo->findMTDNumberFromName("u-boot") || 
 			                          lx == mtdInfo->findMTDNumberFromName("uldr") ||
@@ -930,7 +930,7 @@ int CFlashExpert::showMTDSelector(const std::string & actionkey)
 		sprintf(sActionKey, "%s%d", actionkey.c_str(), lx);
 		mtdselector->addItem(new CMenuForwarder(mtdInfo->getMTDName(lx).c_str(), enabled, NULL, this, sActionKey, CRCInput::convertDigitToKey(shortcut++)));
 	}
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	if (actionkey == "writemtd")
 		mtdselector->addItem(new CMenuForwarder("systemFS with settings", true, NULL, this, "writemtd10", CRCInput::convertDigitToKey(shortcut++)));
 #endif
@@ -1019,7 +1019,7 @@ int CFlashExpert::exec(CMenuTarget* parent, const std::string & actionKey)
 	return res;
 }
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 CFlashExpertSetup::CFlashExpertSetup()
 {
 	width = 40;
@@ -1187,4 +1187,4 @@ g_settings.flashupdate_createimage_add_spare = 0;
 	cfe->createimage_other = 0;
 	return res;
 }
-#endif // BOXMODEL_APOLLO
+#endif // BOXMODEL_CS_HD2
diff --git a/src/gui/update.h b/src/gui/update.h
index 94da38ea2..1a8107c61 100644
--- a/src/gui/update.h
+++ b/src/gui/update.h
@@ -38,7 +38,8 @@
 
 #include <gui/widget/progresswindow.h>
 
-#ifdef BOXMODEL_APOLLO
+#include <driver/framebuffer.h>
+#ifdef BOXMODEL_CS_HD2
 #include <system/mtdutils/mkfs.jffs2.h>
 #endif
 
@@ -80,13 +81,13 @@ class CFlashExpert : public CProgressWindow
 		int showFileSelector(const std::string & actionkey);
 
 		bool checkSize(int mtd, std::string &backupFile);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		bool readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable);
 		void readmtdJFFS2(std::string &filename, std::string title="", std::string path="/", bool makeDevTable=true);
 #endif
 
 	public:
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		bool forceOtherFilename;
 		std::string otherFilename;
 		int createimage_other;
@@ -99,7 +100,7 @@ class CFlashExpert : public CProgressWindow
 
 };
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 class CFlashExpertSetup : public CMenuTarget
 {
 	private:
@@ -114,6 +115,6 @@ class CFlashExpertSetup : public CMenuTarget
 
 		int exec(CMenuTarget* parent, const std::string &actionKey);
 };
-#endif // BOXMODEL_APOLLO
+#endif // BOXMODEL_CS_HD2
 
 #endif
diff --git a/src/gui/update_ext.cpp b/src/gui/update_ext.cpp
index f92df2c7d..0792a90f4 100644
--- a/src/gui/update_ext.cpp
+++ b/src/gui/update_ext.cpp
@@ -233,7 +233,7 @@ bool CExtUpdate::applySettings()
 	if (mtdFilename.empty())
 		return ErrorReset(0, "error system mtd not found");
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	uint64_t mtdSize = 65536*1024; // FIXME hack, mtd size more than free RAM
 #else
 	uint64_t mtdSize = mtdInfo->getMTDSize(mtdFilename);
diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp
index e0af074e7..598ecdc10 100644
--- a/src/gui/update_menue.cpp
+++ b/src/gui/update_menue.cpp
@@ -124,7 +124,7 @@ int CSoftwareUpdate::showSoftwareUpdate()
 #endif
 	}
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	softUpdate.addItem(GenericMenuSeparatorLine);
 
 	if (g_settings.easymenu)
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 9497add6a..1092b54f5 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -131,7 +131,7 @@ int CUpdateSettings::initMenu()
 	CMenuOptionChooser *name_backup = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE2, &g_settings.softupdate_name_mode_backup, SOFTUPDATE_NAME_MODE2_OPTIONS, SOFTUPDATE_NAME_MODE2_OPTION_COUNT, true);
 //	name_backup->setHint("", LOCALE_MENU_HINT_XXX);
 
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	CMenuOptionChooser *apply_settings = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_SETTINGS, &g_settings.apply_settings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
 //	apply_settings->setHint("", LOCALE_MENU_HINT_XXX);
 
@@ -152,7 +152,7 @@ int CUpdateSettings::initMenu()
 	w_upsettings.addItem(fw_update_dir);
 	w_upsettings.addItem(fw_url);
 	w_upsettings.addItem(name_backup);
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	w_upsettings.addItem(GenericMenuSeparatorLine);
 	w_upsettings.addItem(apply_settings);
 	w_upsettings.addItem(name_apply);
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 5bfeeabe4..6515f171e 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -105,7 +105,7 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] =
 {
 	{ DISPLAY_AR_MODE_PANSCAN, LOCALE_VIDEOMENU_PANSCAN },
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	{ DISPLAY_AR_MODE_PANSCAN2, LOCALE_VIDEOMENU_PANSCAN2 },
 #endif
 	{ DISPLAY_AR_MODE_LETTERBOX, LOCALE_VIDEOMENU_LETTERBOX },
@@ -197,7 +197,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
 	{ VIDEO_STD_576P,    NONEXISTANT_LOCALE, "576p"		},
 	{ VIDEO_STD_720P50,  NONEXISTANT_LOCALE, "720p 50Hz"	},
 	{ VIDEO_STD_1080I50, NONEXISTANT_LOCALE, "1080i 50Hz"	},
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	{ VIDEO_STD_1080P50, NONEXISTANT_LOCALE, "1080p 50Hz"	},
 #endif
 	{ VIDEO_STD_1080P24, NONEXISTANT_LOCALE, "1080p 24Hz"	},
@@ -206,7 +206,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
 	{ VIDEO_STD_480P,    NONEXISTANT_LOCALE, "480p"		},
 	{ VIDEO_STD_720P60,  NONEXISTANT_LOCALE, "720p 60Hz"	},
 	{ VIDEO_STD_1080I60, NONEXISTANT_LOCALE, "1080i 60Hz"	},
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	{ VIDEO_STD_1080P60,   NONEXISTANT_LOCALE, "1080p 60Hz"	},
 	{ VIDEO_STD_1080P2397, NONEXISTANT_LOCALE, "1080p 23.97Hz"},
 	{ VIDEO_STD_1080P2997, NONEXISTANT_LOCALE, "1080p 29.97Hz"},
@@ -249,7 +249,7 @@ int CVideoSettings::showVideoSetup()
 	}
 	else if (system_rev > 0x06)
 	{
-#if defined(BOXMODEL_APOLLO) && defined(ANALOG_MODE)
+#if defined(BOXMODEL_CS_HD2) && defined(ANALOG_MODE)
 		vs_analg_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_ANALOG_MODE, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_HD2_OPTIONS, VIDEOMENU_VIDEOSIGNAL_HD2_OPTION_COUNT, true, this);
 		vs_analg_ch->setHint("", LOCALE_MENU_HINT_VIDEO_ANALOG_MODE);
 #else
@@ -277,7 +277,7 @@ int CVideoSettings::showVideoSetup()
 	CMenuOptionChooser * vs_dbdropt_ch = NULL;
 	CMenuForwarder * vs_videomodes_fw = NULL;
 	CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	CMenuForwarder * vs_automodes_fw = NULL;
 	CMenuWidget automodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
 #endif
@@ -296,7 +296,7 @@ int CVideoSettings::showVideoSetup()
 		vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red);
 		vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		automodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES_AUTO);
 
 		for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT - 1; i++)
@@ -325,12 +325,12 @@ int CVideoSettings::showVideoSetup()
 	if (!g_settings.easymenu) {
 		videosetup->addItem(vs_dbdropt_ch);	  //dbdr options
 		videosetup->addItem(vs_videomodes_fw);	  //video modes submenue
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		videosetup->addItem(vs_automodes_fw);	  //video auto modes submenue
 #endif
 	}
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (!g_settings.easymenu) {
 		/* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */
 		CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this);
@@ -373,7 +373,7 @@ void CVideoSettings::setVideoSettings()
 	videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode1);
 	videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode2);
 #endif
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL);
 #else
 	unsigned int system_rev = cs_get_revision();
@@ -398,7 +398,7 @@ void CVideoSettings::setVideoSettings()
 	videoDecoder->SetDBDR(g_settings.video_dbdr);
 	CAutoModeNotifier anotify;
 	anotify.changeNotify(NONEXISTANT_LOCALE, 0);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	changeNotify(LOCALE_VIDEOMENU_BRIGHTNESS, NULL);
 	changeNotify(LOCALE_VIDEOMENU_CONTRAST, NULL);
 	changeNotify(LOCALE_VIDEOMENU_SATURATION, NULL);
@@ -472,7 +472,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
 		setupVideoSystem(true/*ask*/);
 		return true;
 	}
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
         else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_BRIGHTNESS))
 	{
 		videoDecoder->SetControl(VIDEO_CONTROL_BRIGHTNESS, g_settings.brightness);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e86cbb05f..6ad2c2c84 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -912,7 +912,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		erg = 2;
 	}
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	g_settings.brightness = configfile.getInt32("brightness", 0);
 	g_settings.contrast = configfile.getInt32("contrast", 0);
 	g_settings.saturation = configfile.getInt32("saturation", 0);
@@ -1436,7 +1436,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32("window_size", g_settings.window_size);
 	configfile.setInt32("window_width", g_settings.window_width);
 	configfile.setInt32("window_height", g_settings.window_height);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	configfile.setInt32("brightness", g_settings.brightness );
 	configfile.setInt32("contrast", g_settings.contrast );
 	configfile.setInt32("enable_sd_osd", g_settings.enable_sd_osd );
diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
index ce7537673..7b142a2ef 100644
--- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp
@@ -851,7 +851,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
 			if( boxname == "Armas ")
 				boxname += "TripleDragon";
 			break;
-#ifdef BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 		case 6:
 			boxname += "HD1";
 			break;
@@ -867,7 +867,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
 			boxname += "Zee";
 			break;
 #endif
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		case 9:
 			boxname += "Tank";
 			break;
@@ -906,7 +906,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
 
 	switch(system_rev)
 	{
-#ifdef BOXMODEL_NEVIS
+#ifdef BOXMODEL_CS_HD1
 		case 6:
 		case 7:
 		case 8:
@@ -914,7 +914,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
 			boxmodel = "Nevis";
 			break;
 #endif
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		case 9:
 			boxmodel = "Apollo";
 			break;
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index c0c5df8eb..4fdf2e4d7 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -1,4 +1,4 @@
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 SUBDIRS = mtdutils
 endif
 
diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp
index 2f1b576f6..aea8e5125 100644
--- a/src/system/flashtool.cpp
+++ b/src/system/flashtool.cpp
@@ -177,7 +177,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
 	std::string flashfile;
 
 	bool skipCopy = false;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (strcmp(dn, "/tmp") != 0) {
 		uint64_t btotal = 0, bused = 0;
 		long bsize = 0;
@@ -684,7 +684,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
 
 std::string CMTDInfo::findMTDsystem()
 {
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	std::string sysfs = "root0";
 #else
 	std::string sysfs = "systemFS";
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 08d3af362..e177a3a34 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -528,7 +528,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
 		CServiceManager::getInstance()->SatelliteList().clear();
 		CZapit::getInstance()->LoadSettings();
 		CZapit::getInstance()->GetConfig(zapitCfg);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		/* flag file to erase /var partition on factory reset,
 		   will be done by init scripts */
 		FILE * fp = fopen("/var_init/etc/.reset", "w");
@@ -566,7 +566,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
 void CFanControlNotifier::setSpeed(unsigned int speed)
 {
 	printf("FAN Speed %d\n", speed);
-#ifndef BOXMODEL_APOLLO
+#ifndef BOXMODEL_CS_HD2
 	int cfd = open("/dev/cs_control", O_RDONLY);
 	if(cfd < 0) {
 		perror("Cannot open /dev/cs_control");
@@ -607,7 +607,7 @@ bool CAutoModeNotifier::changeNotify(const neutrino_locale_t /*OptionName*/, voi
 	memset(modes, 0, sizeof(int)*VIDEO_STD_MAX+1);
 
 	for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_auto_modes[i];
 #else
 		modes[VIDEOMENU_VIDEOMODE_OPTIONS[i].key] = g_settings.enabled_video_modes[i];
diff --git a/src/system/settings.h b/src/system/settings.h
index f352cefc7..2c91416f6 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -42,7 +42,7 @@
 #include <string>
 #include <list>
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16
 #else
 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12
@@ -173,7 +173,7 @@ struct SNeutrinoSettings
 	int analog_mode1;
 	int analog_mode2;
 	int video_43mode;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int brightness;
 	int contrast;
 	int saturation;
diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 31fe1af3f..ce8dc7de1 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -281,7 +281,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 	if (channel_map.size() > 1)
 		list = CCam::CAPMT_ADD;
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int ci_use_count = 0;
 	for (it = channel_map.begin(); it != channel_map.end(); ++it)
 	{
@@ -338,7 +338,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 void CCamManager::SetCITuner(int tuner)
 {
 	tunerno = tuner;
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (tunerno >= 0)
 		cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)tunerno);
 #endif
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index dcad640e0..f0b5b5599 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -308,7 +308,7 @@ void CFrontend::getFEInfo(void)
 		switch (info.type) {
 		case FE_QPSK:
 			deliverySystemMask |= DVB_S;
-#ifndef BOXMODEL_NEVIS
+#ifndef BOXMODEL_CS_HD1
 			if (info.caps & FE_CAN_2G_MODULATION)
 #endif
 				deliverySystemMask |= DVB_S2;
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 3d7242db0..e8682ba1b 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -584,7 +584,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
 		StopPip();
 #endif
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	if (CCamManager::getInstance()->GetCITuner() < 0)
 		cCA::GetInstance()->SetTS((CA_DVBCI_TS_INPUT)live_fe->getNumber());
 #endif
@@ -2362,7 +2362,7 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 	/* FIXME until proper demux management */
 	int dnum = 1;
 #endif
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	videoDecoder = cVideo::GetDecoder(0);
 	audioDecoder = cAudio::GetDecoder(0);