Better variable names to help avoid accidental variable shadowing/overriding

Also fixed some bugs with teleporting between zones