Fixes #408: Multiple dictionary mappings to the same node needed special naming
Merge pull request #409 from delving/issue408

Fixes #408: Multiple dictionary mappings to the same node needed special...