Fixed name resolution for containment paths