Fix to the variable name changes.