diff --git a/app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.php b/app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.php
index 90673bda..207dad2c 100644
--- a/app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.php
+++ b/app/Classes/Modules/HelpMenu/ControllersLogic/FetchHelpMenuQuestionLogic.php
@@ -5,7 +5,7 @@ namespace App\Classes\Modules\HelpMenu\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestion;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
+use App\Classes\Modules\HelpMenu\Processors\FetchFirstQuestionQAProcessor;
 use App\Http\Resources\HelpMenuQuestionResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -28,18 +28,18 @@ class FetchHelpMenuQuestionLogic extends AbstractControllerLogic
     /** @var CanFetchHelpMenuQuestion */
     private $canFetchHelpMenuQuestion;
 
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
+    /** @var FetchFirstQuestionQAProcessor */
+    private $fetchFirstQuestionQAProcessor;
 
     /**
      * FetchHelpMenuQuestionLogic constructor.
      * @param CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
+     * @param FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor
      */
-    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor)
+    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor)
     {
         $this->canFetchHelpMenuQuestion = $canFetchHelpMenuQuestion;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
+        $this->fetchFirstQuestionQAProcessor = $fetchFirstQuestionQAProcessor;
     }
 
 
@@ -54,7 +54,7 @@ class FetchHelpMenuQuestionLogic extends AbstractControllerLogic
 
         $userId = Auth::user()->id;
 
-        $query = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
+        $query = $this->fetchFirstQuestionQAProcessor->execute($request);
 
         return $this->resourceResponse(new HelpMenuQuestionResource($query, $userId));
     }
diff --git a/app/Classes/Modules/HelpMenu/ControllersLogic/SubmitQAQuestionsLogic.php b/app/Classes/Modules/HelpMenu/ControllersLogic/SubmitQAQuestionsLogic.php
index 977ebc84..c46532c8 100644
--- a/app/Classes/Modules/HelpMenu/ControllersLogic/SubmitQAQuestionsLogic.php
+++ b/app/Classes/Modules/HelpMenu/ControllersLogic/SubmitQAQuestionsLogic.php
@@ -3,7 +3,7 @@
 namespace App\Classes\Modules\HelpMenu\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\HelpMenu\Processors\SaveHelpMenuAnswerProcessor;
+use App\Classes\Modules\HelpMenu\Processors\SaveAnswerProcessor;
 use App\Classes\Modules\HelpMenu\Processors\UserSourceForQAProcessor;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -24,20 +24,20 @@ class SubmitQAQuestionsLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var SaveHelpMenuAnswerProcessor */
-    private $saveHelpMenuAnswerProcessor;
+    /** @var SaveAnswerProcessor */
+    private $saveAnswerProcessor;
 
     /** @var UserSourceForQAProcessor */
     private $userSourceForQAProcessor;
 
     /**
      * SubmitQAQuestionsLogic constructor.
-     * @param SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor
+     * @param SaveAnswerProcessor $saveAnswerProcessor
      * @param UserSourceForQAProcessor $userSourceForQAProcessor
      */
-    public function __construct(SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor, UserSourceForQAProcessor $userSourceForQAProcessor)
+    public function __construct(SaveAnswerProcessor $saveAnswerProcessor, UserSourceForQAProcessor $userSourceForQAProcessor)
     {
-        $this->saveHelpMenuAnswerProcessor = $saveHelpMenuAnswerProcessor;
+        $this->saveAnswerProcessor = $saveAnswerProcessor;
         $this->userSourceForQAProcessor = $userSourceForQAProcessor;
     }
 
@@ -71,7 +71,7 @@ class SubmitQAQuestionsLogic extends AbstractControllerLogic
         $answers = $request->input('answers');
         foreach ($answers as $answer) {
             $filesUpload = $request->input('files');
-            $this->saveHelpMenuAnswerProcessor->execute($userId, $sourceId, $answer['questionId'], $answer['answer'], $answer['answerId'], $filesUpload);
+            $this->saveAnswerProcessor->execute($userId, $sourceId, $answer['questionId'], $answer['answer'], $answer['answerId'], $filesUpload);
         }
 
         $response =  ['message' => 'Thank you for your feedback.'];
