Fix `NameError`'s