This commit addresses comments from aosp/963067 and aosp/959617.
No behavioral/functional changes were made, only renames and minor style
nits addressed.
Bug: 72950854
Test: Ran on devices, working
Change-Id: I1702b91e245412f0142e9e47b7fb373b9b4e8126