Use executor name rather than class name (#430)

Use executor name rather than class name (#430) #14