A better AUTOSAR ARXML folding and ShortName follower