Fix -wshadow warnings
*resolved on two collisions between unrelated variables, about 80 duplicate definitions for locals.