Improve constants name