Follow-up for the pull request #737

More commonly used strings converted into constants, and some strings are replaced with previously extracted constants.