fix some namespaces