diff --git a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
index 69bfbf2e24d75088351f75892d627d60e1ad302a..703ced096e170c92949af056d37cad12057b81cf 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( WaveformDataAccessExample )
 atlas_add_component( WaveformDataAccessExample
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps ScintRawEvent )
+                     LINK_LIBRARIES AthenaBaseComps WaveRawEvent )
 
 atlas_install_python_modules( python/*.py )
 
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index 5d0cfcdeaaac4f96e094b635138edf66466208e2..1151c74dffc7ddaa0182df025e82dd243c36684a 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -14,7 +14,7 @@ def WaveformDataAccessExampleCfg(flags, name="WaveformDataAccessExampleAlg", **k
     from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
     a = FaserGeometryCfg(flags)
 
-    WaveformDataAccessExampleAlg = CompFactory.ScintWaveformAccess
+    WaveformDataAccessExampleAlg = CompFactory.RawWaveformAccess
     a.addEventAlgo(WaveformDataAccessExampleAlg(name, **kwargs))
     
     from FaserByteStreamCnvSvc.FaserByteStreamCnvSvcConfig import FaserByteStreamCnvSvcCfg
@@ -56,7 +56,7 @@ if __name__ == "__main__":
     from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
     itemList = [ "xAOD::EventInfo#*",
                  "xAOD::EventAuxInfo#*",
-                 "ScintWaveformContainer#*"
+                 "RawWaveformContainer#*"
                ]
     acc.merge(OutputStreamCfg(ConfigFlags, "RDO", itemList))
     ostream = acc.getEventAlgo("OutputStreamRDO")
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
similarity index 54%
rename from Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx
rename to Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
index d3de51d50d765ad4c3ffc4908ab0f426ef80e0ca..0d06d587ddb18dc55bee24650e282af8fdd856e7 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.cxx
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.cxx
@@ -3,28 +3,27 @@
 */
 
 /*
- * ScintWaveformAccess.cxx
+ * RawWaveformAccess.cxx
  * 
  * Simple algorithm to access waveform data from storegate.
  * Try to write a proper thread-safe algorithm.
  *
  */
 
-#include "ScintWaveformAccess.h"
-//#include "ScintRawEvent/ScintWaveform.h"
+#include "RawWaveformAccess.h"
 
-ScintWaveformAccess::ScintWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator)
+RawWaveformAccess::RawWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator)
 {
 }
 
-ScintWaveformAccess::~ScintWaveformAccess()
+RawWaveformAccess::~RawWaveformAccess()
 {
 }
 
 StatusCode
-ScintWaveformAccess::initialize()
+RawWaveformAccess::initialize()
 {
-  ATH_MSG_DEBUG("ScintWaveformAccess::initialize() called");
+  ATH_MSG_DEBUG("RawWaveformAccess::initialize() called");
 
   // Must initialize SG handles
   ATH_CHECK( m_CaloWaveformContainer.initialize() );
@@ -38,40 +37,40 @@ ScintWaveformAccess::initialize()
 }
 
 StatusCode
-ScintWaveformAccess::finalize()
+RawWaveformAccess::finalize()
 {
-  ATH_MSG_DEBUG("ScintWaveformAccess::finalize() called");
+  ATH_MSG_DEBUG("RawWaveformAccess::finalize() called");
 
   return StatusCode::SUCCESS;
 }
 
 StatusCode
