diff --git a/configure.ac b/configure.ac
index edf9ed5eb..61136c2ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,9 +308,9 @@ AC_ARG_ENABLE(aitscan,
 	[enable_aitscan="yes"])
 
 if test "$enable_aitscan" = "yes"; then
-	AC_DEFINE(ENABLE_AIT, 1, [enable Application Information Table support])
+	AC_DEFINE(ENABLE_AITSCAN, 1, [enable Application Information Table support])
 fi
-AM_CONDITIONAL(ENABLE_AIT, test "$enable_aitscan" = "yes")
+AM_CONDITIONAL(ENABLE_AITSCAN, test "$enable_aitscan" = "yes")
 
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 0a8cc7bc8..d6d0861de 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -144,7 +144,7 @@ class CZapitChannel
 
 		unsigned short			pcrPid;
 		unsigned short			pmtPid;
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 		unsigned short			aitPid;
 #endif
 		unsigned short			teletextPid;
@@ -250,7 +250,7 @@ class CZapitChannel
 		unsigned char 		getAudioChannelCount(void)	{ return (unsigned char) audioChannels.size(); }
 		unsigned short		getPcrPid(void)			{ return pcrPid; }
 		unsigned short		getPmtPid(void)			{ return pmtPid; }
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 		unsigned short		getAitPid(void)			{ return aitPid; }
 #endif
 		unsigned short		getTeletextPid(void)		{ return teletextPid; }
@@ -276,7 +276,7 @@ class CZapitChannel
 		void setAudioChannel(unsigned char pAudioChannel)	{ if (pAudioChannel < audioChannels.size()) currentAudioChannel = pAudioChannel; }
 		void setPcrPid(unsigned short pPcrPid)			{ pcrPid = pPcrPid; }
 		void setPmtPid(unsigned short pPmtPid)			{ pmtPid = pPmtPid; }
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 		void setAitPid(unsigned short pAitPid)			{ aitPid = pAitPid; }
 #endif
 		void setTeletextPid(unsigned short pTeletextPid)	{ teletextPid = pTeletextPid; }
diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index 4af7d188f..90bf50755 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -19,7 +19,7 @@
 #include <zapit/bouquets.h>
 #include <zapit/femanager.h>
 #include <zapit/fastscan.h>
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 #include <zapit/scanait.h>
 #endif
 
@@ -174,7 +174,7 @@ class CZapit : public OpenThreads::Thread
 		t_channel_id  lastChannelTV;
 		int abort_zapit;
 		int pmt_update_fd;
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 		CAit *ait;
 #endif
 		//void LoadAudioMap();
diff --git a/src/zapit/src/Makefile.am b/src/zapit/src/Makefile.am
index e395d78df..7eeb9c18f 100644
--- a/src/zapit/src/Makefile.am
+++ b/src/zapit/src/Makefile.am
@@ -38,7 +38,7 @@ libzapit_a_SOURCES += \
 	fastscan.cpp
 endif
 
-if ENABLE_AIT
+if ENABLE_AITSCAN
 libzapit_a_SOURCES += \
 	scanait.cpp
 endif
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index 69b0c4960..332363bb0 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -115,7 +115,7 @@ void CZapitChannel::Init()
 	bUseCI = false;
 	altlogo = "";
 	epgmapper = "";
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	aitPid = 0;
 #endif
 }
diff --git a/src/zapit/src/scanpmt.cpp b/src/zapit/src/scanpmt.cpp
index c35ff6020..24d5e0b1b 100644
--- a/src/zapit/src/scanpmt.cpp
+++ b/src/zapit/src/scanpmt.cpp
@@ -38,7 +38,7 @@
 #include <dvbsi++/teletext_descriptor.h>
 #include <dvbsi++/subtitling_descriptor.h>
 #include <dvbsi++/vbi_teletext_descriptor.h>
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 #include <dvbsi++/application_information_section.h>
 #include <dvbsi++/application_name_descriptor.h>
 #include <dvbsi++/application_profile.h>
@@ -345,7 +345,7 @@ bool CPmt::ParseEsInfo(ElementaryStreamInfo *esinfo, CZapitChannel * const chann
 		audio_type = CZapitAudioChannel::EAC3;
 		audio = true;
 		break;
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	case STREAM_TYPE_PRIVATE_SECTION:
 		for (DescriptorConstIterator desc = esinfo->getDescriptors()->begin(); desc != esinfo->getDescriptors()->end(); ++desc)
 		{
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index b4a2d55f4..a65cdd740 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -150,14 +150,14 @@ CZapit::CZapit()
 		pip_fe[i] = NULL;
 	}
 #endif
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	ait = new CAit();
 #endif
 }
 
 CZapit::~CZapit()
 {
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	delete ait;
 #endif
 	Stop();
@@ -682,7 +682,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
 	if (update_pmt)
 		pmt_set_update_filter(current_channel, &pmt_update_fd);
 
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	ait->setDemux(current_channel->getRecordDemux());
 	ait->Parse(current_channel);
 #endif
@@ -2527,7 +2527,7 @@ bool CZapit::StopPlayBack(bool send_pmt, bool blank)
 	/* hack. if standby, dont blank video -> for paused timeshift */
 	videoDecoder->Stop(standby ? false : blank);
 
-#if ENABLE_AIT
+#if ENABLE_AITSCAN
 	ait->Stop();
 #endif
 #ifdef USE_VBI