diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index 5c94eaf0e9bf4ec3b0d16fa0073ad78a135cc0c5..f656400be8bd6009938bf97278c0aa7dfb1ec4eb 100644
--- a/MAC/APL/APLCommon/configure.in
+++ b/MAC/APL/APLCommon/configure.in
@@ -54,7 +54,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index 5687fcfaeb31d424f6705902993cedda26e4f5df..93096d27989fd971c0494570fcc5d1158672d2e6 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -63,7 +63,7 @@ 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/GCF/RTDB, GCFRTDB, , 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)
diff --git a/MAC/APL/CUDaemons/configure.in b/MAC/APL/CUDaemons/configure.in
index f68931c8998134c311d334d7fdf58cbd9375cf3a..cc8a5f0bfa470d817efbfff3e28e39727e0c5b8a 100644
--- a/MAC/APL/CUDaemons/configure.in
+++ b/MAC/APL/CUDaemons/configure.in
@@ -54,11 +54,11 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol macio",)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.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/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/CURTDBDaemons/configure.in b/MAC/APL/CURTDBDaemons/configure.in
index 8c63cfc81904acf9ae0556958692e4d79c34259f..ece59f785f075f08e25bfba646e4397f54ed8eed 100644
--- a/MAC/APL/CURTDBDaemons/configure.in
+++ b/MAC/APL/CURTDBDaemons/configure.in
@@ -55,12 +55,12 @@ 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(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"kvt_protocol log_protocol",)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/RTDB, rtdb, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/MainCU/configure.in b/MAC/APL/MainCU/configure.in
index b5c0b50933396f15b3cf939469e23dc0de70e842..1c06dea07b959b00221dc11f929c364bb4aa75a4 100644
--- a/MAC/APL/MainCU/configure.in
+++ b/MAC/APL/MainCU/configure.in
@@ -60,7 +60,7 @@ 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/GCF/RTDB, GCFRTDB, , 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)
diff --git a/MAC/APL/PAC/BS_Protocol/configure.in b/MAC/APL/PAC/BS_Protocol/configure.in
index 79f6a0ee9dfd4f3fec35ce702ed2dc18dcfaebff..dbc5254b8e0953b2fe5d481825695bc10ff63132 100644
--- a/MAC/APL/PAC/BS_Protocol/configure.in
+++ b/MAC/APL/PAC/BS_Protocol/configure.in
@@ -53,7 +53,7 @@ dnl
 lofar_GENERAL
 dnl lofar_BLITZ
 dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
diff --git a/MAC/APL/PAC/BeamServer/configure.in b/MAC/APL/PAC/BeamServer/configure.in
index ab5c4862209453b9977865d417b691232321e6fe..0842f66f8dc1f2dab1c1711ce6a01b7c0b972d71 100644
--- a/MAC/APL/PAC/BeamServer/configure.in
+++ b/MAC/APL/PAC/BeamServer/configure.in
@@ -61,9 +61,9 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 dnl lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/suite.h,,)
-lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, rsp_protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
 lofar_INTERNAL(MAC/APL/PAC/CAL_Protocol, CAL_Protocol, , 1, APL/CAL_Protocol/CAL_Protocol.ph,,)
 lofar_INTERNAL(MAC/APL/PAC/BS_Protocol, BS_Protocol, , 1, APL/BS_Protocol/BS_Protocol.ph,,)
 lofar_INTERNAL(LCS/AMC/AMCBase,AMCBase, , 1, AMCBase/Converter.h,,)
diff --git a/MAC/APL/PAC/CAL_Protocol/configure.in b/MAC/APL/PAC/CAL_Protocol/configure.in
index 238bc4f81b5e11049499d15fb2b3fbdee6d69483..26b61e7f1356ec90437515d81d5f4387894546db 100644
--- a/MAC/APL/PAC/CAL_Protocol/configure.in
+++ b/MAC/APL/PAC/CAL_Protocol/configure.in
@@ -51,7 +51,7 @@ dnl
 dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,"",)
 lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
 lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RCUSettings.h,,)
diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/CalServer/configure.in
index fcab0ca7d437687dc91e01efea7b3e933b213c49..818d68295e9f36f4813d25ed0a206a70be3b2846 100644
--- a/MAC/APL/PAC/CalServer/configure.in
+++ b/MAC/APL/PAC/CalServer/configure.in
@@ -55,8 +55,8 @@ lofar_COMPILETOOLS
 
 lofar_INTERNAL(LCS/AMC/AMCBase, AMCBase, , 1, AMCBase/Converter.h,,)
 lofar_INTERNAL(LCS/Blob, Blob, , 1, Blob/BlobField.h,,)
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/suite.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, Suite, , 1, Suite/suite.h,,)
 lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index 84f4416dbb674ab65fb5e64112dccacea524e7fc..66c8b79c91c2bf71da22d22c11bb3b8c86a20437 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -38,15 +38,13 @@ 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(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
-dnl lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
-dnl lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, , 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, , 1, APL/RTCCommon/Timestamp.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Timestamp.h,,)
 lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, rsp_protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, APLCommon, , 1, APL/APLCommon/APL_Defines.h,,)
 lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
 
 dnl
