refactor some Classes's name