Changes to reflect renaming of DAWN packages