diff --git a/.gitattributes b/.gitattributes
index d4c44b100c8e35c49aece5f14bb93b84d7246f83..a50224b9efcf3f216e3006e404d122e0b94091f0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -308,20 +308,20 @@ 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/PIC/RSPDriver/src/RSPCommands.xls -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_1 -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_2 -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_3 -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_4 -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_5 -text
-MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_6 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_1 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_2 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_3 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_4 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_5 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_6 -text
-MAC/APL/PIC/RSPDriver/test/tRCUCables.in_CableAtts -text
+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
+MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_3 -text
+MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_4 -text
+MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_5 -text
+MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_6 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_1 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_2 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_3 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_4 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_5 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_6 -text
+MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_CableAtts -text
 MAC/APL/PIC/SHMInfoServer/Makefile.am -text svneol=native#application/octet-stream
 MAC/APL/PIC/SHMInfoServer/bootstrap -text svneol=native#application/octet-stream
 MAC/APL/PIC/SHMInfoServer/src/Makefile.am -text svneol=native#application/octet-stream
@@ -331,8 +331,8 @@ MAC/APL/PIC/SHMInfoServer/test/mis.btsw -text svneol=native#application/octet-st
 MAC/APL/PIC/SHMInfoServer/test/mis.io -text svneol=native#application/octet-stream
 MAC/APL/PIC/SHMInfoServer/test/mis.pol -text svneol=native#application/octet-stream
 MAC/APL/PIC/SHMInfoServer/test/test.sh -text svneol=native#application/octet-stream
-MAC/APL/PIC/TBBDriver/test/StubRawEvent.cc -text
-MAC/APL/PIC/TBBDriver/test/StubRawEvent.h -text
+MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc -text
+MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h -text
 MAC/APL/PIC/TBB_Protocol/include/Makefile.am -text
 MAC/APL/PIC/rsuctl/lofar.jpg -text svneol=unset#unset
 MAC/APL/PIC/rsuctl/ndump.tgz -text svneol=unset#unset
diff --git a/.gitignore b/.gitignore
index 7acd5cccee442d627d0a48ac3d3f3901ad6f6d54..c23565d4c8e8d38064724fceaa7b7f4c4b79983d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,18 +130,18 @@ MAC/APL/PIC/ETHTest/Makefile.common
 MAC/APL/PIC/ETHTest/autoconf_share
 MAC/APL/PIC/ETHTest/lofarconf
 MAC/APL/PIC/Makefile.common
-MAC/APL/PIC/RSPDriver/Makefile.common
-MAC/APL/PIC/RSPDriver/autoconf_share
-MAC/APL/PIC/RSPDriver/lofarconf
+MAC/APL/PIC/RSP_Driver/Makefile.common
+MAC/APL/PIC/RSP_Driver/autoconf_share
+MAC/APL/PIC/RSP_Driver/lofarconf
 MAC/APL/PIC/RSP_Protocol/Makefile.common
 MAC/APL/PIC/RSP_Protocol/autoconf_share
 MAC/APL/PIC/RSP_Protocol/lofarconf
 MAC/APL/PIC/SHMInfoServer/Makefile.common
 MAC/APL/PIC/SHMInfoServer/autoconf_share
 MAC/APL/PIC/SHMInfoServer/lofarconf
-MAC/APL/PIC/TBBDriver/Makefile.common
-MAC/APL/PIC/TBBDriver/autoconf_share
-MAC/APL/PIC/TBBDriver/lofarconf
+MAC/APL/PIC/TBB_Driver/Makefile.common
+MAC/APL/PIC/TBB_Driver/autoconf_share
+MAC/APL/PIC/TBB_Driver/lofarconf
 MAC/APL/PIC/TBB_Protocol/Makefile.common
 MAC/APL/PIC/TBB_Protocol/autoconf_share
 MAC/APL/PIC/TBB_Protocol/lofarconf
