Change some base class names.