Cleaning up the json naming convention