diff --git a/source/Willow-JQueryUI-Tests/JQueryUIWebInteractionInterpreterTest.class.st b/source/Willow-JQueryUI-Tests/JQueryUIWebInteractionInterpreterTest.class.st
index 57e1b04..0aa5975 100644
--- a/source/Willow-JQueryUI-Tests/JQueryUIWebInteractionInterpreterTest.class.st
+++ b/source/Willow-JQueryUI-Tests/JQueryUIWebInteractionInterpreterTest.class.st
@@ -27,7 +27,7 @@ JQueryUIWebInteractionInterpreterTest >> testAcceptContainerDialog [
 
 	| interpreter html |
 
-	interpreter := EventInterpreterDispatcher defaultingToClick trigger.
+	interpreter := SingleEventInterpreterDispatcher defaultingToClick trigger.
 	interpreter acceptContainerDialog.
 	html := self
 		apply: interpreter
@@ -69,7 +69,7 @@ JQueryUIWebInteractionInterpreterTest >> testToggleCssClassOnComponentsWithClass
 
 	| interpreter html |
 
-	interpreter := EventInterpreterDispatcher defaultingToClick trigger.
+	interpreter := SingleEventInterpreterDispatcher defaultingToClick trigger.
 	interpreter
 		updateCssClasses: [ :element | element toggleClass: Classification >> #loading withEffect: #bounce ]
 		onElementsMatching: [ :canvas | canvas jQuery class: Classification >> #willow ].
diff --git a/source/Willow-JQueryUI/JQueryUIButtonSetWebView.class.st b/source/Willow-JQueryUI/JQueryUIButtonSetWebView.class.st
index 675aa89..9a95a99 100644
--- a/source/Willow-JQueryUI/JQueryUIButtonSetWebView.class.st
+++ b/source/Willow-JQueryUI/JQueryUIButtonSetWebView.class.st
@@ -4,7 +4,7 @@ https://api.jqueryui.com/buttonset/
 "
 Class {
 	#name : #JQueryUIButtonSetWebView,
-	#superclass : #SingleSelectionWebViewBehavior,
+	#superclass : #AbstractSingleSelectionWebView,
 	#instVars : [
 		'commandToComponent',
 		'interactionInterpreter',
@@ -26,7 +26,7 @@ JQueryUIButtonSetWebView >> initializeApplying: aCommandToComponent obtainingCom
 
 	commandToComponent := aCommandToComponent.
 	elementCommandProvider := aLabelCommandProvider.
-	interactionInterpreter := EventInterpreterDispatcher defaultingToChange
+	interactionInterpreter := SingleEventInterpreterDispatcher defaultingToChange
 ]
 
 { #category : #configuring }
diff --git a/source/Willow-JQueryUI/JQueryUIDialogWebView.class.st b/source/Willow-JQueryUI/JQueryUIDialogWebView.class.st
index d51205c..cf1b66c 100644
--- a/source/Willow-JQueryUI/JQueryUIDialogWebView.class.st
+++ b/source/Willow-JQueryUI/JQueryUIDialogWebView.class.st
@@ -100,7 +100,7 @@ JQueryUIDialogWebView >> initializeCommandToComponentWith: aCommand [
 { #category : #initialization }
 JQueryUIDialogWebView >> initializeInteractionInterpreter [
 
-	interactionInterpreter := EventInterpreterDispatcher
+	interactionInterpreter := SingleEventInterpreterDispatcher
 		interpretingByDefault: 'add'
 		configuring: ( WebInteractionInterpreter forEvaluationOf: #add: withAll: #() )
 ]