More name-resolving