update @globals to new conventions