Changed names of fields - removed underscore