[refac] update the name of the union type so it won't collide with the structure
Merge pull request #84 from xively/fix_type_clash

[refac] update the name of the union type so it won't collide with the structure