Tag software to terms.

Relate to issue #1870