Name refactoring for better consistency with java packages
Authored by: jflavoie 2020-12-23
Parent: [r41]
Child: [r43]