Renamed the main two base classes