constant name cleanup