fix

-fixed overlapping variable names