Rename some fields and methods