diff --git a/MAC/APL/PIC/RSPDriver/configure.in b/MAC/APL/PIC/RSPDriver/configure.in
index d59bfd9d94bd19597c42bbd3d7c1984e80710b69..4da63172c7156898192ee41017c2e24ca79b8b39 100644
--- a/MAC/APL/PIC/RSPDriver/configure.in
+++ b/MAC/APL/PIC/RSPDriver/configure.in
@@ -87,8 +87,8 @@ AC_HEADER_TIME
 dnl wanted by: src/CaptureStats.cc:874
 AC_STRUCT_TM
 
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/test.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/Test/Suite, Suite, , 1, Suite/test.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
 lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
diff --git a/MAC/APL/PIC/TBBDriver/configure.in b/MAC/APL/PIC/TBBDriver/configure.in
index 77beda52faf43d96052578b73447dc1ca0a28442..c99a33fd10d8b0d1f6ea52a85b72156f302cd963 100644
--- a/MAC/APL/PIC/TBBDriver/configure.in
+++ b/MAC/APL/PIC/TBBDriver/configure.in
@@ -54,11 +54,11 @@ lofar_GENERAL
 dnl lofar_BLITZ
 dnl lofar_MPI
 lofar_INTERNAL(LCS/Common,Common,,1,Common/LofarTypedefs.h,,)
-lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/test.h,,)
+lofar_INTERNAL(MAC/Test/Suite, Suite, , 1, Suite/test.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
 lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
 lofar_INTERNAL(MAC/APL/PIC/TBB_Protocol,TBB_Protocol,,1,APL/TBB_Protocol/TBB_Protocol.ph,,)
-lofar_INTERNAL(LCS/ACC/APS,aps,,1,APS/ParameterSet.h)
+lofar_INTERNAL(LCS/ACC/APS,APS,,1,APS/ParameterSet.h)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/RTCCommon/configure.in b/MAC/APL/RTCCommon/configure.in
index e6e023fb1fddeffe954265cd1bbc2f9cc776ae55..cacd398497ef4c0d5ff29fa974a67f6c5db10d11 100644
--- a/MAC/APL/RTCCommon/configure.in
+++ b/MAC/APL/RTCCommon/configure.in
@@ -51,7 +51,7 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
 
 dnl
diff --git a/MAC/APL/RTDBCommon/configure.in b/MAC/APL/RTDBCommon/configure.in
index a305120ceea999623dd280a37ac8aeeaa5f9728d..5eb72eb93dfafdeef6eb38ea3c832cc922e63bca 100644
--- a/MAC/APL/RTDBCommon/configure.in
+++ b/MAC/APL/RTDBCommon/configure.in
@@ -55,11 +55,11 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, APS, , 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.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/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
+lofar_INTERNAL(MAC/GCF/RTDB, GCFRTDB, , 1, GCF/RTDB/RTDB_PropertySet.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/StationCU/configure.in b/MAC/APL/StationCU/configure.in
index e45d00582373fab78589a6cb05bdd000198a2c80..c7780b9a4c8686f2fbd6b98b7903e36e0caa5aa3 100644
--- a/MAC/APL/StationCU/configure.in
+++ b/MAC/APL/StationCU/configure.in
@@ -63,7 +63,7 @@ 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/GCF/RTDB, GCFRTDB,, 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,,)
diff --git a/MAC/GCF/PVSS/configure.in b/MAC/GCF/PVSS/configure.in
index 0d9ba8b7ebdb0ea33c987f7f97f67add19911dbb..8b76ee7b25a4a7b22f6f0474d7620a86889fde27 100644
--- a/MAC/GCF/PVSS/configure.in
+++ b/MAC/GCF/PVSS/configure.in
@@ -37,8 +37,8 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_PVSS(1)
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/GCF/RTDB/configure.in b/MAC/GCF/RTDB/configure.in
index 06b350cc375ddb49966ce168ea6e5f51b9a21c44..182e665503f3ad4b41ceff4ad22d59b7f8b8f2de 100644
--- a/MAC/GCF/RTDB/configure.in
+++ b/MAC/GCF/RTDB/configure.in
@@ -39,8 +39,8 @@ lofar_GENERAL
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.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/TM, GCFTM, , 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PVSS, GCFPVSS, , 1, GCF/PVSS/PVSSservice.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/MACIO/configure.in b/MAC/MACIO/configure.in
index a015beb14818e1462f30a67e6edb7c7f62659c16..f86bde9fce87dbc0f5990742c74b62b70efa1d89 100644
--- a/MAC/MACIO/configure.in
+++ b/MAC/MACIO/configure.in
@@ -55,7 +55,6 @@ dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
 lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
-dnl lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, , 1, APL/RTCCommon/Marshalling.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/Test/Suite/configure.in b/MAC/Test/Suite/configure.in
index 7ccd54ea65e9f33f30da477bacdc9c026f4fc5d6..9c5835cf1ace7a3fd2cbf2202e8f675312d28708 100644
--- a/MAC/Test/Suite/configure.in
+++ b/MAC/Test/Suite/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_COMPILETOOLS
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
 
 dnl
 dnl Output Makefiles