fix imports due to package name changes