Fixes and renames as suggested by --as-cran check.