diff --git a/source/Willow-Bootstrap-3-Tests/Bootstrap3RadioWebViewTest.class.st b/source/Willow-Bootstrap-3-Tests/Bootstrap3RadioWebViewTest.class.st
index 501e9de..3fc76c5 100644
--- a/source/Willow-Bootstrap-3-Tests/Bootstrap3RadioWebViewTest.class.st
+++ b/source/Willow-Bootstrap-3-Tests/Bootstrap3RadioWebViewTest.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #Bootstrap3RadioWebViewTest,
-	#superclass : #SingleSelectionWebViewBehaviorTest,
+	#superclass : #SingleSelectionWebViewTest,
 	#category : #'Willow-Bootstrap-3-Tests-WebViews'
 }
 
diff --git a/source/Willow-Bootstrap-4-Tests/Bootstrap4RadioWebViewTest.class.st b/source/Willow-Bootstrap-4-Tests/Bootstrap4RadioWebViewTest.class.st
index 259bb82..f366523 100644
--- a/source/Willow-Bootstrap-4-Tests/Bootstrap4RadioWebViewTest.class.st
+++ b/source/Willow-Bootstrap-4-Tests/Bootstrap4RadioWebViewTest.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #Bootstrap4RadioWebViewTest,
-	#superclass : #SingleSelectionWebViewBehaviorTest,
+	#superclass : #SingleSelectionWebViewTest,
 	#category : #'Willow-Bootstrap-4-Tests-WebViews'
 }
 
diff --git a/source/Willow-Bootstrap/BootstrapCheckboxWebView.class.st b/source/Willow-Bootstrap/BootstrapCheckboxWebView.class.st
index 5de0652..971c9da 100644
--- a/source/Willow-Bootstrap/BootstrapCheckboxWebView.class.st
+++ b/source/Willow-Bootstrap/BootstrapCheckboxWebView.class.st
@@ -3,7 +3,7 @@ I'm a checkbox specifically designed to use the html structure required by Boots
 "
 Class {
 	#name : #BootstrapCheckboxWebView,
-	#superclass : #BinaryChoiceWebViewBehavior,
+	#superclass : #BinaryChoiceWebView,
 	#instVars : [
 		'commandToComponent',
 		'interactionInterpreter',
@@ -80,7 +80,7 @@ BootstrapCheckboxWebView >> initializeLabeledAccordingTo: anOptionalLabel applyi
 
 	labelOptional := anOptionalLabel.
 	commandToComponent := aCommandToComponent.
-	interactionInterpreter := EventInterpreterDispatcher defaultingToClickHidden.
+	interactionInterpreter := SingleEventInterpreterDispatcher defaultingToClickHidden.
 	identifierAssigner := IdentifierAssigner prefixedBy: 'checkbox'.
 	isChecked := true
 ]
diff --git a/source/Willow-Bootstrap/BootstrapRadioWebView.class.st b/source/Willow-Bootstrap/BootstrapRadioWebView.class.st
index 98964de..716b725 100644
--- a/source/Willow-Bootstrap/BootstrapRadioWebView.class.st
+++ b/source/Willow-Bootstrap/BootstrapRadioWebView.class.st
@@ -3,7 +3,7 @@ I'm a radio button group specifically designed to use the html structure require
 "
 Class {
 	#name : #BootstrapRadioWebView,
-	#superclass : #SingleSelectionWebViewBehavior,
+	#superclass : #AbstractSingleSelectionWebView,
 	#instVars : [
 		'interactionInterpreter',
 		'renderingBlock',
@@ -13,6 +13,12 @@ Class {
 	#category : #'Willow-Bootstrap-WebViews'
 }
 
+{ #category : #testing }
+BootstrapRadioWebView class >> isAbstract [
+
+	^ self = BootstrapRadioWebView
+]
+
 { #category : #'instance creation' }
 BootstrapRadioWebView class >> renderingWith: aRenderingBlock applyingToLabel: aLabelCommand applyingToInput: anInputCommand [
 
@@ -28,7 +34,7 @@ BootstrapRadioWebView >> initializeRenderingWith: aRenderingBlock applyingToLabe
 	renderingBlock := aRenderingBlock.
 	labelCommand := aLabelCommand.
 	inputCommand := anInputCommand.
-	interactionInterpreter := EventInterpreterDispatcher defaultingToChange
+	interactionInterpreter := SingleEventInterpreterDispatcher defaultingToChange
 ]
 
 { #category : #'private - accessing' }