-ScintWaveformAccess::execute(const EventContext& ctx) const
+RawWaveformAccess::execute(const EventContext& ctx) const
 {
-  ATH_MSG_DEBUG("ScintWaveformAccess::execute() called");
+  ATH_MSG_DEBUG("RawWaveformAccess::execute() called");
 
   // Try reading all of the different containers
-  SG::ReadHandle<ScintWaveformContainer> caloHandle(m_CaloWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> caloHandle(m_CaloWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for CaloWaveforms");
   ATH_MSG_INFO(*caloHandle);
 
-  SG::ReadHandle<ScintWaveformContainer> vetoHandle(m_VetoWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> vetoHandle(m_VetoWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for VetoWaveforms");
   ATH_MSG_INFO(*vetoHandle);
 
-  SG::ReadHandle<ScintWaveformContainer> triggerHandle(m_TriggerWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> triggerHandle(m_TriggerWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for TriggerWaveforms");
   ATH_MSG_INFO(*triggerHandle);
 
-  SG::ReadHandle<ScintWaveformContainer> preshowerHandle(m_PreshowerWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> preshowerHandle(m_PreshowerWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for PreshowerWaveforms");
   ATH_MSG_INFO(*preshowerHandle);
 
-  SG::ReadHandle<ScintWaveformContainer> testHandle(m_TestWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> testHandle(m_TestWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for TestWaveforms");
   ATH_MSG_INFO(*testHandle);
 
-  SG::ReadHandle<ScintWaveformContainer> clockHandle(m_ClockWaveformContainer, ctx);
+  SG::ReadHandle<RawWaveformContainer> clockHandle(m_ClockWaveformContainer, ctx);
   ATH_MSG_INFO("Found ReadHandle for ClockWaveforms");
   ATH_MSG_INFO(*clockHandle);
 
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
similarity index 58%
rename from Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h
rename to Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
index ac73b688d35cf9a793c6868027f5b0c62165abbd..d26b1eac4afab5baa890c6de5eadda5b13b5acb3 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/ScintWaveformAccess.h
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/RawWaveformAccess.h
@@ -3,26 +3,26 @@
 */
 
 /*
- * ScintWaveformAccess.h
+ * RawWaveformAccess.h
  * 
  * Simple algorithm to access digitizer data from storegate.
  * Try to write a proper thread-safe algorithm.
  *
  */
 
-#ifndef WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H
-#define WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H 
+#ifndef WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H
+#define WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H 
 
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "StoreGate/ReadHandleKey.h"
 
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
 
-class ScintWaveformAccess: public AthReentrantAlgorithm
+class RawWaveformAccess: public AthReentrantAlgorithm
 {
  public:
-  ScintWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator);
-  virtual ~ScintWaveformAccess();
+  RawWaveformAccess(const std::string& name, ISvcLocator* pSvcLocator);
+  virtual ~RawWaveformAccess();
 
   virtual StatusCode initialize() override;
   virtual StatusCode execute(const EventContext& ctx) const override;
@@ -30,18 +30,18 @@ class ScintWaveformAccess: public AthReentrantAlgorithm
 
  private:
   /// StoreGate key
-  SG::ReadHandleKey<ScintWaveformContainer> m_CaloWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_CaloWaveformContainer
     { this, "CaloWaveformContainerKey", "CaloWaveforms", "ReadHandleKey for CaloWaveforms Container"};
-  SG::ReadHandleKey<ScintWaveformContainer> m_VetoWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_VetoWaveformContainer
     { this, "VetoWaveformContainerKey", "VetoWaveforms", "ReadHandleKey for CaloWaveforms Container"};
-  SG::ReadHandleKey<ScintWaveformContainer> m_TriggerWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_TriggerWaveformContainer
     { this, "TriggerWaveformContainerKey", "TriggerWaveforms", "ReadHandleKey for TriggerWaveforms Container"};
-  SG::ReadHandleKey<ScintWaveformContainer> m_PreshowerWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_PreshowerWaveformContainer
     { this, "PreshowerWaveformContainerKey", "PreshowerWaveforms", "ReadHandleKey for PreshowerWaveforms Container"};
-  SG::ReadHandleKey<ScintWaveformContainer> m_TestWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_TestWaveformContainer
     { this, "TestWaveformContainerKey", "TestWaveforms", "ReadHandleKey for TestWaveforms Container"};
-  SG::ReadHandleKey<ScintWaveformContainer> m_ClockWaveformContainer
+  SG::ReadHandleKey<RawWaveformContainer> m_ClockWaveformContainer
     { this, "ClockWaveformContainerKey", "ClockWaveforms", "ReadHandleKey for ClockWaveforms Container"};
 };
 
-#endif /* WAVEFORMDATAACCESSEXAMPLE_SCINTWAVEFORMACCESS_H */
+#endif /* WAVEFORMDATAACCESSEXAMPLE_RAWWAVEFORMACCESS_H */
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx b/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
index 41c3b845a273f71238cb72602ec2489459d9d780..4cf977bfe8b96042565fa5b42c9cd0e8db77b994 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
+++ b/Control/CalypsoExample/WaveformDataAccessExample/src/components/WaveformDataAccess_entries.cxx
@@ -1,3 +1,3 @@
-#include "../ScintWaveformAccess.h"
+#include "../RawWaveformAccess.h"
 
-DECLARE_COMPONENT( ScintWaveformAccess )
+DECLARE_COMPONENT( RawWaveformAccess )
diff --git a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
index dacc9d7703d3b1fdf61aa50a4f020bf40a3ffe2e..aadf22c61fbe3a4e823241d06a5f537dee4f857f 100644
--- a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/CMakeLists.txt
@@ -18,7 +18,7 @@ set( CMAKE_AUTOMOC TRUE )
 atlas_add_library( VTI12WaveformSystems VTI12WaveformSystems/*.h src/*.cxx
    PUBLIC_HEADERS VTI12WaveformSystems
    INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${QT5_INCLUDE_DIRS}
-   LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives VP1Base VTI12Utils ScintRawEvent xAODFaserWaveform
+   LINK_LIBRARIES ${COIN3D_LIBRARIES} GeoPrimitives VP1Base VTI12Utils WaveRawEvent xAODFaserWaveform
    Qt5::Core Qt5::Gui Qt5::Charts
    PRIVATE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
    PRIVATE_LINK_LIBRARIES GaudiKernel VP1HEPVis )
diff --git a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
index 5551a33cf4b50233704cc0b7d46e65a45047f399..ffe6bd00acecfd6f3fe611c01b24a1f2ea6afd1a 100644
--- a/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
+++ b/graphics/VTI12/VTI12Systems/VTI12WaveformSystems/src/VP1WaveformSystem.cxx
@@ -23,7 +23,7 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "ScintRawEvent/ScintWaveformContainer.h"
+#include "WaveRawEvent/RawWaveformContainer.h"
 
 #include <Inventor/nodes/SoSeparator.h>
 #include <Inventor/nodes/SoPickStyle.h>
@@ -120,12 +120,12 @@ void VP1WaveformSystem::Imp::createCharts(StoreGateSvc* sg,
                                           std::vector<QChart*>& list, 
                                           const std::string& collectionName)
 {
-    typedef DataVector<ScintWaveform>::const_iterator ScintWaveformConstIterator;
+    typedef DataVector<RawWaveform>::const_iterator RawWaveformConstIterator;
 
-    const ScintWaveformContainer* p_container {nullptr};
+    const RawWaveformContainer* p_container {nullptr};
     if(sg->retrieve(p_container, collectionName)==StatusCode::SUCCESS)
     {
-      for(ScintWaveformConstIterator i_wf=p_container->begin(); i_wf!=p_container->end(); ++i_wf)
+      for(RawWaveformConstIterator i_wf=p_container->begin(); i_wf!=p_container->end(); ++i_wf)
       {
         if ((*i_wf)->n_samples() > 0)
         {