Fix incorrect function names.

Global search & replace incorrectly changed these names in
4a9da28ace680369340ef0310e8c7cd6cdd46185, and it didn't work.

Change-Id: I7465f5e52a6dc3ad3475ac66e77847ec66f8b7d8