diff --git a/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateHelpMenuNextQuestionLogic.php b/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateHelpMenuNextQuestionLogic.php
index b01a7235..4516ba97 100644
--- a/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateHelpMenuNextQuestionLogic.php
+++ b/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateHelpMenuNextQuestionLogic.php
@@ -6,10 +6,10 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMSupportTicket;
 use App\Classes\Modules\PerfexCRM\Services\FetchesPerfexCRMCustomer;
 use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestion;
-use App\Classes\Modules\HelpMenu\Processors\SaveHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\DeleteHelpMenuAnswerProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchNextHelpMenuQuestionProcessor;
-use App\Classes\Modules\HelpMenu\Processors\FetchFirstHelpMenuQuestionProcessor;
+use App\Classes\Modules\HelpMenu\Processors\SaveAnswerProcessor;
+use App\Classes\Modules\HelpMenu\Processors\DeleteAnswerQAProcessor;
+use App\Classes\Modules\HelpMenu\Processors\FetchNextQuestionQAProcessor;
+use App\Classes\Modules\HelpMenu\Processors\FetchFirstQuestionQAProcessor;
 use App\Http\Resources\HelpMenuQuestionResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -34,17 +34,17 @@ class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
     /** @var CanFetchHelpMenuQuestion */
     private $canFetchHelpMenuQuestion;
 
-    /** @var SaveHelpMenuAnswerProcessor */
-    private $saveHelpMenuAnswerProcessor;
+    /** @var SaveAnswerProcessor */
+    private $saveAnswerProcessor;
 
-    /** @var DeleteHelpMenuAnswerProcessor */
-    private $deleteHelpMenuAnswerProcessor;
+    /** @var DeleteAnswerQAProcessor */
+    private $deleteAnswerQAProcessor;
 
-    /** @var FetchNextHelpMenuQuestionProcessor */
-    private $fetchNextHelpMenuQuestionProcessor;
+    /** @var FetchNextQuestionQAProcessor */
+    private $fetchNextQuestionQAProcessor;
 
-    /** @var FetchFirstHelpMenuQuestionProcessor */
-    private $fetchFirstHelpMenuQuestionProcessor;
+    /** @var FetchFirstQuestionQAProcessor */
+    private $fetchFirstQuestionQAProcessor;
 
     /** @var CreatesPerfexCRMSupportTicket */
     private $createsPerfexCRMSupportTicket;
@@ -55,20 +55,20 @@ class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
     /**
      * UpdateHelpMenuNextQuestionLogic constructor.
      * @param CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion
-     * @param SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor
-     * @param FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor
-     * @param FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor
-     * @param DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor
+     * @param SaveAnswerProcessor $saveAnswerProcessor
+     * @param FetchNextQuestionQAProcessor $fetchNextQuestionQAProcessor
+     * @param FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor
+     * @param DeleteAnswerQAProcessor $deleteAnswerQAProcessor
      */
