Renamed 'mark' functions to make them more consistent.

No match.