Improve constant name