Fix a few rpn_ that I missed before.
Merge pull request #293 from ketch/riemann_rename

Fix a few rpn_ that I missed before.