Cleanup and standardize omnibus-software definitions

Fixed in 3f37f49