Fix conflict variable name