refactor class names