Fix account function names.

Change-Id: Idfbba4676d7c8b00265bdad904574ad0428b3e65