fix Namespaces Consistence