R: more renaming, #553