Changed global variable names