- Fixed overeager variable rename