Refactoring: better names for Mark and Ditch directives.
Naming convention.