Rename two variables for readability

EV-126