Fix name without with helper lookup