Correct namespace names