Default MDC still uses listener/site terminology, but that will go away w/ 1.4.