Added the correct naming convention on the new fields