Rename confusingly named function

Change-Id: I685a1658ec911e28cba4c9d3d7cbaaf4f1cca22e
Merge "Rename confusingly named function"