Rename a method, cleanup lint errors.