Rename system non-terminal to rset