Rename class, formatting