FIX: Some (but not all) NameError clashes