Namespace and type changes for Unified API.