nomenclature cleanup and fix for bz958342 

[test]