It follows better the namespacing of the algorithm
Co-authored-by: Kévin Commaille <zecakeh@tedomum.fr>