Merge "Rename register to conform to instruction format"