Change to what's supposedly the real RC classnames