Get rid of NAME_TEXT and use proper setName()