Changing names of some globals