Rename base class and methods. Fix comments and docs.