THNGLI-42
Rename fields as described in the spec
Modified thng-li to match the new spec.
Merge branch 'master' of https://github.com/evrythng/evrythng-tools