Moved constants names