diff --git a/auth/ldap/classes/local/setting/admin_preset_auth_ldap_admin_setting_special_contexts_configtext.php b/auth/ldap/classes/adminpresets/adminpresets_auth_ldap_admin_setting_special_contexts_configtext.php
similarity index 90%
rename from auth/ldap/classes/local/setting/admin_preset_auth_ldap_admin_setting_special_contexts_configtext.php
rename to auth/ldap/classes/adminpresets/adminpresets_auth_ldap_admin_setting_special_contexts_configtext.php
index 435d08cd109..2391b3c2b2c 100644
--- a/auth/ldap/classes/local/setting/admin_preset_auth_ldap_admin_setting_special_contexts_configtext.php
+++ b/auth/ldap/classes/adminpresets/adminpresets_auth_ldap_admin_setting_special_contexts_configtext.php
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace auth_ldap\local\setting;
+namespace auth_ldap\adminpresets;
-use tool_admin_presets\local\setting\admin_preset_setting;
+use core_adminpresets\local\setting\adminpresets_setting;
/**
* Basic text setting, cleans the param using the admin_setting paramtext attribute.
@@ -26,7 +26,7 @@ use tool_admin_presets\local\setting\admin_preset_setting;
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_auth_ldap_admin_setting_special_contexts_configtext extends admin_preset_setting {
+class adminpresets_auth_ldap_admin_setting_special_contexts_configtext extends adminpresets_setting {
/**
* Validates the value using paramtype attribute
diff --git a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_review_setting.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php
similarity index 93%
rename from mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_review_setting.php
rename to mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php
index ec44c4b7ea8..eb9a90e2078 100644
--- a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_review_setting.php
+++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace mod_quiz\local\setting;
+namespace mod_quiz\adminpresets;
use ReflectionMethod;
-use tool_admin_presets\local\setting\admin_preset_setting;
+use core_adminpresets\local\setting\adminpresets_setting;
/**
* Admin settings class for the quiz review options.
@@ -27,7 +27,7 @@ use tool_admin_presets\local\setting\admin_preset_setting;
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_mod_quiz_admin_review_setting extends admin_preset_setting {
+class adminpresets_mod_quiz_admin_review_setting extends adminpresets_setting {
/**
* Overwrite to add the reviewoptions text
diff --git a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_browsersecurity.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_browsersecurity.php
similarity index 82%
rename from mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_browsersecurity.php
rename to mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_browsersecurity.php
index c16641ee727..d73e0a63e63 100644
--- a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_browsersecurity.php
+++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_browsersecurity.php
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace mod_quiz\local\setting;
+namespace mod_quiz\adminpresets;
-use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_with_advanced;
+use core_adminpresets\local\setting\adminpresets_admin_setting_configselect_with_advanced;
/**
* Admin settings class for the quiz browser security option.
@@ -26,7 +26,7 @@ use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_wit
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_mod_quiz_admin_setting_browsersecurity extends admin_preset_admin_setting_configselect_with_advanced {
+class adminpresets_mod_quiz_admin_setting_browsersecurity extends adminpresets_admin_setting_configselect_with_advanced {
public function set_behaviors() {
$this->behaviors['loadchoices'] = &$this->settingdata;
diff --git a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_grademethod.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_grademethod.php
similarity index 82%
rename from mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_grademethod.php
rename to mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_grademethod.php
index 3f64e525186..1393d5a30e5 100644
--- a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_grademethod.php
+++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_grademethod.php
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace mod_quiz\local\setting;
+namespace mod_quiz\adminpresets;
-use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_with_advanced;
+use core_adminpresets\local\setting\adminpresets_admin_setting_configselect_with_advanced;
/**
* Admin settings class for the quiz grading method.
@@ -26,7 +26,7 @@ use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_wit
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_mod_quiz_admin_setting_grademethod extends admin_preset_admin_setting_configselect_with_advanced {
+class adminpresets_mod_quiz_admin_setting_grademethod extends adminpresets_admin_setting_configselect_with_advanced {
public function set_behaviors() {
$this->behaviors['loadchoices'] = &$this->settingdata;
diff --git a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_overduehandling.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_overduehandling.php
similarity index 82%
rename from mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_overduehandling.php
rename to mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_overduehandling.php
index e284ff711ab..4e5745921da 100644
--- a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_overduehandling.php
+++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_overduehandling.php
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace mod_quiz\local\setting;
+namespace mod_quiz\adminpresets;
-use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_with_advanced;
+use core_adminpresets\local\setting\adminpresets_admin_setting_configselect_with_advanced;
/**
* Admin settings class for the quiz overdue attempt handling method.
@@ -26,7 +26,7 @@ use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_wit
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_mod_quiz_admin_setting_overduehandling extends admin_preset_admin_setting_configselect_with_advanced {
+class adminpresets_mod_quiz_admin_setting_overduehandling extends adminpresets_admin_setting_configselect_with_advanced {
public function set_behaviors() {
$this->behaviors['loadchoices'] = &$this->settingdata;
diff --git a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_user_image.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_user_image.php
similarity index 82%
rename from mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_user_image.php
rename to mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_user_image.php
index 0dc8268373a..2ed15506fb8 100644
--- a/mod/quiz/classes/local/setting/admin_preset_mod_quiz_admin_setting_user_image.php
+++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_setting_user_image.php
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace mod_quiz\local\setting;
+namespace mod_quiz\adminpresets;
-use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_with_advanced;
+use core_adminpresets\local\setting\adminpresets_admin_setting_configselect_with_advanced;
/**
* Admin settings class for the choices for how to display the user's image.
@@ -26,7 +26,7 @@ use tool_admin_presets\local\setting\admin_preset_admin_setting_configselect_wit
* @author Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó code
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class admin_preset_mod_quiz_admin_setting_user_image extends admin_preset_admin_setting_configselect_with_advanced {
+class adminpresets_mod_quiz_admin_setting_user_image extends adminpresets_admin_setting_configselect_with_advanced {
public function set_behaviors() {
$this->behaviors['loadchoices'] = &$this->settingdata;