|#1486|+Riya| Refactored message keys.