first part of renaming and JSON cleaning