Changed resolveNames map to have a string key.