36d4c3f02b
No functional changes; just a rename of the relevant class/method/parameters. Change-Id: I55d9ef7c2c17892b0bc99f5da622c281e006b53e