Clean up namespace names