More refactoring in RnNames