modify strings

Change-Id: Icd917ea0255c0322ab2a370c3767d12849c069eb