fix the namespace issues