Renaming vars for cran checks.