Added 'uniq comp name' in message body