Fix base class names