Bug fixes in my refactored RnNames code.