Dependency upgrades and some renames.