Changed constants names