Cleanup and standardize omnibus-software definitions

Fixed in 8fe98ac