Convert globals to new naming scheme.