additional jargon fixes, for project (re-apply some changes from 2013-11-13 plus additional).