Changed naming of upmixing options in Config to "5.1 surround" and "7.1 surround"