tweaks for the json renaming