Fix some namespaces