Correct namespace issues.