Fix some left over artifacts of namespaces