2nd part of web renaming and JSON simplification