This is the first part of the variable shadow fixes.Basically it consists of renaming the variables in collision with the global ones, with the minimum change in the semantics.
make check pass all the tests.
regards,Ranier Vilela