Rename base classes