Rather large refactoring of RnNames.