diff --git a/LHCbG4Tests/G4RichTbSimH/CMakeLists.txt b/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
similarity index 85%
rename from LHCbG4Tests/G4RichTbSimH/CMakeLists.txt
rename to LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
index cbd3569aec352f6453d444383bf45e77a80fe0aa..3cd70ed378ed292f4f3fb1eae452daa6c586d507 100644
--- a/LHCbG4Tests/G4RichTbSimH/CMakeLists.txt
+++ b/LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(G4RichTbSimH v1r0)
+gaudi_subdir(G4RichTbSimHTest v1r0)
 
 gaudi_depends_on_subdirs(Geant4/G4config)
 
@@ -18,7 +18,7 @@ set(Geant4_LIBRARIES
     -lG4UIbasic
     -lG4UIGAG)
 
-gaudi_add_executable(G4RichTbSimH
+gaudi_add_executable(G4RichTbSimHTest
         src/srcmain/RichTbSim.cc
         src/srcgy/*.cc
         src/srcev/*.cc
@@ -29,4 +29,4 @@ gaudi_add_executable(G4RichTbSimH
   INCLUDE_DIRS include src/srcG4/includeG4 CLHEP ROOT
   LINK_LIBRARIES CLHEP ROOT ${Geant4_LIBRARIES})
 
-add_dependencies(G4RichTbSimH Geant4)
+add_dependencies(G4RichTbSimHTest Geant4)
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffJuraBottom100.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraBottom100.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffJuraBottom100.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraBottom100.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffJuraOpt.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraOpt.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffJuraOpt.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraOpt.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffJuraOpt_upgradeDummy.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraOpt_upgradeDummy.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffJuraOpt_upgradeDummy.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraOpt_upgradeDummy.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffJuraThr7.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraThr7.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffJuraThr7.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraThr7.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffJuraTop100.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraTop100.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffJuraTop100.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffJuraTop100.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveBottom100.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveBottom100.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveBottom100.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveBottom100.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveOpt.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveOpt.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveOpt.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveOpt.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveOpt_upgradeDummy.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveOpt_upgradeDummy.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveOpt_upgradeDummy.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveOpt_upgradeDummy.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveThr7.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveThr7.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveThr7.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveThr7.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveTop100.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveTop100.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/EffSaleveTop100.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/EffSaleveTop100.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/Mirror_D200mm_240906.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/Mirror_D200mm_240906.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/Mirror_D200mm_240906.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/Mirror_D200mm_240906.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/InputData/Mirror_D200mm_dummyUpTo800nm.txt b/LHCbG4Tests/G4RichTbSimHTest/InputData/Mirror_D200mm_dummyUpTo800nm.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/InputData/Mirror_D200mm_dummyUpTo800nm.txt
rename to LHCbG4Tests/G4RichTbSimHTest/InputData/Mirror_D200mm_dummyUpTo800nm.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/include/HpdSiEnergyLoss.hh b/LHCbG4Tests/G4RichTbSimHTest/include/HpdSiEnergyLoss.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/HpdSiEnergyLoss.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/HpdSiEnergyLoss.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/PixelHpdPhotoElectricEffect.hh b/LHCbG4Tests/G4RichTbSimHTest/include/PixelHpdPhotoElectricEffect.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/PixelHpdPhotoElectricEffect.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/PixelHpdPhotoElectricEffect.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/PmtAnodeEnergyLoss.hh b/LHCbG4Tests/G4RichTbSimHTest/include/PmtAnodeEnergyLoss.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/PmtAnodeEnergyLoss.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/PmtAnodeEnergyLoss.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/PmtPhotoElectricEffect.hh b/LHCbG4Tests/G4RichTbSimHTest/include/PmtPhotoElectricEffect.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/PmtPhotoElectricEffect.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/PmtPhotoElectricEffect.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbAnalysisManager.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbAnalysisManager.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbAnalysisManager.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbAnalysisManager.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbBeamGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbBeamGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbBeamGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbBeamGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbBeamProperty.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbBeamProperty.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbBeamProperty.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbBeamProperty.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbCounter.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbCounter.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbCounter.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbCounter.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalCoverGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalCoverGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalCoverGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalCoverGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalMasterGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalMasterGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbCrystalMasterGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbCrystalMasterGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbDarkCoverGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbDarkCoverGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbDarkCoverGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbDarkCoverGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbEventAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbEventAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbEventAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbEventAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbExtHpdGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbExtHpdGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbExtHpdGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbExtHpdGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbGraphics.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbGraphics.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbGraphics.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbGraphics.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHall.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHall.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHall.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHall.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHallGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHallGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHallGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHallGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHit.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHit.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHit.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHit.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHpd.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpd.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHpd.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpd.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHpdGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHpdGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHpdRODummySD.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdRODummySD.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHpdRODummySD.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdRODummySD.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbHpdSupportFrameGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdSupportFrameGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbHpdSupportFrameGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbHpdSupportFrameGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbIOData.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbIOData.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbIOData.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbIOData.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbLensGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbLensGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbLensGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbLensGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbMasterGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbMasterGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbMasterGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbMasterGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbMaterial.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbMaterial.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbMaterial.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbMaterial.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbMaterialParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbMaterialParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbMaterialParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbMaterialParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbMirrorGeometryParamters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbMirrorGeometryParamters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbMirrorGeometryParamters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbMirrorGeometryParamters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbMiscNames.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbMiscNames.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbMiscNames.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbMiscNames.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPEInfo.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPEInfo.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPEInfo.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPEInfo.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPMT.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMT.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPMT.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMT.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPMTGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMTGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPMTGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMTGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPMTSupportFrameGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMTSupportFrameGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPMTSupportFrameGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPMTSupportFrameGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPeUserInfoAttach.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPeUserInfoAttach.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPeUserInfoAttach.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPeUserInfoAttach.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhDFrameGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhDFrameGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhDFrameGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhDFrameGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhotoElectron.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotoElectron.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhotoElectron.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotoElectron.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonInfo.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonInfo.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonInfo.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonInfo.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonProdHisto.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonProdHisto.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonProdHisto.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonProdHisto.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonUserInfoAttach.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonUserInfoAttach.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhotonUserInfoAttach.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhotonUserInfoAttach.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPhysicsList.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhysicsList.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPhysicsList.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPhysicsList.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPmtPixelEfficiency.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPmtPixelEfficiency.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPmtPixelEfficiency.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPmtPixelEfficiency.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPmtSteppingAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPmtSteppingAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPmtSteppingAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPmtSteppingAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbPrimaryGeneratorAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbPrimaryGeneratorAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbPrimaryGeneratorAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbPrimaryGeneratorAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbRODummySD.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbRODummySD.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbRODummySD.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbRODummySD.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbROGeometry.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbROGeometry.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbROGeometry.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbROGeometry.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbROGeometryHpd.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbROGeometryHpd.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbROGeometryHpd.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbROGeometryHpd.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbRadiatorGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbRadiatorGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbRadiatorGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbRadiatorGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbRunAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbRunAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbRunAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbRunAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbRunConfig.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbRunConfig.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbRunConfig.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbRunConfig.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbStackingAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbStackingAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbStackingAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbStackingAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbSteppingAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbSteppingAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbSteppingAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbSteppingAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbSteppingActionBase.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbSteppingActionBase.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbSteppingActionBase.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbSteppingActionBase.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbSurface.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurface.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbSurface.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurface.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbSurfaceDefinition.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurfaceDefinition.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbSurfaceDefinition.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurfaceDefinition.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbSurfaceParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurfaceParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbSurfaceParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbSurfaceParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbTrackingAction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbTrackingAction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbTrackingAction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbTrackingAction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystal.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystal.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystal.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystal.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystalCover.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystalCover.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystalCover.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystalCover.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystalMaster.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystalMaster.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeCrystalMaster.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeCrystalMaster.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeDarkCover.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeDarkCover.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeDarkCover.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeDarkCover.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeDetectorConstruction.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeDetectorConstruction.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeDetectorConstruction.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeDetectorConstruction.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeEC.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeEC.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeEC.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeEC.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeHpdSD.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeHpdSD.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeHpdSD.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeHpdSD.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeLens.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeLens.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeLens.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeLens.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeMaster.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeMaster.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeMaster.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeMaster.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeMirror.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeMirror.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeMirror.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeMirror.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradePhDFrame.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradePhDFrame.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradePhDFrame.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradePhDFrame.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradePhDetSupFrame.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradePhDetSupFrame.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradePhDetSupFrame.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradePhDetSupFrame.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeRadiator.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeRadiator.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeRadiator.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeRadiator.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeSD.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeSD.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeSD.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeSD.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeVessel.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeVessel.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUpgradeVessel.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUpgradeVessel.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbUserTrackInfo.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbUserTrackInfo.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbUserTrackInfo.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbUserTrackInfo.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbVesselGeometryParameters.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbVesselGeometryParameters.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbVesselGeometryParameters.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbVesselGeometryParameters.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/include/RichTbVisManager.hh b/LHCbG4Tests/G4RichTbSimHTest/include/RichTbVisManager.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/include/RichTbVisManager.hh
rename to LHCbG4Tests/G4RichTbSimHTest/include/RichTbVisManager.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbHpdSi.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbHpdSi.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbHpdSi.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbHpdSi.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbSiPix.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbSiPix.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbSiPix.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbSiPix.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbVis0.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis0.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbVis0.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis0.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbVis1.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis1.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbVis1.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis1.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbVis2.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis2.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbVis2.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis2.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/RichTbVis2DAWN.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis2DAWN.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/RichTbVis2DAWN.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/RichTbVis2DAWN.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/gui.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/gui.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/gui.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/gui.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run1.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run1.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run1.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run1.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run2.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run2.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run2.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run2.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run3.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run3.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run3.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run3.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run4.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run4.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run4.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run4.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run5.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run5.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run5.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run5.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/run6.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/run6.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/run6.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/run6.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/macro/visgeom.mac b/LHCbG4Tests/G4RichTbSimHTest/macro/visgeom.mac
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/macro/visgeom.mac
rename to LHCbG4Tests/G4RichTbSimHTest/macro/visgeom.mac
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RichTbSimH.config b/LHCbG4Tests/G4RichTbSimHTest/options/RichTbSimH.config
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RichTbSimH.config
rename to LHCbG4Tests/G4RichTbSimHTest/options/RichTbSimH.config
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig-ECUp_nobeamdiv-defaultdir.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig-ECUp_nobeamdiv-defaultdir.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig-ECUp_nobeamdiv-defaultdir.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig-ECUp_nobeamdiv-defaultdir.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig-HPDSetup.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig-HPDSetup.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig-HPDSetup.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig-HPDSetup.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfigDoc.txt b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfigDoc.txt
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfigDoc.txt
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfigDoc.txt
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_Apr11.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Apr11.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_Apr11.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Apr11.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_Std_ECup_May15_2015.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Std_ECup_May15_2015.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_Std_ECup_May15_2015.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Std_ECup_May15_2015.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_Withbeamdiv_defaultdir.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Withbeamdiv_defaultdir.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_Withbeamdiv_defaultdir.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_Withbeamdiv_defaultdir.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_batch.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_batch.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_batch.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_batch.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_Interactive.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_Interactive.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_Interactive.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_Interactive.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetK.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetK.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetK.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetK.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetP.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetP.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetP.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetP.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetR.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetR.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_SetR.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_SetR.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_setF.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_setF.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_setF.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_setF.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_setQ.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_setQ.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_hpd_setQ.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_hpd_setQ.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_interactive.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_interactive.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_interactive.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_interactive.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_noBeamdiv_defaultdir.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_noBeamdiv_defaultdir.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_noBeamdiv_defaultdir.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_noBeamdiv_defaultdir.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_noBeamdiv_defaultdir_defaultEff.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_noBeamdiv_defaultdir_defaultEff.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_noBeamdiv_defaultdir_defaultEff.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_noBeamdiv_defaultdir_defaultEff.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_prod_April10.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_prod_April10.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_prod_April10.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_prod_April10.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_save.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_save.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_save.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_save.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_save_stdProd_AugAndStdrefindex.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_save_stdProd_AugAndStdrefindex.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_save_stdProd_AugAndStdrefindex.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_save_stdProd_AugAndStdrefindex.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_std_prod.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_std_prod.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_std_prod.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_std_prod.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/RunConfig_std_prod_refindexAugment.dat b/LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_std_prod_refindexAugment.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/RunConfig_std_prod_refindexAugment.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/RunConfig_std_prod_refindexAugment.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/save_options/RichConfig_save_mapfileMake.dat b/LHCbG4Tests/G4RichTbSimHTest/options/save_options/RichConfig_save_mapfileMake.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/save_options/RichConfig_save_mapfileMake.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/save_options/RichConfig_save_mapfileMake.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/options/save_options/RunConfig_save_AnalysisCkv_March30.dat b/LHCbG4Tests/G4RichTbSimHTest/options/save_options/RunConfig_save_AnalysisCkv_March30.dat
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/options/save_options/RunConfig_save_AnalysisCkv_March30.dat
rename to LHCbG4Tests/G4RichTbSimHTest/options/save_options/RunConfig_save_AnalysisCkv_March30.dat
diff --git a/LHCbG4Tests/G4RichTbSimH/runDir/G4History.macro b/LHCbG4Tests/G4RichTbSimHTest/runDir/G4History.macro
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/runDir/G4History.macro
rename to LHCbG4Tests/G4RichTbSimHTest/runDir/G4History.macro
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4Cerenkov.hh b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4Cerenkov.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4Cerenkov.hh
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4Cerenkov.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpAbsorption.hh b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpAbsorption.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpAbsorption.hh
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpAbsorption.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpBoundaryProcess.hh b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpBoundaryProcess.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpBoundaryProcess.hh
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpBoundaryProcess.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpRayleigh.hh b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpRayleigh.hh
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/includeG4/RichTbG4OpRayleigh.hh
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/includeG4/RichTbG4OpRayleigh.hh
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4Cerenkov.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4Cerenkov.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4Cerenkov.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4Cerenkov.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpAbsorption.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpAbsorption.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpAbsorption.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpAbsorption.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpBoundaryProcess.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpBoundaryProcess.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpBoundaryProcess.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpBoundaryProcess.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpRayleigh.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpRayleigh.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcG4/proc/RichTbG4OpRayleigh.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcG4/proc/RichTbG4OpRayleigh.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbAnalysisManager.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbAnalysisManager.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbAnalysisManager.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbAnalysisManager.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbCounter.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbCounter.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbCounter.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbCounter.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbEventAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbEventAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbEventAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbEventAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPEInfo.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPEInfo.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPEInfo.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPEInfo.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPeUserInfoAttach.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPeUserInfoAttach.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPeUserInfoAttach.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPeUserInfoAttach.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonInfo.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonInfo.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonInfo.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonInfo.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonProdHisto.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonProdHisto.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonProdHisto.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonProdHisto.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonUserInfoAttach.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonUserInfoAttach.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPhotonUserInfoAttach.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPhotonUserInfoAttach.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPmtSteppingAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPmtSteppingAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbPmtSteppingAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbPmtSteppingAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbStackingAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbStackingAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbStackingAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbStackingAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbSteppingAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbSteppingAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbSteppingAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbSteppingAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbSteppingActionBase.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbSteppingActionBase.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbSteppingActionBase.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbSteppingActionBase.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbTrackingAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbTrackingAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbTrackingAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbTrackingAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbUserTrackInfo.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbUserTrackInfo.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcev/RichTbUserTrackInfo.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcev/RichTbUserTrackInfo.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgr/RichTbGraphics.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgr/RichTbGraphics.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgr/RichTbGraphics.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgr/RichTbGraphics.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgr/RichTbVisManager.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgr/RichTbVisManager.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgr/RichTbVisManager.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgr/RichTbVisManager.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbGeometryParameters.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbGeometryParameters.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbGeometryParameters.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbGeometryParameters.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbHall.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbHall.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbHall.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbHall.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbHpd.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbHpd.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbHpd.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbHpd.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbMaterial.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbMaterial.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbMaterial.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbMaterial.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbMaterialParameters.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbMaterialParameters.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbMaterialParameters.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbMaterialParameters.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPMT.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPMT.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPMT.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPMT.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPhDetSupFrame.SAVE b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPhDetSupFrame.SAVE
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPhDetSupFrame.SAVE
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPhDetSupFrame.SAVE
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPhDetSupFrame_cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPhDetSupFrame_cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbPhDetSupFrame_cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbPhDetSupFrame_cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbROGeometry.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbROGeometry.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbROGeometry.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbROGeometry.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbROGeometryHpd.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbROGeometryHpd.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbROGeometryHpd.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbROGeometryHpd.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbSurface.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbSurface.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbSurface.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbSurface.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbSurfaceDefinition.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbSurfaceDefinition.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbSurfaceDefinition.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbSurfaceDefinition.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystal.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystal.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystal.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystal.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystalCover.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystalCover.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystalCover.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystalCover.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystalMaster.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystalMaster.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeCrystalMaster.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeCrystalMaster.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeDarkCover.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeDarkCover.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeDarkCover.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeDarkCover.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeDetectorConstruction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeDetectorConstruction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeDetectorConstruction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeDetectorConstruction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeEC.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeEC.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeEC.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeEC.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeLens.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeLens.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeLens.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeLens.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeMaster.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeMaster.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeMaster.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeMaster.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeMirror.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeMirror.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeMirror.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeMirror.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradePhDFrame.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradePhDFrame.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradePhDFrame.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradePhDFrame.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradePhDetSupFrame.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradePhDetSupFrame.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradePhDetSupFrame.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradePhDetSupFrame.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeRadiator.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeRadiator.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeRadiator.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeRadiator.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeVessel.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeVessel.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcgy/RichTbUpgradeVessel.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcgy/RichTbUpgradeVessel.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmain/RichTbSim.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmain/RichTbSim.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmain/RichTbSim.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmain/RichTbSim.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbBeamProperty.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbBeamProperty.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbBeamProperty.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbBeamProperty.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbHit.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbHit.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbHit.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbHit.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbIOData.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbIOData.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbIOData.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbIOData.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbPmtPixelEfficiency.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbPmtPixelEfficiency.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbPmtPixelEfficiency.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbPmtPixelEfficiency.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunAction.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunActionccSave b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunActionccSave
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunActionccSave
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunActionccSave
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunConfig.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunConfig.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbRunConfig.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbRunConfig.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbSD_cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbSD_cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbSD_cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbSD_cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbUpgradeHpdSD.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbUpgradeHpdSD.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbUpgradeHpdSD.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbUpgradeHpdSD.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbUpgradeSD.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbUpgradeSD.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcmn/RichTbUpgradeSD.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcmn/RichTbUpgradeSD.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/HpdSiEnergyLoss.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/HpdSiEnergyLoss.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/HpdSiEnergyLoss.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/HpdSiEnergyLoss.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/PixelHpdPhotoElectricEffect.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/PixelHpdPhotoElectricEffect.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/PixelHpdPhotoElectricEffect.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/PixelHpdPhotoElectricEffect.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/PmtAnodeEnergyLoss.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/PmtAnodeEnergyLoss.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/PmtAnodeEnergyLoss.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/PmtAnodeEnergyLoss.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/PmtPhotoElectricEffect.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/PmtPhotoElectricEffect.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/PmtPhotoElectricEffect.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/PmtPhotoElectricEffect.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPhotoElectron.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPhotoElectron.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPhotoElectron.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPhotoElectron.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPhysicsList.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPhysicsList.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPhysicsList.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPhysicsList.cc
diff --git a/LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPrimaryGeneratorAction.cc b/LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPrimaryGeneratorAction.cc
similarity index 100%
rename from LHCbG4Tests/G4RichTbSimH/src/srcph/RichTbPrimaryGeneratorAction.cc
rename to LHCbG4Tests/G4RichTbSimHTest/src/srcph/RichTbPrimaryGeneratorAction.cc