Merge "Fix typo for system message name"