diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index f0176f657e7..f8d161ca71e 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -36,13 +36,11 @@ class moodleform_mod extends moodleform {
         parent::moodleform('modedit.php');
     }
     /**
-     * Only available on moodleform_mod since defaults for forms cannot
-     * be calculated externally. You can use _customdata in here if necessary.
-     *
+     * Only available on moodleform_mod.
      *
      * @param array $default_values passed by reference
      */
-    function defaults_preprocessing(&$default_values){
+    function data_preprocessing(&$default_values){
     }
     /**
      * Load in existing data as form defaults. Usually new entry defaults are stored directly in
diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php
index 1063bbafaa8..0273df9ad85 100644
--- a/mod/choice/mod_form.php
+++ b/mod/choice/mod_form.php
@@ -90,7 +90,7 @@ class mod_choice_mod_form extends moodleform_mod {
         $this->add_action_buttons();
 	}
 
-	function defaults_preprocessing(&$default_values){
+	function data_preprocessing(&$default_values){
         if (!empty($this->_instance) && ($options = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,text'))
 	           && ($options2 = get_records_menu('choice_options','choiceid', $this->_instance, 'id', 'id,maxanswers')) ) {
             $choiceids=array_keys($options);
diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php
index 4e2b4f84daf..48d8c4dd99c 100644
--- a/mod/forum/mod_form.php
+++ b/mod/forum/mod_form.php
@@ -149,7 +149,7 @@ class mod_forum_mod_form extends moodleform_mod {
         }
 
 	}
-	function defaults_preprocessing($default_values){
+	function data_preprocessing($default_values){
         if (isset($default_values['assessed'])){
 	        $default_values['ratingtime']=($default_values['assessed']
         	                               && $default_values['assesstimestart']
diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php
index 13b0865eafa..d40b453341d 100644
--- a/mod/glossary/mod_form.php
+++ b/mod/glossary/mod_form.php
@@ -168,7 +168,7 @@ class mod_glossary_mod_form extends moodleform_mod {
 
 
 	}
-	function defaults_preprocessing($default_values){
+	function data_preprocessing($default_values){
         if (isset($default_values['assessed'])){
 	        $default_values['userating']=($default_values['assessed'])?true:false;
 	    }
diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php
index 8de878dc87b..a3d74cf96de 100644
--- a/mod/lesson/mod_form.php
+++ b/mod/lesson/mod_form.php
@@ -279,7 +279,7 @@ class mod_lesson_mod_form extends moodleform_mod {
 
 
 
-	function defaults_preprocessing(&$default_values){
+	function data_preprocessing(&$default_values){
         if (isset($default_values['conditions'])) {
             $conditions = unserialize($default_values['conditions']);
             $default_values['timespent'] = $conditions->timespent;
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 02d971d6405..0a6615cea81 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -241,7 +241,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         $this->add_action_buttons();
 	}
 
-	function defaults_preprocessing(&$default_values){
+	function data_preprocessing(&$default_values){
         if (count($this->_feedbacks)) {
             $key = 0;
             foreach ($this->_feedbacks as $feedback){
diff --git a/mod/resource/mod_form.php b/mod/resource/mod_form.php
index 34d33a73ac3..5afed4c5acf 100644
--- a/mod/resource/mod_form.php
+++ b/mod/resource/mod_form.php
@@ -47,7 +47,7 @@ class mod_resource_mod_form extends moodleform_mod {
         $this->add_action_buttons();
     }
 
-    function defaults_preprocessing(&$default_values){
+    function data_preprocessing(&$default_values){
         $this->_resinstance->setup_preprocessing($default_values);
     }