Fix JSON property naming issues