Update imports for renamed modules