change of naming convention for HW2