That's probably how I would do it if I were starting from scratch - it makes sense to me from a "what does the label actually correspond to" standpoint. As it was, it took me over an hour of wrestling with the entertainment center just to swap mains and rear surrounds, so I didn't try to change anything else.