Modified Json names and output tables