Fix up global variable names.