33: renamed five more fields to have consistent names.