Class reordering and renamming