Fix a missing name change of a variable.
Extract dispatch process as a class.