R: some renaming fixes