regeneratred
Fixed name resolution for contained path.
The format was changed for scoping and now is a recursive structure
rather than a list.