Fix name & variable token finding