SI-7624 Replace new{Term,Type}Name with {Term,Type}Name