Rename some message variables for more clarity.