Fixing variable names after upstream changes