Hopefully nearly done with these mnemonic fixes.