Cleanup and standardize omnibus-software definitions

lolwut?