Update strings

Update strings to make them easier to understand.

Change-Id: Iccda2bf85268364ac9bc807d286e525bb6017e17