rework the naming conventions of the json marshalled objects