modify strings

Change-Id: I74e70ff850d9cf3cbbf112eab3a7eb8a93285784