Fixed plural namespaces