CON-549: Changed i18n message keys