Renaming classes and instances