Tidy up of JSON file and fixed name across project.
Fixed merge conflict