diff --git a/com_sermonspeaker/admin/models/forms/serie.xml b/com_sermonspeaker/admin/models/forms/serie.xml
index 90ab3a3f4..c9d6ea8fc 100644
--- a/com_sermonspeaker/admin/models/forms/serie.xml
+++ b/com_sermonspeaker/admin/models/forms/serie.xml
@@ -51,7 +51,8 @@
 			label="JGLOBAL_DESCRIPTION"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"/>
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+		/>
 
 		<field
 			name="language"
diff --git a/com_sermonspeaker/admin/models/forms/sermon.xml b/com_sermonspeaker/admin/models/forms/sermon.xml
index 735ff9bda..ef626c536 100644
--- a/com_sermonspeaker/admin/models/forms/sermon.xml
+++ b/com_sermonspeaker/admin/models/forms/sermon.xml
@@ -22,7 +22,7 @@
 			description="COM_SERMONSPEAKER_FIELD_NOTES_DESC"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field name="state"
diff --git a/com_sermonspeaker/admin/models/forms/speaker.xml b/com_sermonspeaker/admin/models/forms/speaker.xml
index 1f0d7c605..3b004acb5 100644
--- a/com_sermonspeaker/admin/models/forms/speaker.xml
+++ b/com_sermonspeaker/admin/models/forms/speaker.xml
@@ -52,13 +52,15 @@
 			label="COM_SERMONSPEAKER_FIELD_INTRO_LABEL"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"/>
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+		/>
 
 		<field name="bio" type="editor"
 			label="COM_SERMONSPEAKER_FIELD_BIO_LABEL"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"/>
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+		/>
 
 		<field
 			name="language"
diff --git a/com_sermonspeaker/site/models/forms/serie.xml b/com_sermonspeaker/site/models/forms/serie.xml
index 6c15ce471..3f3b850ca 100644
--- a/com_sermonspeaker/site/models/forms/serie.xml
+++ b/com_sermonspeaker/site/models/forms/serie.xml
@@ -56,7 +56,7 @@
 			label="JGLOBAL_DESCRIPTION"
 			hiddenLabel="true"
 			buttons="true"
-			filter="ComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 			hide="pagebreak,readmore"
 		/>
 
diff --git a/com_sermonspeaker/site/models/forms/sermon.xml b/com_sermonspeaker/site/models/forms/sermon.xml
index 7d20f8d79..f96f10d48 100644
--- a/com_sermonspeaker/site/models/forms/sermon.xml
+++ b/com_sermonspeaker/site/models/forms/sermon.xml
@@ -89,7 +89,7 @@
 			label="COM_SERMONSPEAKER_FIELD_NOTES_LABEL"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field
diff --git a/com_sermonspeaker/site/models/forms/speaker.xml b/com_sermonspeaker/site/models/forms/speaker.xml
index 516bf6f7d..67c4dc4bf 100644
--- a/com_sermonspeaker/site/models/forms/speaker.xml
+++ b/com_sermonspeaker/site/models/forms/speaker.xml
@@ -56,7 +56,7 @@
 			label="COM_SERMONSPEAKER_FIELD_INTRO_LABEL"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field
@@ -65,7 +65,7 @@
 			label="COM_SERMONSPEAKER_FIELD_BIO_LABEL"
 			buttons="true"
 			hide="pagebreak,readmore"
-			filter="ComponentHelper::filterText"
+			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
 		/>
 
 		<field