Renaming and Reordering Classes