modify strings

Change-Id: Id01dce1247aaf7674c17b7198ccb6c93c0e08883