Changing constants names in line with coding conventions