Account for changes in Dido.
Rename packages.