rename defs and clas