Rename to comply with CMSSW EDM structure