Revert "Split lookup_name() and create a new functiong called"