diff --git a/DAQ/DAQMonitors/src/RawBankSizeMonitor.cpp b/DAQ/DAQMonitors/src/RawBankSizeMonitor.cpp
index f79a3e4bde8f692cdbd91acafd7cebfc11bc4aa5..7ec552524c100e76a506a14c94623e602b34cd5e 100644
--- a/DAQ/DAQMonitors/src/RawBankSizeMonitor.cpp
+++ b/DAQ/DAQMonitors/src/RawBankSizeMonitor.cpp
@@ -23,8 +23,8 @@
 namespace {
   auto allBankNames() {
     std::vector<std::string> bn;
-    bn.reserve( (int)LHCb::RawBank::LastType );
-    for ( int i = 0; i != (int)LHCb::RawBank::LastType; i++ ) {
+    bn.reserve( (int)LHCb::RawBank::BankType::LastType );
+    for ( int i = 0; i != (int)LHCb::RawBank::BankType::LastType; i++ ) {
       bn.push_back( LHCb::RawBank::typeName( (LHCb::RawBank::BankType)i ) );
     }
     return bn;
@@ -66,7 +66,7 @@ StatusCode RawBankSizeMonitor::initialize() {
     // convert bankNames to bankTypes
     for ( const auto& bname : m_bankNames ) {
       bool found = false;
-      for ( int i = 0; i != (int)LHCb::RawBank::LastType && !found; i++ ) {
+      for ( int i = 0; i != (int)LHCb::RawBank::BankType::LastType && !found; i++ ) {
         const auto _name = LHCb::RawBank::typeName( (LHCb::RawBank::BankType)i );
         if ( _name == bname ) {
           found = true;
diff --git a/VP/VPMonitors/src/VPDQMonitors.cpp b/VP/VPMonitors/src/VPDQMonitors.cpp
index 527c1802a597e0dc64c08fbf2df488586c5532cc..101b75ea590d450136367bb08189fea8cd7ec1ae 100644
--- a/VP/VPMonitors/src/VPDQMonitors.cpp
+++ b/VP/VPMonitors/src/VPDQMonitors.cpp
@@ -150,17 +150,17 @@ void LHCb::VPDQMonitors::operator()( const std::vector<LHCb::VPFullCluster>& vpC
   /// ERRORS
 
   // Get VELO Error Banks, DAQ Error Banks
-  const auto& error_banks               = rawEvent.banks( LHCb::RawBank::VeloError );
-  const auto& DaqErrorFragmentThrottled = rawEvent.banks( LHCb::RawBank::DaqErrorFragmentThrottled ); // 89
-  const auto& DaqErrorBXIDCorrupted     = rawEvent.banks( LHCb::RawBank::DaqErrorBXIDCorrupted );     // 90
-  const auto& DaqErrorSyncBXIDCorrupted = rawEvent.banks( LHCb::RawBank::DaqErrorSyncBXIDCorrupted ); // 91
-  const auto& DaqErrorFragmentMissing   = rawEvent.banks( LHCb::RawBank::DaqErrorFragmentMissing );   // 92
-  const auto& DaqErrorFragmentTruncated = rawEvent.banks( LHCb::RawBank::DaqErrorFragmentTruncated ); // 93
-  const auto& DaqErrorIdleBXIDCorrupted = rawEvent.banks( LHCb::RawBank::DaqErrorIdleBXIDCorrupted ); // 94
-  const auto& DaqErrorFragmentMalformed = rawEvent.banks( LHCb::RawBank::DaqErrorFragmentMalformed ); // 95
-  const auto& DaqErrorEVIDJumped        = rawEvent.banks( LHCb::RawBank::DaqErrorEVIDJumped );        // 96
-  const auto& DaqErrorAlignFifoFull     = rawEvent.banks( LHCb::RawBank::DaqErrorAlignFifoFull );     // 100
-  const auto& DaqErrorFEfragSizeWrong   = rawEvent.banks( LHCb::RawBank::DaqErrorFEfragSizeWrong );   // 101
+  const auto& error_banks               = rawEvent.banks( LHCb::RawBank::BankType::VeloError );
+  const auto& DaqErrorFragmentThrottled = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorFragmentThrottled ); // 89
+  const auto& DaqErrorBXIDCorrupted     = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorBXIDCorrupted );     // 90
+  const auto& DaqErrorSyncBXIDCorrupted = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorSyncBXIDCorrupted ); // 91
+  const auto& DaqErrorFragmentMissing   = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorFragmentMissing );   // 92
+  const auto& DaqErrorFragmentTruncated = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorFragmentTruncated ); // 93
+  const auto& DaqErrorIdleBXIDCorrupted = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorIdleBXIDCorrupted ); // 94
+  const auto& DaqErrorFragmentMalformed = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorFragmentMalformed ); // 95
+  const auto& DaqErrorEVIDJumped        = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorEVIDJumped );        // 96
+  const auto& DaqErrorAlignFifoFull     = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorAlignFifoFull );     // 100
+  const auto& DaqErrorFEfragSizeWrong   = rawEvent.banks( LHCb::RawBank::BankType::DaqErrorFEfragSizeWrong );   // 101
 
   // Error bank reference hex values
   const uint8_t VELO_ERR_RAM_MANY_SPPS     = 0x30;