Fix some typos and adjust capitalization

Change-Id: I61cf108f9746fc44a08d83e11d44ed1007a6a1fa