Reinstated to previous methods, so that the API is preserved.

Change-Id: I597b4386b022deb35156802b63b6a572b16b45e0
Fixed a few spelling errors

Change-Id: Ic87eb49a97d2467d1ec2f86eca75f24033859778