*9044* Clean up JSON message conventions
Merge pull request #246 from asmecher/9044-fix

*9044* Clean up JSON message conventions