Fix imports for renamed modules