Core API wording: rename CompValue pt.4 (#702).

Just rename variables and adapt comments.

See #702.