Implemented correct keys for default (english) language messages.json file and mapping.json.