Terminology and presentation fix.