[CLEANUP] Simplify variable name and fix some comments

Change-Id: Ic6d9b8b3d0ba5f21f806e2a7b9a515e9933cdfb7
Releases: 0.4.0
Resolves: #61197