Standardize field names and some minor comment issues. Test: No tests needed Change-Id: Ia2fd816d913239f73640656069ba9ae82e09f08a
mentioned in commit bd06bba8