Rename some internal variables and methods.