Bug 23382: (follow-up) Clarify variable names