Repairing name lookup