Refactor some class names