fix imports

Thomas Morinrequested to merge
fix-imports into main

!7 (merged) and !8 (merged) merged in parallel, without !7 (merged) getting the module name changes required by !8 (merged)

Edited by Thomas Morin

Merge request reports