Made namespaces consistent