improved name lookup