fix imports after rename (again)