Editor review, round 3: Fix misnamed variables after conversion