all of these changes are primarily because the big imports collide with the deprecated types in the package objects