Upgrade some deprecated paths.
synced