diff --git a/mod/assignment/mod_form.php b/mod/assignment/mod_form.php
index e8147fa9768..c4651b08553 100644
--- a/mod/assignment/mod_form.php
+++ b/mod/assignment/mod_form.php
@@ -42,7 +42,7 @@ class mod_assignment_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/chat/mod_form.php b/mod/chat/mod_form.php
index b3813e8adb1..21762570a5a 100644
--- a/mod/chat/mod_form.php
+++ b/mod/chat/mod_form.php
@@ -17,7 +17,7 @@ class mod_chat_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php
index 95a16dde0f3..489e33d65e1 100644
--- a/mod/choice/mod_form.php
+++ b/mod/choice/mod_form.php
@@ -19,7 +19,7 @@ class mod_choice_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php
index a2aa9752e39..c5f71206306 100644
--- a/mod/data/mod_form.php
+++ b/mod/data/mod_form.php
@@ -19,7 +19,7 @@ class mod_data_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/folder/mod_form.php b/mod/folder/mod_form.php
index f0705a19ab7..3fe54d53488 100644
--- a/mod/folder/mod_form.php
+++ b/mod/folder/mod_form.php
@@ -41,7 +41,7 @@ class mod_folder_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $this->add_intro_editor($config->requiremodintro);
diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php
index c69547e480b..eb2d03ccb9c 100644
--- a/mod/forum/mod_form.php
+++ b/mod/forum/mod_form.php
@@ -41,7 +41,7 @@ class mod_forum_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
         $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php
index a27d066b482..fe714888736 100644
--- a/mod/glossary/mod_form.php
+++ b/mod/glossary/mod_form.php
@@ -19,7 +19,7 @@ class mod_glossary_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
@@ -127,7 +127,7 @@ class mod_glossary_mod_form extends moodleform_mod {
 //-------------------------------------------------------------------------------
 
         $this->standard_grading_coursemodule_elements();
-        
+
         $this->standard_coursemodule_elements();
 
 //-------------------------------------------------------------------------------
diff --git a/mod/imscp/mod_form.php b/mod/imscp/mod_form.php
index c4115820495..450ab5d4543 100644
--- a/mod/imscp/mod_form.php
+++ b/mod/imscp/mod_form.php
@@ -42,7 +42,7 @@ class mod_imscp_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $this->add_intro_editor($config->requiremodintro);
diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php
index a79ded63bf5..b0dbfa7f15d 100644
--- a/mod/lesson/mod_form.php
+++ b/mod/lesson/mod_form.php
@@ -86,7 +86,7 @@ class mod_lesson_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/page/mod_form.php b/mod/page/mod_form.php
index 919bb46c187..9ec12872d87 100644
--- a/mod/page/mod_form.php
+++ b/mod/page/mod_form.php
@@ -44,7 +44,7 @@ class mod_page_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $this->add_intro_editor($config->requiremodintro);
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index e7f5dba71f5..fa892be4d61 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -53,7 +53,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php
index d3f24af6ce0..c5e73d36bdd 100644
--- a/mod/resource/mod_form.php
+++ b/mod/resource/mod_form.php
@@ -52,7 +52,7 @@ class mod_resource_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $this->add_intro_editor($config->requiremodintro);
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index 0b191e41d90..1cfff5c29af 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -29,7 +29,7 @@ class mod_scorm_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/survey/mod_form.php b/mod/survey/mod_form.php
index 2f96a4d0f97..d12ad226206 100644
--- a/mod/survey/mod_form.php
+++ b/mod/survey/mod_form.php
@@ -21,7 +21,7 @@ class mod_survey_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
 
diff --git a/mod/url/mod_form.php b/mod/url/mod_form.php
index 255199dfe8d..ec153125a9d 100644
--- a/mod/url/mod_form.php
+++ b/mod/url/mod_form.php
@@ -42,7 +42,7 @@ class mod_url_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $this->add_intro_editor($config->requiremodintro);
diff --git a/mod/workshop/mod_form.php b/mod/workshop/mod_form.php
index e316a158f9a..bb8e515dc1e 100644
--- a/mod/workshop/mod_form.php
+++ b/mod/workshop/mod_form.php
@@ -55,7 +55,7 @@ class mod_workshop_mod_form extends moodleform_mod {
         if (!empty($CFG->formatstringstriptags)) {
             $mform->setType('name', PARAM_TEXT);
         } else {
-            $mform->setType('name', PARAM_CLEAN);
+            $mform->setType('name', PARAM_CLEANHTML);
         }
         $mform->addRule('name', null, 'required', null, 'client');
         $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');