Description
Using better names has been presented under several PRs. However, it is a fairly intrusive change and confused the logical change(s) that the old PRs were trying to achieve.
With this issue the names are changed separately and ongoing issues DISPATCH-1708 and DISPATCH-1709 may enjoy the improvement.