More namespacing consistency issues