More refactoring rnaming