Standardize naming of global variables