Try out replacing "executor" for "dispatcher"

Suggestion from Doug

Change-Id: I2b09c74877342743607764c4452678c07eca8850