Updated dispatch class names to avoid some confusion