Refactor namespaces names