Fix more import package names after bundle split