rhbz1001405 - wording change and minor refactor