Renaming to reflect generality