updated field naming to match project conventions