Fix for namespace to have valid prefix