Rename member functions. #857