Refactor class names