Cleanup and standardize omnibus-software definitions

facf0cc