Replace hardcoded namespaces