Use singular instead of plural for namespace