changed names
merged json files and made some name changes