tweak names in json generation