React to upstream renaming.