Follow-up on @slackito's suggestion about the naming of the variable and discussion with @aengelke in #187196