actually. NACK on this commit. Rename variable patches shouldn't introduce different logic. Can you rename the variables and then change these code paths in a second commit?