Rename vars to avoid name collisions