remove org.json and set name