Merge "Refactor node lookups to support multiple nodes with same name"