Renumbered and renamed classes