diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
index ada83c32392343c870fe1ccf0f11bdba359a865e..2dbf1bcb30ec15f216fa9f4baed04c63a438e20c 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetD3PD.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 # Haifeng Li <Haifeng.Li@cern.ch>
@@ -11,8 +11,7 @@ from egammaD3PDMaker.PhotonD3PDObject         import PhotonD3PDObject
 from JetD3PDMaker.jetMETD3PDTrigger           import jetMETTriggerBitsD3PDObject
 from MuonD3PDMaker.MuonD3PDObject             import MuonD3PDObject
 from JetD3PDMaker.JetD3PDObject               import JetD3PDObject
-from TrackD3PDMaker.TrackD3PDObject           import TrackD3PDObject
-from TrackD3PDMaker.VertexD3PDObject          import PrimaryVertexD3PDObject
+from TrackD3PDMaker.xAODVertexD3PDObject      import PrimaryxAODVertexD3PDObject
 from MissingETD3PDMaker.MissingETD3PDObject   import *
 from CaloD3PDMaker.MBTSD3PDObject             import MBTSD3PDObject
 from egammaD3PDAnalysis.egammaUserDataConfig  import egammaUserDataConfig
@@ -67,10 +66,10 @@ def JetD3PD (file,
         alg +=  jetMETTriggerBitsD3PDObject(level)
         
  
-    alg += PrimaryVertexD3PDObject (**_args (1, 'PrimaryVertex', kw,
-                                             allowMissing = True,
-                                             sgkey = D3PDMakerFlags.VertexSGKey(),
-                                             prefix = 'vxp_'))    
+    alg += PrimaryxAODVertexD3PDObject (**_args (1, 'PrimaryVertex', kw,
+                                                 allowMissing = True,
+                                                 sgkey = D3PDMakerFlags.VertexSGKey(),
+                                                 prefix = 'vxp_'))    
 
 
     if rec.doTruth():
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py
index ec6e72582adbf82bae1fcec418f9ceafda61e7a4..ff6460cdcf16c4afef79b0908d1623bc1e9aa580 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/JetTileD3PD.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 
 import D3PDMakerCoreComps            
@@ -69,11 +69,11 @@ def JetTileD3PD (file,
     TrackD3PDFlags.storeVertexTrackAssociation.set_Value_and_Lock(False)
     TrackD3PDFlags.storeVertexFitQuality.set_Value_and_Lock(False)
 
-    from TrackD3PDMaker.VertexD3PDObject    import PrimaryVertexD3PDObject
-    alg += PrimaryVertexD3PDObject (**_args (0, 'PrimaryVertex', kw,
-                                             allowMissing = True,
-                                             sgkey = D3PDMakerFlags.VertexSGKey(),
-                                             prefix = 'vxp_'))    
+    from TrackD3PDMaker.xAODVertexD3PDObject    import PrimaryxAODVertexD3PDObject
+    alg += PrimaryxAODVertexD3PDObject (**_args (0, 'PrimaryVertex', kw,
+                                                 allowMissing = True,
+                                                 sgkey = D3PDMakerFlags.VertexSGKey(),
+                                                 prefix = 'vxp_'))    
 
 
     if rec.doTruth():
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py
index 4c581fe67a2bfdf6ed5ce09d07da28c4fcea4029..887df660e00acde2a01c8a0919df813e2d5817f0 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/python/ModJetD3PD.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 # Haifeng.Li@cern.ch
 
@@ -13,8 +13,7 @@ from egammaD3PDMaker.PhotonD3PDObject         import PhotonD3PDObject
 from JetD3PDMaker.jetMETD3PDTrigger           import jetMETTriggerBitsD3PDObject
 from MuonD3PDMaker.MuonD3PDObject             import MuonD3PDObject
 from JetD3PDMaker.JetD3PDObject               import JetD3PDObject
-from TrackD3PDMaker.TrackD3PDObject           import TrackD3PDObject
-from TrackD3PDMaker.VertexD3PDObject          import PrimaryVertexD3PDObject
+from TrackD3PDMaker.xAODVertexD3PDObject      import PrimaryxAODVertexD3PDObject
 from MissingETD3PDMaker.MissingETD3PDObject   import *
 from CaloD3PDMaker.MBTSD3PDObject             import MBTSD3PDObject
 from egammaD3PDAnalysis.egammaUserDataConfig  import egammaUserDataConfig
@@ -46,9 +45,9 @@ def JetD3PD (file,
     alg += ElectronD3PDObject (0)
     alg += PhotonD3PDObject (0)
     alg += MuonD3PDObject (0)
-    alg += PrimaryVertexD3PDObject (4, allowMissing = True,
-                                    sgkey = D3PDMakerFlags.VertexSGKey(),
-                                    prefix = 'vxp_')
+    alg += PrimaryxAODVertexD3PDObject (4, allowMissing = True,
+                                        sgkey = D3PDMakerFlags.VertexSGKey(),
+                                        prefix = 'vxp_')
     #-- JET
     alg += JetD3PDObject (level, sgkey='AntiKt4H1TopoJets',  include = JetIncludes, prefix='AntiKt4H1Topo_' )
     alg += JetD3PDObject (level, sgkey='AntiKt6H1TopoJets',  include = JetIncludes, prefix='AntiKt6H1Topo_'           )