Revert "Use the term software more consistently"

This reverts commit 7aefdbf7bd023558bcf824da677923957a0a8bed as gnome-software
now exists.