Made some of the field naming more consistent