I simply use defines to make the code readable by replacing text as shown above. The new register names make a little more sense but with thing that require multiple bits I get fed up with looking them up so I just define what i want to do and it is replaced by the code.