Rename classes, refactor styles