Correct R H O to RHO, etc.
Fix exception due to CallSelection refactoring