Return more conformative json keywords

This will break the API!

But I'm too lazy to bump the version yet.

Change-Id: I1641086758b9fba5eb27497e38ca6b57ee3171d8