debugger: Fixing duplicate referencing
debugger: Variable renaming