Fix dispatcher namespacing.