ref #4611 Refactor string constants