diff --git a/backup/moodle2/backup_plagiarism_pchkorg_plugin.class.php b/backup/moodle2/backup_plagiarism_pchkorg_plugin.class.php
index af05379..704b45a 100644
--- a/backup/moodle2/backup_plagiarism_pchkorg_plugin.class.php
+++ b/backup/moodle2/backup_plagiarism_pchkorg_plugin.class.php
@@ -33,28 +33,28 @@ class backup_plagiarism_pchkorg_plugin extends backup_plagiarism_plugin {
         // Connect the visible container ASAP.
         $plugin->add_child($pluginwrapper);
 
-        $configs = new backup_nested_element('pchkorg_configs');
-        $config = new backup_nested_element('pchkorg_config', ['id'], ['name', 'value']);
+        $configs = new backup_nested_element('pchkorg_activities_configs');
+        $config = new backup_nested_element('pchkorg_activities_config', ['id'], ['name', 'value']);
         $pluginwrapper->add_child($configs);
         $configs->add_child($config);
         $config->set_source_table('plagiarism_pchkorg_config', ['cm' => backup::VAR_PARENTID]);
 
         // Now information about files to module.
-        $ufiles = new backup_nested_element('pchkorg_files');
-        $ufile = new backup_nested_element('pchkorg_file', ['id'], [
+        $files = new backup_nested_element('pchkorg_files');
+        $file = new backup_nested_element('pchkorg_file', ['id'], [
             'cm', 'fileid', 'userid', 
             'state', 'score', 'created_at', 
             'textid', 'reportid', 'signature', 
             'attempt', 'itemid'
         ]);
 
-        $pluginwrapper->add_child($ufiles);
-        $ufiles->add_child($ufile);
+        $pluginwrapper->add_child($files);
+        $files->add_child($file);
 
         // To know if we are including userinfo.
         $userinfo = $this->get_setting_value('userinfo');
         if ($userinfo) {
-            $ufile->set_source_table('plagiarism_pchkorg_files', ['cm' => backup::VAR_PARENTID]);
+            $file->set_source_table('plagiarism_pchkorg_files', ['cm' => backup::VAR_PARENTID]);
         }
 
         return $plugin;
@@ -66,21 +66,16 @@ class backup_plagiarism_pchkorg_plugin extends backup_plagiarism_plugin {
      * @return mixed
      */
     public function define_course_plugin_structure() {
-        // Define the virtual plugin element without conditions as the global class checks already.
         $plugin = $this->get_plugin_element();
-
-        // Create one standard named plugin element (the visible container).
         $pluginwrapper = new backup_nested_element($this->get_recommended_name());
-
-        // Connect the visible container ASAP.
         $plugin->add_child($pluginwrapper);
-        // Save id from pchkorg course.
-        $unconfigs = new backup_nested_element('pchkorg_configs');
-        $unconfig = new backup_nested_element('pchkorg_config', ['id'], ['plugin', 'name', 'value']);
-        $pluginwrapper->add_child($unconfigs);
-        $unconfigs->add_child($unconfig);
-        $unconfig->set_source_table('config_plugins', [
-            'name' => backup::VAR_PARENTID, 'plugin' => 'plagiarism',
+
+        $configs = new backup_nested_element('pchkorg_configs');
+        $config = new backup_nested_element('pchkorg_config', ['id'], ['plugin', 'name', 'value']);
+        $pluginwrapper->add_child($configs);
+        $configs->add_child($config);
+        $config->set_source_table('config_plugins', [
+            'name' => backup::VAR_PARENTID, 'plugin' => backup_helper::is_sqlparam('plagiarism'),
         ]);
 
         return $plugin;
diff --git a/backup/moodle2/restore_plagiarism_pchkorg_plugin.class.php b/backup/moodle2/restore_plagiarism_pchkorg_plugin.class.php
index 340055a..36e4fe7 100644
--- a/backup/moodle2/restore_plagiarism_pchkorg_plugin.class.php
+++ b/backup/moodle2/restore_plagiarism_pchkorg_plugin.class.php
@@ -19,7 +19,7 @@ defined('MOODLE_INTERNAL') || die();
 
 class restore_plagiarism_pchkorg_plugin extends restore_plagiarism_plugin {
 
-    public function process_pchkorgconfig($data) {
+    public function process_pchkorg_config($data) {
         $data = (object) $data;
 
         set_config($this->task->get_courseid(), $data->value, $data->plugin);
@@ -49,9 +49,9 @@ class restore_plagiarism_pchkorg_plugin extends restore_plagiarism_plugin {
     protected function define_course_plugin_structure() {
         $paths = [];
 
-        // Add own format stuff.
         $elename = 'pchkorg_config';
-        $elepath = $this->get_pathfor('pchkorg_configs/pchkorg_config'); // We used get_recommended_name() so this works.
+        $elepath = $this->get_pathfor('/pchkorg_configs/pchkorg_config'); 
+
         $paths[] = new restore_path_element($elename, $elepath);
 
         return $paths; // And we return the interesting paths.
@@ -62,7 +62,7 @@ class restore_plagiarism_pchkorg_plugin extends restore_plagiarism_plugin {
         $paths = [];
 
         $elename = 'pchkorgconfigmod';
-        $elepath = $this->get_pathfor('pchkorg_configs/pchkorg_config');
+        $elepath = $this->get_pathfor('/pchkorg_activities_configs/pchkorg_activities_config');
         $paths[] = new restore_path_element($elename, $elepath);
 
         $elename = 'pchkorgfiles';
diff --git a/version.php b/version.php
index 2b9463f..61d977a 100644
--- a/version.php
+++ b/version.php
@@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die();
 if (!isset($plugin)) {
     $plugin = new stdClass();
 }
-$plugin->version = 2022110418;
+$plugin->version = 2022110716;
 $plugin->requires = 2020061501; // Requires Moodle 3.9 .
-$plugin->release = 'v3.13.1';
+$plugin->release = 'v3.13.2';
 $plugin->component = 'plagiarism_pchkorg';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(