Fixing namespace misuse