Spelling related changes but more to do

Change-Id: I236570415bf81d221e12c8c60249e2cb3cc936dc