Cleanup and standardize omnibus-software definitions

Fixed in 394802f