CODE-30: Change hardcoded messages to use message bundle strings.