Chanced name fields to Camelcase

This is neccesary to script the javascript in ‘strict mode’
Using underscore is bad practice