NAME_LEN logic removed