diff --git a/.gitattributes b/.gitattributes
index c3ebf79a1d5d385fc765f6e02bce7006cfafa76a..4bd57609e3d2df39c2c7a9556e5f35008be3d880 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -306,13 +306,13 @@ MAC/APL/PAC/LBA_Calibration/test/calresult.dat -text
 MAC/APL/PAC/LBA_Calibration/test/flags.dat -text
 MAC/APL/PAC/LBA_Calibration/test/frequencies.dat -text
 MAC/APL/PAC/LBA_Calibration/test/srcpos.dat -text
-MAC/APL/PAC/SHMInfoServer/bootstrap -text svneol=native#application/octet-stream
-MAC/APL/PAC/SHMInfoServer/src/SHM_Protocol.prot -text
-MAC/APL/PAC/SHMInfoServer/test/MACall.tse.prot -text svneol=native#application/octet-stream
-MAC/APL/PAC/SHMInfoServer/test/mis.btsw -text svneol=native#application/octet-stream
-MAC/APL/PAC/SHMInfoServer/test/mis.io -text svneol=native#application/octet-stream
-MAC/APL/PAC/SHMInfoServer/test/mis.pol -text svneol=native#application/octet-stream
-MAC/APL/PAC/SHMInfoServer/test/test.sh -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/bootstrap -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/src/SHM_Protocol.prot -text
+MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/test/mis.btsw -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/test/mis.io -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/test/mis.pol -text svneol=native#application/octet-stream
+MAC/APL/PAC/SHMInfo_Server/test/test.sh -text svneol=native#application/octet-stream
 MAC/APL/PIC/RSP_Driver/src/RSPCommands.xls -text
 MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_1 -text
 MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_2 -text
diff --git a/.gitignore b/.gitignore
index 220016a0e31b51795626a78eb31df1d8e029cca9..7e6ff677938dd4deb9d73cb01b33fc996b475f17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,9 +124,9 @@ MAC/APL/PAC/Cal_Server/Makefile.common
 MAC/APL/PAC/Cal_Server/autoconf_share
 MAC/APL/PAC/Cal_Server/lofarconf
 MAC/APL/PAC/Makefile.common
-MAC/APL/PAC/SHMInfoServer/Makefile.common
-MAC/APL/PAC/SHMInfoServer/autoconf_share
-MAC/APL/PAC/SHMInfoServer/lofarconf
+MAC/APL/PAC/SHMInfo_Server/Makefile.common
+MAC/APL/PAC/SHMInfo_Server/autoconf_share
+MAC/APL/PAC/SHMInfo_Server/lofarconf
 MAC/APL/PAC/autoconf_share
 MAC/APL/PAC/lofarconf
 MAC/APL/PIC/ETHTest/Makefile.common
