More sourcemap fixes
Improve var naming