Fixing variables name

We need to prefix variables, otherwise we have clashes