Edit messages

Change-Id: I0362a2db0ab42d743573075f23755106d711e71a
Signed-off-by: Iliyan Velichkov <iliyan.velichkov@sap.com>