Fixed overlapping variable names