This is a folloup of: !66281 (merged) This time xAOD classes got the desired names.
FI @ncalace @toyamaza @wolter @emoyse @pagessin @adye @asalzbur @goetz