Cleanup and standardize omnibus-software definitions

Fixed in db1d78b