JSON renaming to follow new API