Improvved names support