Fix conflicting variable names