Renaming methods to comply with upstream