Minor packaging updates to reflect changes.