This constants were introduced during my work on my changes. I will change my constants to use earlier names.