Adjusting package references to reflect recent name changes.