Renaming to get stuff generic