Part 2 and 3

for render_json renaming