diff --git a/acinclude.m4 b/acinclude.m4
index 8ffd2bc5f..fadf904ac 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -521,7 +521,7 @@ AC_SUBST(BOXMODEL)
 
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
+AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")
 
diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am
index f93b9adca..e713cc377 100644
--- a/data/y-web/images/Makefile.am
+++ b/data/y-web/images/Makefile.am
@@ -82,7 +82,7 @@ install_DATA =	accept.png \
 		x_red.png \
 		zap.png
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 install_DATA += rc_cst_v1.jpg \
 		rc_cst_v2.png \
 		rc_cst_v3.png \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 63e00773d..c6cfc59d8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS += \
 	libupnpclient
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 SUBDIRS += \
 	hardware/coolstream
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cd880858..300db1847 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,7 +152,7 @@ neutrino_LDADD += \
 	$(top_builddir)/lib/libupnpclient/libtuxbox-upnpclient.a
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 neutrino_LDADD += \
 	$(top_builddir)/lib/hardware/coolstream/libhwcaps.a
 if ENABLE_LIBCOOLSTREAM_STATIC
@@ -211,7 +211,7 @@ neutrino_LDADD += \
 	-L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 bin_PROGRAMS += shutdown_helper
 shutdown_helper_SOURCES = shutdown_helper.c
 # if BOXMODEL_CS_HD2
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index cd697e544..afb6323ca 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -56,7 +56,7 @@ libneutrino_driver_a_SOURCES += \
 	lcd4l.cpp
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 libneutrino_driver_a_SOURCES += \
 	fb_accel_cs_hdx.cpp
 if BOXMODEL_CST_HD2
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index dca9f1ccf..efede7ae6 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -125,7 +125,7 @@ libneutrino_gui_a_SOURCES += \
 	glcdthemes.cpp
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 libneutrino_gui_a_SOURCES += \
 	streaminfo1.cpp
 else