nomenclature cleanup and fix for bz958342
Merge pull request #2325 from rajatchopra/master

Merged by openshift-bot