[refac] update the name of the union type so it won't collide with the structure
[fix] post-cherry-pick fix
Merge pull request #82 from xively/fix_struct_name_collision

Fix struct name collision