Fix name look up