Cleanup and standardize omnibus-software definitions

Updated in 78b764d