diff --git a/configure.ac b/configure.ac
index 1c6f1d8df..65470d086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,16 +114,16 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
-AC_ARG_WITH(neutrino-hal-includes,
-	[  --with-neutrinohal-includes=PATH  path for libneutrino-hal includes [[NONE]]],
-	[NEUTRINO_HAL_INC="$withval"],[NEUTRINO_HAL_INC=""])
-AC_ARG_WITH(neutrino-hal-build,
-	[  --with-neutrinohal-build=PATH   path where libneutrino-hal is built [[NONE]]],
-	[NEUTRINO_HAL_LIB="$withval"],[NEUTRINO_HAL_LIB=""])
+AC_ARG_WITH(stb-hal-includes,
+	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
+	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
+AC_ARG_WITH(stb-hal-build,
+	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
+	[STB_HAL_LIB="$withval"],[STB_HAL_LIB=""])
 
-AM_CONDITIONAL(USE_NEUTRINO_HAL, test "$NEUTRINO_HAL_INC")
-if test "$NEUTRINO_HAL_INC"; then
-	AC_DEFINE(USE_NEUTRINO_HAL, 1,[use libneutrino-hal])
+AM_CONDITIONAL(USE_STB_HAL, test "$STB_HAL_INC")
+if test "$STB_HAL_INC"; then
+	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
 fi
 
 
@@ -150,8 +150,8 @@ AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(VORBISIDEC_CFLAGS)
 AC_SUBST(VORBISIDEC_LIBS)
-AC_SUBST(NEUTRINO_HAL_INC)
-AC_SUBST(NEUTRINO_HAL_LIB)
+AC_SUBST(STB_HAL_INC)
+AC_SUBST(STB_HAL_LIB)
 
 AC_OUTPUT([
 Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 224acc92c..0b444f7bb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,7 +15,7 @@ SUBDIRS += \
 	libupnpclient
 endif
 
-if USE_NEUTRINO_HAL
+if USE_STB_HAL
 else
 if BOXTYPE_TRIPLE
 SUBDIRS += \
diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index a5f0296f8..e70a168f8 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index f4ef5f23b..cf638cb75 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -6,8 +6,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/Makefile.am b/src/Makefile.am
index de3ce9573..23a3557a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
@@ -112,9 +112,9 @@ bin_PROGRAMS += drivertool
 
 drivertool_SOURCES = drivertool.c
 endif
-if USE_NEUTRINO_HAL
+if USE_STB_HAL
 neutrino_LDADD += \
-	$(NEUTRINO_HAL_LIB)/libneutrino-hal.a
+	$(STB_HAL_LIB)/libstb-hal.a
 else
 if BOXTYPE_TRIPLE
 neutrino_LDADD += \
diff --git a/src/daemonc/Makefile.am b/src/daemonc/Makefile.am
index 8b9ae1898..7274ed345 100644
--- a/src/daemonc/Makefile.am
+++ b/src/daemonc/Makefile.am
@@ -14,8 +14,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index bda086977..b317a0029 100644
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -49,9 +49,9 @@ libneutrino_driver_a_SOURCES += \
 	lcdd.cpp
 endif
 
-if USE_NEUTRINO_HAL
+if USE_STB_HAL
 INCLUDES += \
-	-I$(NEUTRINO_HAL_INC) \
+	-I$(STB_HAL_INC) \
 	@DIRECTFB_CFLAGS@
 else
 if BOXTYPE_TRIPLE
diff --git a/src/driver/audiodec/Makefile.am b/src/driver/audiodec/Makefile.am
index 786071bf2..b3b5c2de9 100644
--- a/src/driver/audiodec/Makefile.am
+++ b/src/driver/audiodec/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/driver/pictureviewer/Makefile.am b/src/driver/pictureviewer/Makefile.am
index 9ba447e1d..5baec7e08 100644
--- a/src/driver/pictureviewer/Makefile.am
+++ b/src/driver/pictureviewer/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 5607a5eb3..5e26a8861 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -31,8 +31,8 @@ if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
 
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index ee7cc15d9..1b332fcd1 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/nhttpd/tuxboxapi/coolstream/Makefile.am b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
index f2ff5bb56..5846fa55a 100644
--- a/src/nhttpd/tuxboxapi/coolstream/Makefile.am
+++ b/src/nhttpd/tuxboxapi/coolstream/Makefile.am
@@ -16,8 +16,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/sectionsd/Makefile.am b/src/sectionsd/Makefile.am
index d22f8b0b5..b08bc2f1e 100644
--- a/src/sectionsd/Makefile.am
+++ b/src/sectionsd/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 3d0241601..47549007b 100644
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -15,8 +15,8 @@ INCLUDES = \
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/zapit/include/dmx.h b/src/zapit/include/dmx.h
index 74959cb16..8901560c6 100644
--- a/src/zapit/include/dmx.h
+++ b/src/zapit/include/dmx.h
@@ -1,11 +1,11 @@
 #if HAVE_COOL_HARDWARE
 #include <dmx_cs.h>
-#elif USE_NEUTRINO_HAL
+#elif USE_STB_HAL
 #include <dmx_td.h>
 #elif HAVE_TRIPLEDRAGON
 #include <dmx_td.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor HAVE_TRIPLEDRAGON nor USE_NEUTRINO_HAL defined.
+#error neither HAVE_COOL_HARDWARE nor HAVE_TRIPLEDRAGON nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif
 
diff --git a/src/zapit/include/video.h b/src/zapit/include/video.h
index baa930d4d..fe2230bee 100644
--- a/src/zapit/include/video.h
+++ b/src/zapit/include/video.h
@@ -2,7 +2,7 @@
 #include <cs_api.h>
 #include <video_cs.h>
 #endif
-#if USE_NEUTRINO_HAL
+#if USE_STB_HAL
 #include <init_td.h>
 #include <video_td.h>
 #elif HAVE_TRIPLEDRAGON
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index 0fdc545fa..3eb15bf81 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -13,8 +13,8 @@ if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
 endif
 
-if USE_NEUTRINO_HAL
-INCLUDES += -I$(NEUTRINO_HAL_INC)
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
 else
 if BOXTYPE_TRIPLE
 INCLUDES += -I$(top_srcdir)/lib/libtriple
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index ead272982..823803a80 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -60,7 +60,7 @@
 #include <audio_cs.h>
 #include <video_cs.h>
 #endif
-#if USE_NEUTRINO_HAL || HAVE_TRIPLEDRAGON
+#if USE_STB_HAL || HAVE_TRIPLEDRAGON
 #include <video_td.h>
 #include <audio_td.h>
 #endif