diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/cmt/requirements b/PhysicsAnalysis/EventTag/EventTagAlgs/cmt/requirements
index 02be3c16d1e05d534098e4426e50e1f01a739fa8..52ebc67e0d826bb85219809f3d4cfc689d45b09e 100755
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/cmt/requirements
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/cmt/requirements
@@ -17,7 +17,7 @@ use AtlasPOOL                	AtlasPOOL-*                	External
 use StoreGate                	StoreGate-*                	Control
 use AthenaBaseComps       	AthenaBaseComps-*		Control
 
-use EventInfo                	EventInfo-*                	Event
+use xAODEventInfo               xAODEventInfo-*                	Event/xAOD
 use EventTagUtils	     	EventTagUtils-*			PhysicsAnalysis/EventTag
 use AnalysisTriggerEvent     	AnalysisTriggerEvent-*		PhysicsAnalysis/AnalysisTrigger
 
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/EventSplitter.cxx b/PhysicsAnalysis/EventTag/EventTagAlgs/src/EventSplitter.cxx
index 0b01bf3e8557000c6ceef112798499916de5cef3..447a1793b993e8233991e3b0de0fdc295c6aecde 100755
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/EventSplitter.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/src/EventSplitter.cxx
@@ -9,8 +9,7 @@
 #include "AthenaPoolUtilities/AthenaAttributeListSpecification.h"
 #include "AthenaPoolUtilities/TagAthenaAttributeList.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/TriggerInfo.h"
+#include "xAODEventInfo/EventInfo.h"
 
 #include "StoreGate/StoreGateSvc.h"
 
@@ -101,8 +100,8 @@ StatusCode EventSplitter::execute()
 
   // get Trigger Type Word for EventInfo
 
-  const DataHandle<EventInfo> eventInfo;
-  const DataHandle<EventInfo> eventInfoEnd;
+  const DataHandle<xAOD::EventInfo> eventInfo;
+  const DataHandle<xAOD::EventInfo> eventInfoEnd;
   StatusCode sc = m_StoreGate->retrieve(eventInfo, eventInfoEnd);
   if (sc.isFailure())
     {
@@ -115,10 +114,7 @@ StatusCode EventSplitter::execute()
       return sc;
     }
 
-  uint32_t triggerTypeWord = 0;
-  const TriggerInfo *tInfo = eventInfo->trigger_info();
-  if (tInfo!=0)
-    triggerTypeWord = tInfo->level1TriggerType();
+  uint32_t triggerTypeWord = eventInfo->level1TriggerType();
 
   // get CTP_Decision
   const CTP_Decision * ctpDecision = 0;
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/MissingETTagBuilder.h b/PhysicsAnalysis/EventTag/EventTagAlgs/src/MissingETTagBuilder.h
index 19090f9c7cd7bf1af6067d91c123058f7582b35d..79b5008865cc634c7d6296db1e7415aa55cf2cbc 100755
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/MissingETTagBuilder.h
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/src/MissingETTagBuilder.h
@@ -40,7 +40,7 @@ private:
   StoreGateSvc* m_storeGateSvc;
 
   //! Jet and Missing Tag Tool
-  ToolHandle<JetMissingEtTagTool> m_jetMissingEtTagTool;
+  ToolHandle<JetMetTagTool> m_jetMissingEtTagTool;
 
 };
 
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/ParticleJetTagBuilder.h b/PhysicsAnalysis/EventTag/EventTagAlgs/src/ParticleJetTagBuilder.h
index 7378f5a7cf66377406297c4e40c121f58288d2f3..ea811f0c6633d096eb41885761ee3be4f352a9a0 100755
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/ParticleJetTagBuilder.h
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/src/ParticleJetTagBuilder.h
@@ -43,7 +43,7 @@ private:
   StoreGateSvc* m_storeGateSvc;
 
   //! Jet and Missing Tag Tool
-  ToolHandle<JetMissingEtTagTool> m_jetMissingEtTagTool;
+  ToolHandle<JetMetTagTool> m_jetMissingEtTagTool;
 
 };