Tweaks to name resolution in API
Merge branch 'master' of https://github.com/iotic-labs/demo