BS-7784, change messages according to nige review