-    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, SaveHelpMenuAnswerProcessor $saveHelpMenuAnswerProcessor, FetchNextHelpMenuQuestionProcessor $fetchNextHelpMenuQuestionProcessor, FetchFirstHelpMenuQuestionProcessor $fetchFirstHelpMenuQuestionProcessor,  CreatesPerfexCRMSupportTicket $createsPerfexCRMSupportTicket, FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer, DeleteHelpMenuAnswerProcessor $deleteHelpMenuAnswerProcessor)
+    public function __construct(CanFetchHelpMenuQuestion $canFetchHelpMenuQuestion, SaveAnswerProcessor $saveAnswerProcessor, FetchNextQuestionQAProcessor $fetchNextQuestionQAProcessor, FetchFirstQuestionQAProcessor $fetchFirstQuestionQAProcessor,  CreatesPerfexCRMSupportTicket $createsPerfexCRMSupportTicket, FetchesPerfexCRMCustomer $fetchesPerfexCRMCustomer, DeleteAnswerQAProcessor $deleteAnswerQAProcessor)
     {
         $this->canFetchHelpMenuQuestion = $canFetchHelpMenuQuestion;
-        $this->saveHelpMenuAnswerProcessor = $saveHelpMenuAnswerProcessor;
-        $this->fetchNextHelpMenuQuestionProcessor = $fetchNextHelpMenuQuestionProcessor;
-        $this->fetchFirstHelpMenuQuestionProcessor = $fetchFirstHelpMenuQuestionProcessor;
+        $this->saveAnswerProcessor = $saveAnswerProcessor;
+        $this->fetchNextQuestionQAProcessor = $fetchNextQuestionQAProcessor;
+        $this->fetchFirstQuestionQAProcessor = $fetchFirstQuestionQAProcessor;
         $this->createsPerfexCRMSupportTicket = $createsPerfexCRMSupportTicket;
         $this->fetchesPerfexCRMCustomer = $fetchesPerfexCRMCustomer;
-        $this->deleteHelpMenuAnswerProcessor = $deleteHelpMenuAnswerProcessor;
+        $this->deleteAnswerQAProcessor = $deleteAnswerQAProcessor;
     }
 
 
@@ -88,7 +88,7 @@ class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
         $this->canFetchHelpMenuQuestion->passes();
 
         //Delete answer
-        $this->deleteHelpMenuAnswerProcessor->execute($userId, $questionId, $request);
+        $this->deleteAnswerQAProcessor->execute($userId, $questionId, $request);
 
         //Save answer given by user
         if (!$request->has('isPrevious')) {
@@ -98,7 +98,7 @@ class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
                 $answerOptionId = intval($request->answerObj['id']);
             }
             $answerInText = $request->answer;
-            $this->saveHelpMenuAnswerProcessor->execute($userId, 0, $questionId, $answerInText, $answerOptionId, $filesUpload);
+            $this->saveAnswerProcessor->execute($userId, 0, $questionId, $answerInText, $answerOptionId, $filesUpload);
         }
 
         //Create ticket at crm
@@ -119,10 +119,10 @@ class UpdateHelpMenuNextQuestionLogic extends AbstractControllerLogic
         }
 
         //Get returned question (previous or next)
-        $returnQuestion = $this->fetchNextHelpMenuQuestionProcessor->execute($request);
+        $returnQuestion = $this->fetchNextQuestionQAProcessor->execute($request);
         //When a questionnaire ended, return back the first question
         if(is_null($returnQuestion)){
-            $returnQuestion = $this->fetchFirstHelpMenuQuestionProcessor->execute($request);
+            $returnQuestion = $this->fetchFirstQuestionQAProcessor->execute($request);
         }
 
         return $this->resourceResponse(new HelpMenuQuestionResource($returnQuestion, $userId));
diff --git a/app/Classes/Modules/HelpMenu/Processors/DeleteHelpMenuAnswerProcessor.php b/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
similarity index 95%
rename from app/Classes/Modules/HelpMenu/Processors/DeleteHelpMenuAnswerProcessor.php
rename to app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
index 2ba8b928..ff0b9c1f 100644
--- a/app/Classes/Modules/HelpMenu/Processors/DeleteHelpMenuAnswerProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
@@ -6,7 +6,7 @@ use App\Models\QAUserAnswerSelected;
 use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
 use App\Classes\Modules\HelpMenu\Services\ListsHelpMenuUserAnswerSelected;
 
