Change mapping and json object keys
Merge branch 'master' of https://github.com/Dockbite/ttb-parser