Added automatic fallback to English namespace names