-class DeleteHelpMenuAnswerProcessor
+class DeleteAnswerQAProcessor
 {
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
@@ -15,7 +15,7 @@ class DeleteHelpMenuAnswerProcessor
     private $listsHelpMenuUserAnswerSelected;
 
     /**
-     * DeleteHelpMenuAnswerProcessor constructor.
+     * DeleteAnswerQAProcessor constructor.
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
      * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
      */
diff --git a/app/Classes/Modules/HelpMenu/Processors/FetchFirstHelpMenuQuestionProcessor.php b/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
similarity index 89%
rename from app/Classes/Modules/HelpMenu/Processors/FetchFirstHelpMenuQuestionProcessor.php
rename to app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
index 45c66ee4..9f463418 100644
--- a/app/Classes/Modules/HelpMenu/Processors/FetchFirstHelpMenuQuestionProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
@@ -7,13 +7,13 @@ use ErrorException;
 use Illuminate\Http\Request;
 
 
-class FetchFirstHelpMenuQuestionProcessor
+class FetchFirstQuestionQAProcessor
 {
     /** @var FetchesHelpMenuQuestion */
     private $fetchesHelpMenuQuestion;
 
     /**
-     * FetchFirstHelpMenuQuestionProcessor constructor.
+     * FetchFirstQuestionQAProcessor constructor.
      * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
      */
     public function __construct(FetchesHelpMenuQuestion $fetchesHelpMenuQuestion)
diff --git a/app/Classes/Modules/HelpMenu/Processors/FetchNextHelpMenuQuestionProcessor.php b/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
similarity index 97%
rename from app/Classes/Modules/HelpMenu/Processors/FetchNextHelpMenuQuestionProcessor.php
rename to app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
index f832c280..d9fc9a0a 100644
--- a/app/Classes/Modules/HelpMenu/Processors/FetchNextHelpMenuQuestionProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
@@ -9,7 +9,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use App\Classes\ValueObjects\Constants\QAType;
 
-class FetchNextHelpMenuQuestionProcessor
+class FetchNextQuestionQAProcessor
 {
     /** @var FetchesHelpMenuQuestion */
     private $fetchesHelpMenuQuestion;
@@ -20,7 +20,7 @@ class FetchNextHelpMenuQuestionProcessor
     /** @var ListsHelpMenuUserAnswerSelected */
     private $listsHelpMenuUserAnswerSelected;
     /**
-     * FetchNextHelpMenuQuestionProcessor constructor.
+     * FetchNextQuestionQAProcessor constructor.
      * @param FetchesHelpMenuQuestion $fetchesHelpMenuQuestion
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
      * @param ListsHelpMenuUserAnswerSelected $listsHelpMenuUserAnswerSelected
diff --git a/app/Classes/Modules/HelpMenu/Processors/SaveHelpMenuAnswerProcessor.php b/app/Classes/Modules/HelpMenu/Processors/SaveAnswerProcessor.php
similarity index 96%
rename from app/Classes/Modules/HelpMenu/Processors/SaveHelpMenuAnswerProcessor.php
rename to app/Classes/Modules/HelpMenu/Processors/SaveAnswerProcessor.php
index 23a5c34f..5830bc0f 100644
--- a/app/Classes/Modules/HelpMenu/Processors/SaveHelpMenuAnswerProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/SaveAnswerProcessor.php
@@ -7,7 +7,7 @@ use App\Classes\Modules\HelpMenu\Services\FetchesHelpMenuUserAnswerSelected;
 use App\Classes\Modules\Documents\Processors\UploadDocumentForHelpMenuProcessor;
 
 
-class SaveHelpMenuAnswerProcessor
+class SaveAnswerProcessor
 {
     /** @var FetchesHelpMenuUserAnswerSelected */
     private $fetchesHelpMenuUserAnswerSelected;
@@ -16,7 +16,7 @@ class SaveHelpMenuAnswerProcessor
     private $uploadDocumentForHelpMenuProcessor;
 
     /**
-     * SaveHelpMenuAnswerProcessor constructor.
+     * SaveAnswerProcessor constructor.
      * @param FetchesHelpMenuUserAnswerSelected $fetchesHelpMenuUserAnswerSelected
      * @param UploadDocumentForHelpMenuProcessor $uploadDocumentForHelpMenuProcessor
      */