minor change: simplify class names
Fully support multiple epoch engines/visitors.