Move subclass renaming to a new script