Fix bad import
Fix name of packages