Minor Class renaming