Fix incorrect function names.

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

Change-Id: I3e815bcd21d6ad0070c5c49c474b86b2c205c743