x86: unify sets of register names as in prior change for x86-64