Renaming classes according to specification