diff --git a/db/services.php b/db/services.php
index 35b316a3..ba55f345 100644
--- a/db/services.php
+++ b/db/services.php
@@ -36,7 +36,7 @@
 
 $functions = [
     'mod_questionnaire_submit_questionnaire_response' => [
-        'classname' => 'mod_questionnaire_external',
+        'classname' => 'mod_questionnaire\external',
         'methodname' => 'submit_questionnaire_response',
         'classpath' => 'mod/questionnaire/externallib.php',
         'description' => 'Questionnaire submit',
diff --git a/externallib.php b/externallib.php
index 7424aeee..70371e80 100644
--- a/externallib.php
+++ b/externallib.php
@@ -24,15 +24,17 @@
  * @since      Moodle 3.0
  */
 
-use core_external\external_api;
-use core_external\external_function_parameters;
-use core_external\external_single_structure;
-use core_external\external_value;
-use core_external\external_warnings;
+namespace mod_questionnaire;
 
-
-defined('MOODLE_INTERNAL') || die;
 require_once($CFG->libdir . '/externallib.php');
+
+use external_api;
+use external_function_parameters;
+use external_single_structure;
+use external_multiple_structure;
+use external_value;
+use external_warnings;
+
 require_once($CFG->dirroot . '/mod/questionnaire/lib.php');
 require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
@@ -45,7 +47,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      Moodle 3.0
  */
-class mod_questionnaire_external extends external_api {
+class external extends external_api {
 
     /**
      * Describes the parameters for submit_questionnaire_response.
diff --git a/version.php b/version.php
index 585ee80a..ac5eb9bf 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022121600.01;  // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2022121600.02;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2022112800.00; // Moodle version (4.1.0).
 
 $plugin->component = 'mod_questionnaire';