refactor names of all classes