diff --git a/data/scripts/Makefile.am b/data/scripts/Makefile.am
index 3bcb0c0bd..fef882834 100644
--- a/data/scripts/Makefile.am
+++ b/data/scripts/Makefile.am
@@ -6,7 +6,7 @@ install_DATA = \
 	wakeup.sh \
 	install.sh 
 
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 install_DATA += \
 	backup_flash.sh \
 	restore_flash.sh
@@ -17,7 +17,7 @@ install-data-hook:
 	chmod 0755 $(DESTDIR)$(bindir)/restore.sh
 	chmod 0755 $(DESTDIR)$(bindir)/wakeup.sh
 	chmod 0755 $(DESTDIR)$(bindir)/install.sh
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 	chmod 0755 $(DESTDIR)$(bindir)/backup_flash.sh
 	chmod 0755 $(DESTDIR)$(bindir)/restore_flash.sh
 endif
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index da946fe69..7f161dc6e 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -63,7 +63,7 @@
 #define EJECT_BIN    "/bin/eject"
 
 //NI
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 #define MDEV_MOUNT	"/lib/mdev/fs/mount"
 #else
 #define MDEV_MOUNT	"/etc/mdev/mdev-mount.sh"
diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp
index 09e5bbd33..3de35b294 100644
--- a/src/gui/imageinfo_ni.cpp
+++ b/src/gui/imageinfo_ni.cpp
@@ -415,7 +415,7 @@ int CImageInfoNI::get_MTD_Info()
 	if (!(fh=fopen("/proc/mtd", "r")))
 		return false;
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	std::string sysfs = get_systemRoot();
 #else
 	std::string sysfs = "systemFS";
@@ -574,7 +574,7 @@ void CImageInfoNI::get_DF_Info()
 	if (!(pipe_reader = popen ("df", "r")))
 		printf("[read_df] popen error\n" );
 
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	strcpy(mtd_info[systemfs].dev, ("mtd:"+get_systemRoot()).c_str());
 #endif
 
@@ -832,7 +832,7 @@ void CImageInfoNI::paint_NET_Info(int posx, int posy)
 	 * 13107200	Byte
 	 * 104857600	Bit
 	 */
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	int max_bit	= 104857600;	/* Shiner, Kronos */
 	if (cs_get_revision() == 9)
 		max_bit	= 1073741824;	/* Apollo */
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index 10a11945b..b1354e132 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -72,7 +72,7 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey) //NI
 	{
 		char str[1024];
 		sprintf(str, "cs_get_revision(): 0x%02X\n", cs_get_revision());
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		sprintf(str, "%scs_get_chip_type(): 0x%04X\n", str, cs_get_chip_type());
 #endif
 		ShowMsg(LOCALE_MESSAGEBOX_INFO, str, CMsgBox::mbrBack, CMsgBox::mbBack);
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index f2b6cfd1f..5fb7f3c55 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -668,7 +668,7 @@ int COsdSetup::showOsdSetup()
 	osd_menu->addItem(mc);
 
 //NI
-#if !defined BOXMODEL_APOLLO
+#if !defined BOXMODEL_CS_HD2
 	int scart_osd_fix_exist = 0;
 	if (file_exists("/var/etc/.scart_osd_fix"))
 		scart_osd_fix_exist = 1;
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index cc3ef8990..d14ccb665 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -139,7 +139,7 @@ void CFlashUpdate::update_php(std::string &url, const char* type)
 	if (url.find("update.php") != std::string::npos)
 	{
 		url += "?revision=" + to_string(cs_get_revision());
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		url += "&chip_type=" + to_string(cs_get_chip_type());
 #endif
 		url += "&image_type=" + (std::string)type;
@@ -447,7 +447,7 @@ printf("[update] mode is %d\n", softupdate_mode);
 		//NI
 		if (allow_flash) {
 			UpdatesFilter.addFilter(FILEBROWSER_UPDATE_FILTER);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 			if (CMTDInfo::getInstance()->getMTDEraseSize(sysfs) == 0x40000 /* Tank */)
 				UpdatesFilter.addFilter("256k");
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index f6534d3a8..70a2229b2 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -4465,7 +4465,7 @@ void stop_daemons(bool stopall, bool for_flash)
 		CVFD::getInstance()->ShowText("Stop daemons...");
 		g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
 //NI
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		system("/bin/backup_flash.sh"); //don't fork
 #endif
 		my_system(NEUTRINO_ENTER_FLASH_SCRIPT);
diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 15c9e26f9..ddb652aed 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -280,7 +280,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 		 * (see CMD_SB_LOCK / UNLOCK PLAYBACK */
 		//channel->setRawPmt(NULL);//FIXME
 		StopCam(channel_id, cam);
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 		CZapitChannel * chan = CServiceManager::getInstance()->GetCurrentChannel();
 
 		//NI - this is a hack for rezaping to the recording channe
@@ -294,7 +294,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 	}
 
 //NI
-#ifdef BOXMODEL_APOLLO
+#ifdef BOXMODEL_CS_HD2
 	// disable if option "usable CI channel while recording" set to "all channels"
 	if(mode && g_settings.ci_mode != 0 /*all channels*/) {
 		if(start) {