Update for diary-lib name changes.