Fix namespace prefixing