Adjusted namespaces with paths