Improve naming of global vars