Change filenameFormat for pfsObject or update datamodel.txt

I noticed that the filename format for pfsObject (and pfsSingle and pfsReference as well) described in drp.py is

"pfsObject-%(catId)03d-%(tract)05d-%(patch)s-%(objId)016x-%(nVisit)03d-%(pfsVisitHash)016x.fits"

, but, according to datamodel.txt, it should be

"pfsObject-%05d-%s-%03d-%016x-%03d-0x%016x.fits" % (tract, patch, catId, objId, nVisit % 1000, pfsVisitHash)

(I mean the location of catId is different)

Could tell me which one is correct?