Issue #16191: Fix up references to renamed variables
1 file changed