Rename base class, comments