diff --git a/MAC/APL/PIC/RSPDriver/CMakeLists.txt b/MAC/APL/PIC/RSP_Driver/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/CMakeLists.txt
rename to MAC/APL/PIC/RSP_Driver/CMakeLists.txt
diff --git a/MAC/APL/PIC/RSPDriver/Makefile.am b/MAC/APL/PIC/RSP_Driver/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/Makefile.am
rename to MAC/APL/PIC/RSP_Driver/Makefile.am
diff --git a/MAC/APL/PIC/RSPDriver/RSPDriver.spec.in b/MAC/APL/PIC/RSP_Driver/RSPDriver.spec.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/RSPDriver.spec.in
rename to MAC/APL/PIC/RSP_Driver/RSPDriver.spec.in
diff --git a/MAC/APL/PIC/RSPDriver/bootstrap b/MAC/APL/PIC/RSP_Driver/bootstrap
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/bootstrap
rename to MAC/APL/PIC/RSP_Driver/bootstrap
diff --git a/MAC/APL/PIC/RSPDriver/configure.in b/MAC/APL/PIC/RSP_Driver/configure.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/configure.in
rename to MAC/APL/PIC/RSP_Driver/configure.in
diff --git a/MAC/APL/PIC/RSPDriver/src/BSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BSWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BSWrite.h b/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BSWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/BSWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/BWRead.cc b/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BWRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/BWRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BWRead.h b/MAC/APL/PIC/RSP_Driver/src/BWRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BWRead.h
rename to MAC/APL/PIC/RSP_Driver/src/BWRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/BWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BWWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BWWrite.h b/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BWWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/BWWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/BstRead.cc b/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BstRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/BstRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BstRead.h b/MAC/APL/PIC/RSP_Driver/src/BstRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BstRead.h
rename to MAC/APL/PIC/RSP_Driver/src/BstRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/BypassRead.cc b/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BypassRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BypassRead.h b/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BypassRead.h
rename to MAC/APL/PIC/RSP_Driver/src/BypassRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/BypassWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BypassWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/BypassWrite.h b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/BypassWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/CDOWrite.cc b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CDOWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/CDOWrite.h b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CDOWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/CMakeLists.txt b/MAC/APL/PIC/RSP_Driver/src/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CMakeLists.txt
rename to MAC/APL/PIC/RSP_Driver/src/CMakeLists.txt
diff --git a/MAC/APL/PIC/RSPDriver/src/CableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CableAttenuation.cc
rename to MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/CableAttenuation.h b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CableAttenuation.h
rename to MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
diff --git a/MAC/APL/PIC/RSPDriver/src/CableSettings.cc b/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CableSettings.cc
rename to MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/CableSettings.h b/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/CableSettings.h
rename to MAC/APL/PIC/RSP_Driver/src/CableSettings.h
diff --git a/MAC/APL/PIC/RSPDriver/src/Cache.cc b/MAC/APL/PIC/RSP_Driver/src/Cache.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Cache.cc
rename to MAC/APL/PIC/RSP_Driver/src/Cache.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/Cache.h b/MAC/APL/PIC/RSP_Driver/src/Cache.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Cache.h
rename to MAC/APL/PIC/RSP_Driver/src/Cache.h
diff --git a/MAC/APL/PIC/RSPDriver/src/Command.h b/MAC/APL/PIC/RSP_Driver/src/Command.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Command.h
rename to MAC/APL/PIC/RSP_Driver/src/Command.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetBypassCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetBypassCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetClocksCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetClocksCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetHBACmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetHBACmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRCUCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRCUCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRawBlockCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRawBlockCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRegisterStateCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetRegisterStateCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSPUStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSPUStatusCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSPUStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSPUStatusCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSplitterCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSplitterCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetStatsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetStatsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetStatusCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetStatusCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSubbandsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetSubbandsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetTBBCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetTBBCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetTDStatusCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetTDStatusCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetVersionsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetVersionsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetVersionsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetVersionsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetWGCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetWGCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetWeightsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetWeightsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/GetXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetXCStatsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/GetXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/GetXCStatsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/HBAProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/HBAProtocolWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/HBAProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/HBAProtocolWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/HBAResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/HBAResultRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/HBAResultRead.h b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/HBAResultRead.h
rename to MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/Makefile.am b/MAC/APL/PIC/RSP_Driver/src/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Makefile.am
rename to MAC/APL/PIC/RSP_Driver/src/Makefile.am
diff --git a/MAC/APL/PIC/RSPDriver/src/RADWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RADWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RADWrite.h b/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RADWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/RADWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUCables.cc b/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUCables.cc
rename to MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUCables.h b/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUCables.h
rename to MAC/APL/PIC/RSP_Driver/src/RCUCables.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUProtocolWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUProtocolWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RCURead.cc b/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCURead.cc
rename to MAC/APL/PIC/RSP_Driver/src/RCURead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RCURead.h b/MAC/APL/PIC/RSP_Driver/src/RCURead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCURead.h
rename to MAC/APL/PIC/RSP_Driver/src/RCURead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUResultRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUResultRead.h b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUResultRead.h
rename to MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RCUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RCUWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/README b/MAC/APL/PIC/RSP_Driver/src/README
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/README
rename to MAC/APL/PIC/RSP_Driver/src/README
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPCommands.xls b/MAC/APL/PIC/RSP_Driver/src/RSPCommands.xls
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSPCommands.xls
rename to MAC/APL/PIC/RSP_Driver/src/RSPCommands.xls
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
rename to MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.conf.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
rename to MAC/APL/PIC/RSP_Driver/src/RSPDriver.conf.in
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.h b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSPDriver.h
rename to MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RSUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSUWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RSUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RSUWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RawBlockRead.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawBlockRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RawBlockRead.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawBlockRead.h
rename to MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RawBlockWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawBlockWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RawBlockWrite.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawBlockWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RawEvent.cc b/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawEvent.cc
rename to MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/RawEvent.h b/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RawEvent.h
rename to MAC/APL/PIC/RSP_Driver/src/RawEvent.h
diff --git a/MAC/APL/PIC/RSPDriver/src/ReadHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/ReadHBACmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/ReadHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/ReadHBACmd.h
rename to MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/ReadReg.cc b/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/ReadReg.cc
rename to MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/ReadReg.h b/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/ReadReg.h
rename to MAC/APL/PIC/RSP_Driver/src/ReadReg.h
diff --git a/MAC/APL/PIC/RSPDriver/src/RefCount.h b/MAC/APL/PIC/RSP_Driver/src/RefCount.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/RefCount.h
rename to MAC/APL/PIC/RSP_Driver/src/RefCount.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SSRead.cc b/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SSRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/SSRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SSRead.h b/MAC/APL/PIC/RSP_Driver/src/SSRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SSRead.h
rename to MAC/APL/PIC/RSP_Driver/src/SSRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SSWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SSWrite.h b/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SSWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/SSWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/Scheduler.cc b/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Scheduler.cc
rename to MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/Scheduler.h b/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Scheduler.h
rename to MAC/APL/PIC/RSP_Driver/src/Scheduler.h
diff --git a/MAC/APL/PIC/RSPDriver/src/Sequencer.cc b/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Sequencer.cc
rename to MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/Sequencer.h b/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/Sequencer.h
rename to MAC/APL/PIC/RSP_Driver/src/Sequencer.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesBuffer.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesBuffer.cc
rename to MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesBuffer.h b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesBuffer.h
rename to MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesRead.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesRead.h b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesRead.h
rename to MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SerdesWrite.h b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SerdesWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetBypassCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetBypassCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetClocksCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetClocksCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetHBACmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetHBACmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRCUCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRCUCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRSUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRSUCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRSUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRSUCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRawBlockCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetRawBlockCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetSplitterCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetSplitterCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetSubbandsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetSubbandsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetTBBCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetTBBCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetWGCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetWGCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetWeightsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SetWeightsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SstRead.cc b/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SstRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/SstRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SstRead.h b/MAC/APL/PIC/RSP_Driver/src/SstRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SstRead.h
rename to MAC/APL/PIC/RSP_Driver/src/SstRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/StationSettings.cc b/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/StationSettings.cc
rename to MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/StationSettings.h b/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/StationSettings.h
rename to MAC/APL/PIC/RSP_Driver/src/StationSettings.h
diff --git a/MAC/APL/PIC/RSPDriver/src/StatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/StatusRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/StatusRead.h b/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/StatusRead.h
rename to MAC/APL/PIC/RSP_Driver/src/StatusRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/SyncAction.cc b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SyncAction.cc
rename to MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/SyncAction.h b/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/SyncAction.h
rename to MAC/APL/PIC/RSP_Driver/src/SyncAction.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TBBBandselWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TBBBandselWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TBBBandselWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TBBBandselWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TBBSettingsWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TBBSettingsWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TBBSettingsWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TBBSettingsWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSProtocolWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSProtocolWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSResultRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSResultRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSResultRead.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSResultWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSResultWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSResultWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSResultWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSStatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSStatusRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSStatusRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSStatusRead.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSStatusWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSStatusWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSStatusWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSStatusWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TDS_program_plls.txt b/MAC/APL/PIC/RSP_Driver/src/TDS_program_plls.txt
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDS_program_plls.txt
rename to MAC/APL/PIC/RSP_Driver/src/TDS_program_plls.txt
diff --git a/MAC/APL/PIC/RSPDriver/src/TDSi2cdefs.h b/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TDSi2cdefs.h
rename to MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
diff --git a/MAC/APL/PIC/RSPDriver/src/TimestampWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TimestampWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/TimestampWrite.h b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/TimestampWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdClocksCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdClocksCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdHBACmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdHBACmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdRCUCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdRCUCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdRegisterStateCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdRegisterStateCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdStatsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdStatsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdStatusCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdStatusCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdSubbandsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdSubbandsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdTDStatusCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdTDStatusCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdXCStatsCmd.cc
rename to MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/UpdXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/UpdXCStatsCmd.h
rename to MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
diff --git a/MAC/APL/PIC/RSPDriver/src/VersionsRead.cc b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/VersionsRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/VersionsRead.h b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/VersionsRead.h
rename to MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/WGRead.cc b/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WGRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/WGRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/WGRead.h b/MAC/APL/PIC/RSP_Driver/src/WGRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WGRead.h
rename to MAC/APL/PIC/RSP_Driver/src/WGRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/WGWrite.cc b/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WGWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/WGWrite.h b/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WGWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/WGWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/WriteReg.cc b/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WriteReg.cc
rename to MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/WriteReg.h b/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/WriteReg.h
rename to MAC/APL/PIC/RSP_Driver/src/WriteReg.h
diff --git a/MAC/APL/PIC/RSPDriver/src/XWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/XWWrite.cc
rename to MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/XWWrite.h b/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/XWWrite.h
rename to MAC/APL/PIC/RSP_Driver/src/XWWrite.h
diff --git a/MAC/APL/PIC/RSPDriver/src/XstRead.cc b/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/XstRead.cc
rename to MAC/APL/PIC/RSP_Driver/src/XstRead.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/XstRead.h b/MAC/APL/PIC/RSP_Driver/src/XstRead.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/XstRead.h
rename to MAC/APL/PIC/RSP_Driver/src/XstRead.h
diff --git a/MAC/APL/PIC/RSPDriver/src/geni2c.cc b/MAC/APL/PIC/RSP_Driver/src/geni2c.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/geni2c.cc
rename to MAC/APL/PIC/RSP_Driver/src/geni2c.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.cc b/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/rspctl.cc
rename to MAC/APL/PIC/RSP_Driver/src/rspctl.cc
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.conf.in b/MAC/APL/PIC/RSP_Driver/src/rspctl.conf.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/rspctl.conf.in
rename to MAC/APL/PIC/RSP_Driver/src/rspctl.conf.in
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.h b/MAC/APL/PIC/RSP_Driver/src/rspctl.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/rspctl.h
rename to MAC/APL/PIC/RSP_Driver/src/rspctl.h
diff --git a/MAC/APL/PIC/RSPDriver/src/rspd.ul.in b/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/src/rspd.ul.in
rename to MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
diff --git a/MAC/APL/PIC/RSPDriver/test/CMakeLists.txt b/MAC/APL/PIC/RSP_Driver/test/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/CMakeLists.txt
rename to MAC/APL/PIC/RSP_Driver/test/CMakeLists.txt
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.cc b/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/EPAStub.cc
rename to MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.conf.in b/MAC/APL/PIC/RSP_Driver/test/EPAStub.conf.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/EPAStub.conf.in
rename to MAC/APL/PIC/RSP_Driver/test/EPAStub.conf.in
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.h b/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/EPAStub.h
rename to MAC/APL/PIC/RSP_Driver/test/EPAStub.h
diff --git a/MAC/APL/PIC/RSPDriver/test/EPAStub.log_prop.in b/MAC/APL/PIC/RSP_Driver/test/EPAStub.log_prop.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/EPAStub.log_prop.in
rename to MAC/APL/PIC/RSP_Driver/test/EPAStub.log_prop.in
diff --git a/MAC/APL/PIC/RSPDriver/test/Makefile.am b/MAC/APL/PIC/RSP_Driver/test/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/Makefile.am
rename to MAC/APL/PIC/RSP_Driver/test/Makefile.am
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTest.cc b/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/RSPTest.cc
rename to MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTest.conf.in b/MAC/APL/PIC/RSP_Driver/test/RSPTest.conf.in
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/RSPTest.conf.in
rename to MAC/APL/PIC/RSP_Driver/test/RSPTest.conf.in
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTest.h b/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/RSPTest.h
rename to MAC/APL/PIC/RSP_Driver/test/RSPTest.h
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTestSuite.h b/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/RSPTestSuite.h
rename to MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
diff --git a/MAC/APL/PIC/RSPDriver/test/beamtest b/MAC/APL/PIC/RSP_Driver/test/beamtest
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/beamtest
rename to MAC/APL/PIC/RSP_Driver/test/beamtest
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.cc
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_1 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_1
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_1
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_1
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_2 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_2
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_2
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_2
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_3 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_3
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_3
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_3
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_4 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_4
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_4
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_4
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_5 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_5
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_5
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_5
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_6 b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_6
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.in_6
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.in_6
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.log_prop b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.log_prop
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.log_prop
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.log_prop
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.sh b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.sh
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.sh
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.sh
diff --git a/MAC/APL/PIC/RSPDriver/test/tCableAttenuation.stdout b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.stdout
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tCableAttenuation.stdout
rename to MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.stdout
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.cc b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.cc
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_1 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_1
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_1
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_1
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_2 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_2
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_2
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_2
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_3 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_3
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_3
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_3
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_4 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_4
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_4
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_4
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_5 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_5
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_5
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_5
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_6 b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_6
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_6
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_6
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.in_CableAtts b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_CableAtts
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.in_CableAtts
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.in_CableAtts
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.log_prop b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.log_prop
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.log_prop
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.log_prop
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.sh b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.sh
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.sh
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.sh
diff --git a/MAC/APL/PIC/RSPDriver/test/tRCUCables.stdout b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.stdout
similarity index 100%
rename from MAC/APL/PIC/RSPDriver/test/tRCUCables.stdout
rename to MAC/APL/PIC/RSP_Driver/test/tRCUCables.stdout
diff --git a/MAC/APL/PIC/TBBDriver/CMakeLists.txt b/MAC/APL/PIC/TBB_Driver/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/CMakeLists.txt
rename to MAC/APL/PIC/TBB_Driver/CMakeLists.txt
diff --git a/MAC/APL/PIC/TBBDriver/Makefile.am b/MAC/APL/PIC/TBB_Driver/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/Makefile.am
rename to MAC/APL/PIC/TBB_Driver/Makefile.am
diff --git a/MAC/APL/PIC/TBBDriver/TBBDriver.spec.in b/MAC/APL/PIC/TBB_Driver/TBBDriver.spec.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/TBBDriver.spec.in
rename to MAC/APL/PIC/TBB_Driver/TBBDriver.spec.in
diff --git a/MAC/APL/PIC/TBBDriver/bootstrap b/MAC/APL/PIC/TBB_Driver/bootstrap
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/bootstrap
rename to MAC/APL/PIC/TBB_Driver/bootstrap
diff --git a/MAC/APL/PIC/TBBDriver/configure.in b/MAC/APL/PIC/TBB_Driver/configure.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/configure.in
rename to MAC/APL/PIC/TBB_Driver/configure.in
diff --git a/MAC/APL/PIC/TBBDriver/src/AllocCmd.cc b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/AllocCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/AllocCmd.h b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/AllocCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ArpCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ArpCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ArpCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ArpCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ArpModeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ArpModeCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ArpModeCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ArpModeCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/BoardCmdHandler.cc b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/BoardCmdHandler.cc
rename to MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/BoardCmdHandler.h b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/BoardCmdHandler.h
rename to MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
diff --git a/MAC/APL/PIC/TBBDriver/src/CMakeLists.txt b/MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/CMakeLists.txt
rename to MAC/APL/PIC/TBB_Driver/src/CMakeLists.txt
diff --git a/MAC/APL/PIC/TBBDriver/src/CepDelayCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/CepDelayCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/CepDelayCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/CepDelayCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/CepStatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/CepStatusCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/CepStatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/CepStatusCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ClearCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ClearCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ClearCmd.h b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ClearCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/Command.cc b/MAC/APL/PIC/TBB_Driver/src/Command.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/Command.cc
rename to MAC/APL/PIC/TBB_Driver/src/Command.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/Command.h b/MAC/APL/PIC/TBB_Driver/src/Command.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/Command.h
rename to MAC/APL/PIC/TBB_Driver/src/Command.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ConfigCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ConfigCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ConfigCmd.h b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ConfigCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/DriverSettings.cc b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/DriverSettings.cc
rename to MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/DriverSettings.h b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/DriverSettings.h
rename to MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ErasefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ErasefCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ErasefCmd.h b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ErasefCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/FreeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/FreeCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/FreeCmd.h b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/FreeCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ImageInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ImageInfoCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ImageInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ImageInfoCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/Makefile.am b/MAC/APL/PIC/TBB_Driver/src/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/Makefile.am
rename to MAC/APL/PIC/TBB_Driver/src/Makefile.am
diff --git a/MAC/APL/PIC/TBBDriver/src/MsgHandler.cc b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/MsgHandler.cc
rename to MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/MsgHandler.h b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/MsgHandler.h
rename to MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
diff --git a/MAC/APL/PIC/TBBDriver/src/PageperiodCmd.cc b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/PageperiodCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/PageperiodCmd.h b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/PageperiodCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/RawEvent.cc b/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/RawEvent.cc
rename to MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/RawEvent.h b/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/RawEvent.h
rename to MAC/APL/PIC/TBB_Driver/src/RawEvent.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadfCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadfCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadfCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadfCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadrCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadrCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadrCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadrCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadwCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadwCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadwCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadwCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadxCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadxCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ReadxCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ReadxCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/RecordCmd.cc b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/RecordCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/RecordCmd.h b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/RecordCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/RemoteStation.conf.in b/MAC/APL/PIC/TBB_Driver/src/RemoteStation.conf.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/RemoteStation.conf.in
rename to MAC/APL/PIC/TBB_Driver/src/RemoteStation.conf.in
diff --git a/MAC/APL/PIC/TBBDriver/src/ResetCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ResetCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/ResetCmd.h b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/ResetCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/SizeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/SizeCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/SizeCmd.h b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/SizeCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/StatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StatusCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/StatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StatusCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/StopCepCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StopCepCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/StopCepCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StopCepCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/StopCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StopCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/StopCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/StopCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/StopCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TBBDriver.cc b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TBBDriver.cc
rename to MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TBBDriver.conf.in b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.conf.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TBBDriver.conf.in
rename to MAC/APL/PIC/TBB_Driver/src/TBBDriver.conf.in
diff --git a/MAC/APL/PIC/TBBDriver/src/TBBDriver.h b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TBBDriver.h
rename to MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TBBDriverPorts.conf.in b/MAC/APL/PIC/TBB_Driver/src/TBBDriverPorts.conf.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TBBDriverPorts.conf.in
rename to MAC/APL/PIC/TBB_Driver/src/TBBDriverPorts.conf.in
diff --git a/MAC/APL/PIC/TBBDriver/src/TP_Protocol.prot b/MAC/APL/PIC/TBB_Driver/src/TP_Protocol.prot
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TP_Protocol.prot
rename to MAC/APL/PIC/TBB_Driver/src/TP_Protocol.prot
diff --git a/MAC/APL/PIC/TBBDriver/src/TempLimitCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TempLimitCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TempLimitCmd.h b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TempLimitCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigCoefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigCoefCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigCoefCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigCoefCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigGenCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigGenCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigGenCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigGenCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigInfoCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigInfoCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigReleaseCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigReleaseCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigReleaseCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigReleaseCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigSetupCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigSetupCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/TrigSetupCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/TrigSetupCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/UdpCmd.cc b/MAC/APL/PIC/TBB_Driver/src/UdpCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/UdpCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/UdpCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/UdpCmd.h b/MAC/APL/PIC/TBB_Driver/src/UdpCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/UdpCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/UdpCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/VersionCmd.cc b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/VersionCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/VersionCmd.h b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/VersionCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/WatchDogCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WatchDogCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/WatchDogCmd.h b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WatchDogCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/WritefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WritefCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/WritefCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WritefCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/WriterCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WriterCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/WriterCmd.h b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WriterCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/WritewCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WritewCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/WritewCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/WritewCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/XXXCmd.cc b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/XXXCmd.cc
rename to MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/XXXCmd.h b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/XXXCmd.h
rename to MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
diff --git a/MAC/APL/PIC/TBBDriver/src/commando_toevoegen.txt b/MAC/APL/PIC/TBB_Driver/src/commando_toevoegen.txt
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/commando_toevoegen.txt
rename to MAC/APL/PIC/TBB_Driver/src/commando_toevoegen.txt
diff --git a/MAC/APL/PIC/TBBDriver/src/tbbctl.cc b/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/tbbctl.cc
rename to MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
diff --git a/MAC/APL/PIC/TBBDriver/src/tbbctl.h b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/src/tbbctl.h
rename to MAC/APL/PIC/TBB_Driver/src/tbbctl.h
diff --git a/MAC/APL/PIC/TBBDriver/test/CMakeLists.txt b/MAC/APL/PIC/TBB_Driver/test/CMakeLists.txt
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/CMakeLists.txt
rename to MAC/APL/PIC/TBB_Driver/test/CMakeLists.txt
diff --git a/MAC/APL/PIC/TBBDriver/test/Makefile.am b/MAC/APL/PIC/TBB_Driver/test/Makefile.am
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/Makefile.am
rename to MAC/APL/PIC/TBB_Driver/test/Makefile.am
diff --git a/MAC/APL/PIC/TBBDriver/test/StubRawEvent.cc b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/StubRawEvent.cc
rename to MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
diff --git a/MAC/APL/PIC/TBBDriver/test/StubRawEvent.h b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/StubRawEvent.h
rename to MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
diff --git a/MAC/APL/PIC/TBBDriver/test/TBBTest.cc b/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TBBTest.cc
rename to MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
diff --git a/MAC/APL/PIC/TBBDriver/test/TBBTest.conf.in b/MAC/APL/PIC/TBB_Driver/test/TBBTest.conf.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TBBTest.conf.in
rename to MAC/APL/PIC/TBB_Driver/test/TBBTest.conf.in
diff --git a/MAC/APL/PIC/TBBDriver/test/TBBTest.h b/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TBBTest.h
rename to MAC/APL/PIC/TBB_Driver/test/TBBTest.h
diff --git a/MAC/APL/PIC/TBBDriver/test/TBBTestSuite.h b/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TBBTestSuite.h
rename to MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
diff --git a/MAC/APL/PIC/TBBDriver/test/TPStub.cc b/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TPStub.cc
rename to MAC/APL/PIC/TBB_Driver/test/TPStub.cc
diff --git a/MAC/APL/PIC/TBBDriver/test/TPStub.conf.in b/MAC/APL/PIC/TBB_Driver/test/TPStub.conf.in
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TPStub.conf.in
rename to MAC/APL/PIC/TBB_Driver/test/TPStub.conf.in
diff --git a/MAC/APL/PIC/TBBDriver/test/TPStub.h b/MAC/APL/PIC/TBB_Driver/test/TPStub.h
similarity index 100%
rename from MAC/APL/PIC/TBBDriver/test/TPStub.h
rename to MAC/APL/PIC/TBB_Driver/test/TPStub.h
diff --git a/MAC/APL/PIC/lofarconf.in b/MAC/APL/PIC/lofarconf.in
index 6e0c05b05007c8fdf928c699ab3a61adaad71ba6..55526b86c1c73108407026967d04fb42ec1d061f 100644
--- a/MAC/APL/PIC/lofarconf.in
+++ b/MAC/APL/PIC/lofarconf.in
@@ -1,5 +1,5 @@
 RSP_Protocol
-RSPDriver
+RSP_Driver
 TBB_Protocol
-TBBDriver
+TBB_Driver
 SHMInfoServer