Fixed global name corruption