Port: SI-7624 s/new{Term,Type}Name/{Term,Type}Name/
New targets for faster pr validation