Rename variable to better reflect its contents
Remove comments about API removal
Rename variable for clarity
Rename variable for clarity
Rename variable for compactness
fixup! Rename variable for clarity