Some modules were renamed, so modify the imports accordingly