Class renaming/cleaning.