Changed several '__'s to '_'s