Bug 24511: Update variable names to avoid confusion