Updated constants names