modify strings

Change-Id: I34f2da86f497799e46943abd7c5dffa19f2c2a81