terminology fixes.