Fix to-abstract-terms producing wrong terms.
Update generated naming file.