refine function location and some typo/naming correction

Non-functional change.

Test: built, flashed, run test
Change-Id: I34a6e14b8efb2d33ff2000b534d17277a4b9d149
1 file changed