remove use of _r prefix on CSRs