diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
index 8f315690ecffc3f7c3add8be9a063cbc7fc27512..85127eff7ef30b28c4cb586f9d803e5b376013f1 100644
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
@@ -26,7 +26,7 @@
 
 #include <APL/RTCCommon/PSAccess.h>
 #include <APL/RTCCommon/daemonize.h>
-#include <GCF/ParameterSet.h>
+#include <APS/ParameterSet.h>
 
 #include <APL/RSP_Protocol/RSP_Protocol.ph>
 #include <APL/RSP_Protocol/EPA_Protocol.ph>
@@ -2174,8 +2174,8 @@ int main(int argc, char** argv)
   LOG_DEBUG ("Reading configuration files");
   try
   {
-    GCF::ParameterSet::instance()->adoptFile("RSPDriverPorts.conf");
-    GCF::ParameterSet::instance()->adoptFile("RemoteStation.conf");
+    globalParameterSet()->adoptFile("RSPDriverPorts.conf");
+    globalParameterSet()->adoptFile("RemoteStation.conf");
   }
   catch (Exception e)
   {
diff --git a/MAC/APL/PIC/RSPDriver/src/SetWG.cc b/MAC/APL/PIC/RSPDriver/src/SetWG.cc
index d264a3c5e0065ad49d4a92d06af851b457502256..e6515e6486dcc4eae0251b5ba29548954cf4d663 100644
--- a/MAC/APL/PIC/RSPDriver/src/SetWG.cc
+++ b/MAC/APL/PIC/RSPDriver/src/SetWG.cc
@@ -27,7 +27,7 @@
 #include <APL/RSP_Protocol/RSP_Protocol.ph>
 #include <APL/RSP_Protocol/EPA_Protocol.ph>
 #include <APL/RTCCommon/PSAccess.h>
-#include <GCF/ParameterSet.h>
+#include <APS/ParameterSet.h>
 
 #include <Suite/suite.h>
 #include <iostream>
@@ -276,8 +276,8 @@ int main(int argc, char** argv)
   //
   try
   {
-    GCF::ParameterSet::instance()->adoptFile("RSPDriverPorts.conf");
-    GCF::ParameterSet::instance()->adoptFile("RemoteStation.conf");
+    ACC::APS::globalParameterSet()->adoptFile("RSPDriverPorts.conf");
+    ACC::APS::globalParameterSet()->adoptFile("RemoteStation.conf");
   }
   catch (Exception e)
   {
diff --git a/MAC/APL/PIC/RSPDriver/src/Tuner.cc b/MAC/APL/PIC/RSPDriver/src/Tuner.cc
index 44bde9d9a3a2d2cedb40e2ce4907043d3053b1c0..1c385e63e61479908f4279766d5d0c6b4258d20b 100644
--- a/MAC/APL/PIC/RSPDriver/src/Tuner.cc
+++ b/MAC/APL/PIC/RSPDriver/src/Tuner.cc
@@ -28,6 +28,7 @@
 #include <APL/RSP_Protocol/EPA_Protocol.ph>
 
 #include <APL/RTCCommon/PSAccess.h>
+#include <APS/ParameterSet.h>
 
 #include <Suite/suite.h>
 #include <iostream>
@@ -503,7 +504,7 @@ int main(int argc, char** argv)
 
   try
     {
-      GCF::ParameterSet::instance()->adoptFile("RemoteStation.conf");
+      ACC::APS::globalParameterSet()->adoptFile("RemoteStation.conf");
     }
   catch (Exception e)
     {
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.cc b/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
index e3e8270faa23827c93e064bf046042866fec7037..14e7e2ce2fa2d43020555640732d2cad1cf7c04b 100644
--- a/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
+++ b/MAC/APL/PIC/RSPDriver/test/EPAStub.cc
@@ -32,7 +32,7 @@
 #include <APL/RSP_Protocol/BeamletWeights.h>
 
 #include <APL/RTCCommon/PSAccess.h>
-#include <GCF/ParameterSet.h>
+#include <APS/ParameterSet.h>
 
 #include <iostream>
 #include <sys/time.h>
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
index 0a7eecf25041c38f6cfbb199274a313fa2cb4d9a..387fbc2c1ff3a633b56fdae1fd5bc56b966c3285 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
@@ -25,13 +25,15 @@
 #ifndef PSACCESS_H_
 #define PSACCESS_H_
 
-#include <GCF/ParameterSet.h>
+#include <APS/ParameterSet.h>
+using LOFAR::ACC::APS::ParameterSet;
+using LOFAR::ACC::APS::globalParameterSet;
 
-#define __psaccess__convert_i getInt
+#define __psaccess__convert_i getInt32
 #define __psaccess__convert_f getFloat
 #define __psaccess__convert_d getDouble
-#define GET_CONFIG(var, type)  (GCF::ParameterSet::instance()->__psaccess__convert_##type(var))
-#define GET_CONFIG_STRING(var) (GCF::ParameterSet::instance()->getString(var).c_str())
-#define GET_CONFIG_PATH()      (GCF::ParameterSet::instance()->getSearchPath())
+#define GET_CONFIG(var, type)  (globalParameterSet()->__psaccess__convert_##type(var))
+#define GET_CONFIG_STRING(var) (globalParameterSet()->getString(var).c_str())
+#define GET_CONFIG_PATH()      (globalParameterSet()->getSearchPath())
 
 #endif /* PSACCESS_H_ */