NU-01(hj): - Renamed constants to be consistent in naming convention