Update to match the renaming of a few libraries.