Namespace changes for Unified API.
Merge pull request #148 from lothrop/master

Namespace and type changes for Unified API.