Cleanup and standardize omnibus-software definitions

https?