Minor class rearrangement and renaming