diff --git a/MAC/APL/PAC/SHMInfoServer/CMakeLists.txt b/MAC/APL/PAC/SHMInfo_Server/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/CMakeLists.txt
rename to MAC/APL/PAC/SHMInfo_Server/CMakeLists.txt
diff --git a/MAC/APL/PAC/SHMInfoServer/MIS.spec.in b/MAC/APL/PAC/SHMInfo_Server/MIS.spec.in
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/MIS.spec.in
rename to MAC/APL/PAC/SHMInfo_Server/MIS.spec.in
diff --git a/MAC/APL/PAC/SHMInfoServer/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/Makefile.am
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/Makefile.am
rename to MAC/APL/PAC/SHMInfo_Server/Makefile.am
diff --git a/MAC/APL/PAC/SHMInfoServer/SHMInfoServer.spec.in b/MAC/APL/PAC/SHMInfo_Server/SHMInfoServer.spec.in
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/SHMInfoServer.spec.in
rename to MAC/APL/PAC/SHMInfo_Server/SHMInfoServer.spec.in
diff --git a/MAC/APL/PAC/SHMInfoServer/bootstrap b/MAC/APL/PAC/SHMInfo_Server/bootstrap
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/bootstrap
rename to MAC/APL/PAC/SHMInfo_Server/bootstrap
diff --git a/MAC/APL/PAC/SHMInfoServer/configure.in b/MAC/APL/PAC/SHMInfo_Server/configure.in
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/configure.in
rename to MAC/APL/PAC/SHMInfo_Server/configure.in
diff --git a/MAC/APL/PAC/SHMInfoServer/src/CMakeLists.txt b/MAC/APL/PAC/SHMInfo_Server/src/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/CMakeLists.txt
rename to MAC/APL/PAC/SHMInfo_Server/src/CMakeLists.txt
diff --git a/MAC/APL/PAC/SHMInfoServer/src/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/src/Makefile.am
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/Makefile.am
rename to MAC/APL/PAC/SHMInfo_Server/src/Makefile.am
diff --git a/MAC/APL/PAC/SHMInfoServer/src/PropertyProxy.cc b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/PropertyProxy.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/PropertyProxy.h b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/PropertyProxy.h
rename to MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/RspStatus.cc b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/RspStatus.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/RspStatus.h b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/RspStatus.h
rename to MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMDefines.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMDefines.h
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMInfoServer.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMInfoServer.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMInfoServer.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMInfoServer.h
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMInfoServerMain.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMInfoServerMain.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMPolicyHandler.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMPolicyHandler.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMPolicyHandler.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMPolicyHandler.h
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMSession.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMSession.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMSession.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMSession.h
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMSubscription.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMSubscription.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHMSubscription.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHMSubscription.h
rename to MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
diff --git a/MAC/APL/PAC/SHMInfoServer/src/SHM_Protocol.prot b/MAC/APL/PAC/SHMInfo_Server/src/SHM_Protocol.prot
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/SHM_Protocol.prot
rename to MAC/APL/PAC/SHMInfo_Server/src/SHM_Protocol.prot
diff --git a/MAC/APL/PAC/SHMInfoServer/src/XCStatistics.cc b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/XCStatistics.cc
rename to MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
diff --git a/MAC/APL/PAC/SHMInfoServer/src/XCStatistics.h b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/src/XCStatistics.h
rename to MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
diff --git a/MAC/APL/PAC/SHMInfoServer/test/CMakeLists.txt b/MAC/APL/PAC/SHMInfo_Server/test/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/CMakeLists.txt
rename to MAC/APL/PAC/SHMInfo_Server/test/CMakeLists.txt
diff --git a/MAC/APL/PAC/SHMInfoServer/test/MACall.tse.prot b/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/MACall.tse.prot
rename to MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
diff --git a/MAC/APL/PAC/SHMInfoServer/test/Makefile.am b/MAC/APL/PAC/SHMInfo_Server/test/Makefile.am
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/Makefile.am
rename to MAC/APL/PAC/SHMInfo_Server/test/Makefile.am
diff --git a/MAC/APL/PAC/SHMInfoServer/test/mis.btsw b/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/mis.btsw
rename to MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
diff --git a/MAC/APL/PAC/SHMInfoServer/test/mis.io b/MAC/APL/PAC/SHMInfo_Server/test/mis.io
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/mis.io
rename to MAC/APL/PAC/SHMInfo_Server/test/mis.io
diff --git a/MAC/APL/PAC/SHMInfoServer/test/mis.pol b/MAC/APL/PAC/SHMInfo_Server/test/mis.pol
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/mis.pol
rename to MAC/APL/PAC/SHMInfo_Server/test/mis.pol
diff --git a/MAC/APL/PAC/SHMInfoServer/test/test.sh b/MAC/APL/PAC/SHMInfo_Server/test/test.sh
similarity index 100%
rename from MAC/APL/PAC/SHMInfoServer/test/test.sh
rename to MAC/APL/PAC/SHMInfo_Server/test/test.sh
diff --git a/MAC/APL/PAC/lofarconf.in b/MAC/APL/PAC/lofarconf.in
index 4264521ba9b02628bfd499d3d4e83deeaf6b5d0a..1c8770f655be555cb2cc3654f73e3fb296267caa 100644
--- a/MAC/APL/PAC/lofarconf.in
+++ b/MAC/APL/PAC/lofarconf.in
@@ -2,4 +2,4 @@ CAL_Protocol
 BS_Protocol
 Cal_Server
 Beam_Server
-SHMInfoServer
+SHMInfo_Server