Renamed main client class and base model class