Avoid single-letter names for readability

[#63074062]

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>