diff --git a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
index d13f5b0f3e983c06a9997d3fb1372412d4adcb5f..dfcb2b44acb4675e23e228f900569427545c7980 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
@@ -8,7 +8,7 @@
 #                                                                      #
 ########################################################################
 
-__all__ =  ["JetConstit", "JetGhost", "JetDefinition","xAOD"]
+__all__ =  ["JetConstit", "JetGhost", "JetDefinition","xAODType"]
 
 # Code from JetRecUtils
 # define the convention that we write R truncating the decimal point
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py b/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py
index b3a883b43fa4137fbccb46d290d67316cc74ee22..4db5a37a93f12e50b8547684519447d802cfe6ee 100644
--- a/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py
@@ -17,14 +17,14 @@
 
 ########################################################################
 # Typical jet constituents
-from JetDefinition import xAOD, JetConstit
+from JetDefinition import xAODType, JetConstit
 from copy import deepcopy
 
 # Topoclusters with origin correction.
 # We don't currently use raw TopoClusters, though some handling
 # could be added to support this.
-EMTopoOrigin = JetConstit(xAOD.Type.CaloCluster, ["EM","Origin"])
-LCTopoOrigin = JetConstit(xAOD.Type.CaloCluster, ["LC","Origin"])
+EMTopoOrigin = JetConstit(xAODType.CaloCluster, ["EM","Origin"])
+LCTopoOrigin = JetConstit(xAODType.CaloCluster, ["LC","Origin"])
 # LC clusters with Constituent Subtraction + SoftKiller
 LCTopoCSSK = deepcopy(LCTopoOrigin)
 LCTopoCSSK.modifiers += ["CS","SK"]
@@ -32,22 +32,22 @@ LCTopoCSSK.modifiers += ["CS","SK"]
 # EM-scale particle flow objects with charged hadron subtraction
 # For now we don't specify a scale, as only one works well, but
 # this could be incorporated into the naming scheme and config
-CHSPFlow = JetConstit(xAOD.Type.ParticleFlow)
+CHSPFlow = JetConstit(xAODType.ParticleFlow)
 # Particle Flow Objects with Constituent Subtraction + SoftKiller
 CSSKPFlow = deepcopy(CHSPFlow)
 CSSKPFlow.modifiers += ["CS","SK"]
 
 # Track particles from the primary vertex
-PV0Track = JetConstit(xAOD.Type.TrackParticle,["PV0"])
+PV0Track = JetConstit(xAODType.TrackParticle,["PV0"])
 
 # Truth particles from the hard scatter vertex prior to Geant4 simulation.
 # Neutrinos and muons are omitted; all other stable particles are included.
-Truth = JetConstit(xAOD.Type.TruthParticle)
+Truth = JetConstit(xAODType.TruthParticle)
 
 # Truth particles from the hard scatter vertex prior to Geant4 simulation.
 # Prompt electrons, muons and neutrinos are excluded, all other stable particles
 # are included, in particular leptons and neutrinos from hadron decays.
-TruthWZ = JetConstit(xAOD.Type.TruthParticle,["NoWZ"])
+TruthWZ = JetConstit(xAODType.TruthParticle,["NoWZ"])
 
 ########################################################################
 # Typical jet algorithm definitions
diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
index 5397dfba6a761cd2b70884914b0888a445cbfae0..fdbbdcb49bf2db746123fbdc6feb87e8a2e6c29d 100644
--- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
+++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
@@ -77,8 +77,8 @@ def DefineJetCollections():
 
     ########################################################################
     # Now we define our own definitions
-    from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAOD
-    LCTopoCSSK = JetConstit(xAOD.Type.CaloCluster, ["LC","Origin","CS","SK"])
+    from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAODType
+    LCTopoCSSK = JetConstit(xAODType.CaloCluster, ["LC","Origin","CS","SK"])
     AntiKt4LCTopoCSSK = JetDefinition("AntiKt",0.4,LCTopoCSSK,ptmin=2e3,ptminfilter=2e3)
     AntiKt4LCTopoCSSK.modifiers = ["ConstitFourMom"] + standardrecomods + clustermods + truthmods
     AntiKt4LCTopoCSSK.ghostdefs = standardghosts
@@ -179,7 +179,7 @@ if __name__=="__main__":
     
     # Write what we produced to AOD
     # First define the output list
-    outputlist = []
+    outputlist = ["EventInfo#*"]
     originaljets = ["AntiKt4EMPFlowJets"]
     for jetcoll in originaljets:
         outputlist += ["xAOD::JetContainer#"+jetcoll,
@@ -189,10 +189,10 @@ if __name__=="__main__":
         outputlist += ["xAOD::JetContainer#"+key,
                        "xAOD::JetAuxContainer#"+key+"Aux."]
 
-    # # Now get the output stream components
-    # from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-    # cfg.merge(OutputStreamCfg(ConfigFlags,"xAOD",ItemList=outputlist))
-    # pprint( cfg.getEventAlgo("OutputStreamxAOD").ItemList )
+    # Now get the output stream components
+    from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+    cfg.merge(OutputStreamCfg(ConfigFlags,"xAOD",ItemList=outputlist))
+    pprint( cfg.getEventAlgo("OutputStreamxAOD").ItemList )
   
     # Optionally, print the contents of the store every event
     cfg.getService("StoreGateSvc").Dump = args.dumpSG