Fix global var names