Fix more namespaces.