refactor some class names