Update to the location of the message const

And a quick word change.