New non-clashing function names.
Also upgraded to roxygen2 4.0.0