Change fieldnames to be consistent with rest of project