clean up constant names