Make the namespaces uniform across all platforms.