Make fix for new package name schema.