Minor renaming of fields and methods