Changes to reflect scoped package support.