Reapply class renames