Subclass renaming to avoid confusion