Changed more references to V2
Merge branch 'dev3.0' of https://github.com/dimitri-argans/DIMITRI into dev3.0