diff --git a/asystgrade/classes/db/QuizQuery.php b/asystgrade/classes/db/quizquery.php
similarity index 97%
rename from asystgrade/classes/db/QuizQuery.php
rename to asystgrade/classes/db/quizquery.php
index 92417b3920303add343645768049a642bc61f9a5..4023024f77356cebf2cf9fe35c581c644e4fdc21 100755
--- a/asystgrade/classes/db/QuizQuery.php
+++ b/asystgrade/classes/db/quizquery.php
@@ -1,7 +1,7 @@
 <?php
 namespace local_asystgrade\db;
 
-class QuizQuery implements QuizQueryInterface
+class quizquery implements quizquery_interface
 {
     private $db;
 
diff --git a/asystgrade/classes/db/QuizQueryInterface.php b/asystgrade/classes/db/quizquery_interface.php
similarity index 89%
rename from asystgrade/classes/db/QuizQueryInterface.php
rename to asystgrade/classes/db/quizquery_interface.php
index 4f1f0896cb32e64ce284cb8243bd162d780f8aac..24e5f9d8dd3cb1cff3e319aa3b1fed9235222665 100755
--- a/asystgrade/classes/db/QuizQueryInterface.php
+++ b/asystgrade/classes/db/quizquery_interface.php
@@ -2,7 +2,7 @@
 
 namespace local_asystgrade\db;
 
-interface QuizQueryInterface
+interface quizquery_interface
 {
     public function get_question_attempts($qid, $slot);
 
diff --git a/asystgrade/lib.php b/asystgrade/lib.php
index 511d2f4ca2c002d1b102fe81534b2d09328efc6d..625ae406d9dcde888b171ba5de2af0862f19bc28 100755
--- a/asystgrade/lib.php
+++ b/asystgrade/lib.php
@@ -22,7 +22,7 @@
 
 use local_asystgrade\api\client;
 use local_asystgrade\api\http_client;
-use local_asystgrade\db\QuizQuery;
+use local_asystgrade\db\quizquery;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -41,7 +41,7 @@ function local_asystgrade_before_footer()
     $slot = optional_param('slot', false, PARAM_INT);
 
     if ($PAGE->url->compare(new moodle_url('/mod/quiz/report.php'), URL_MATCH_BASE) && $slot) {
-        $quizQuery = new QuizQuery();
+        $quizQuery = new quizquery();
 
         if ($quizQuery->gradesExist($qid, $slot)) {
             error_log('Grades already exist in the database.');
@@ -113,12 +113,12 @@ function pasteGradedMarks(array $grades, array $inputNames, float $maxmark): voi
 /**
  * Processes question attempts and answers to prepare for API a data to estimate answers
  *
- * @param QuizQuery $database
+ * @param quizquery $database
  * @param $question_attempts
  * @param $referenceAnswer
  * @return array
  */
-function prepare_api_data(QuizQuery $database, $question_attempts, $referenceAnswer): array
+function prepare_api_data(quizquery $database, $question_attempts, $referenceAnswer): array
 {
     $studentData = [];
 
@@ -189,16 +189,16 @@ function generate_script(array $grades, array $inputNames, float $maxmark) {
 /**
  * Autoloader registration
  */
-spl_autoload_register(function ($classname) {
-    // Check if the class name starts with our plugin's namespace
-    if (strpos($classname, 'local_asystgrade\\') === 0) {
-        // Transforming the Namespace into the Path
-        $classname = str_replace('local_asystgrade\\', '', $classname);
-        $classname = str_replace('\\', DIRECTORY_SEPARATOR, $classname);
-        $filepath  = __DIR__ . DIRECTORY_SEPARATOR . 'classes' . DIRECTORY_SEPARATOR . $classname . '.php';
-
-        if (file_exists($filepath)) {
-            require_once($filepath);
-        }
-    }
-});
+//spl_autoload_register(function ($classname) {
+//    // Check if the class name starts with our plugin's namespace
+//    if (strpos($classname, 'local_asystgrade\\') === 0) {
+//        // Transforming the Namespace into the Path
+//        $classname = str_replace('local_asystgrade\\', '', $classname);
+//        $classname = str_replace('\\', DIRECTORY_SEPARATOR, $classname);
+//        $filepath  = __DIR__ . DIRECTORY_SEPARATOR . 'classes' . DIRECTORY_SEPARATOR . $classname . '.php';
+//
+//        if (file_exists($filepath)) {
+//            require_once($filepath);
+//        }
+//    }
+//});
diff --git a/asystgrade/tests/quiz_api_test.php b/asystgrade/tests/quiz_api_test.php
index 2c6988b38e22c325b115eaa529fc4103074ae5e5..035b9d502cb149e4b55825e7ff248dd9b558b243 100755
--- a/asystgrade/tests/quiz_api_test.php
+++ b/asystgrade/tests/quiz_api_test.php
@@ -227,7 +227,6 @@ class quiz_api_test extends advanced_testcase
                 'referenceAnswer' => $referenceAnswer,
                 'studentAnswers'  => $studentAnswers
             ];
-//            var_dump($data);
 
             error_log("Data to send to API: " . print_r($data, true));
             $response = $apiClient->send_data($data);