Naming refactoring of 'ADL_15_xxx' into 'ADL_2_xxx'