[IMP/FIX] Full renaming of the ADE class + little fix for encrypted parameters