Fixed some more common field name usages.