Fixed reference to old method names

Change-Id: I00d083b82bcacbe18750d5826007e4f24726666c
Merge "Fixed reference to old method names"