ADEN-1318 CR update: reference constants by a class name