Hotfixing the namespace issues.