diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index d1c870ba85f2bfca9ef5d13c25fc1f4ef658a0cc..5687fcfaeb31d424f6705902993cedda26e4f5df 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -55,16 +55,16 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common,, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps,, 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(ApplCommon, applcommon,, 1, ApplCommon/Observation.h,,)
-lofar_INTERNAL(LCS/ACC/ALC, alc,, 1, ALC/ApplControl.h,,)
-lofar_INTERNAL(LCS/ACC/PLC, plc,, 1, PLC/PCCmd.h,,)
-dnl lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
+lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
+lofar_INTERNAL(LCS/ACC/ALC, ALC,, 1, ALC/ApplControl.h,,)
+lofar_INTERNAL(LCS/ACC/PLC, PLC,, 1, PLC/PCCmd.h,,)
+dnl lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, rtdb, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/RTDB, RTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
 lofar_EXTERNAL(boost,1.32,boost/date_time/date.hpp, boost_date_time-gcc)
 dnl lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
 dnl lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
diff --git a/MAC/APL/MainCU/configure.in b/MAC/APL/MainCU/configure.in
index ca92553493d6c15948730733776c5bc99d58da75..b5c0b50933396f15b3cf939469e23dc0de70e842 100644
--- a/MAC/APL/MainCU/configure.in
+++ b/MAC/APL/MainCU/configure.in
@@ -55,14 +55,14 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(SAS/OTDB, otdb, , 1, OTDB/OTDBconnection.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(SAS/OTDB, OTDB, , 1, OTDB/OTDBconnection.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, rtdb, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(Appl/ApplCommon, applcommon, , 1, ApplCommon/Observation.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/RTDB, RTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(Appl/ApplCommon, ApplCommon, , 1, ApplCommon/Observation.h,,)
 lofar_EXTERNAL(boost,1,boost/date_time/date.hpp, boost_date_time)
 lofar_EXTERNAL(pqxx,2.5.5,pqxx/pqxx, pqxx)
 lofar_EXTERNAL(pq,,libpq-fe.h, pq, /usr/local/pgsql)
diff --git a/MAC/APL/StationCU/configure.in b/MAC/APL/StationCU/configure.in
index 211578d0b5328d7c4da826ef8e4b6809d4c62439..e45d00582373fab78589a6cb05bdd000198a2c80 100644
--- a/MAC/APL/StationCU/configure.in
+++ b/MAC/APL/StationCU/configure.in
@@ -56,16 +56,16 @@ lofar_GENERAL
 lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_BLITZ
-lofar_INTERNAL(LCS/Common, common,, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps,, 1, APS/ParameterSet.h,,)
-lofar_INTERNAL(ApplCommon, applcommon,, 1, ApplCommon/Observation.h,,)
-dnl lofar_INTERNAL(SAS/OTDB, otdb,, 1, OTDB/OTDBconnection.h,,)
+lofar_INTERNAL(LCS/Common, Common,, 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS,, 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(Appl/ApplCommon, ApplCommon,, 1, ApplCommon/Observation.h,,)
+dnl lofar_INTERNAL(SAS/OTDB, OTDB,, 1, OTDB/OTDBconnection.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm,, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PVSS, gcfpvss,, 1, GCF/PVSS/PVSSservice.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, rtdb,, 1, GCF/RTDB/RTDB_PropertySet.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon,, 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTDBCommon, rtdbcommon,, 1, APL/RTDBCommon/RTDButilities.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM,, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS,, 1, GCF/PVSS/PVSSservice.h,,)
+lofar_INTERNAL(MAC/GCF/RTDB, RTDB,, 1, GCF/RTDB/RTDB_PropertySet.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon,, 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/RTDBCommon, RTDBCommon,, 1, APL/RTDBCommon/RTDButilities.h,,)
 lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol,, 1, APL/BS_Protocol/BS_Protocol.ph,,)
 lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol,, 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
 lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol,, 1, APL/RSP_Protocol/RSP_Protocol.ph,,)