Refactored the names used in the JSON API to be more meaningful.