Rename classes and refactor styles