made namespaces consistent