Fixed typo and changed some strings

Change-Id: I761bb622926d3e79a79fe26c3630ab05b43c3de3