Rename some other stupid fields and methods