Correction of NameErrors.