Changed json naming convention to be consistent