To be merged at the same time as aidge_core!16 (merged).
Changes here are very minor (just some renamings).
