R: renaming some constructors, preparing for make