some commonsensical renaming