changed namespace names to uppercase