diff --git a/inc/INIT.php b/inc/INIT.php
index 7f2206ebba..16c645b159 100644
--- a/inc/INIT.php
+++ b/inc/INIT.php
@@ -69,7 +69,7 @@ class INIT {
     public static $SMTP_HOSTNAME;
 
     public static $MAILER_FROM        = 'cattool@matecat.com';
-    public static $MAILER_FROM_NAME   = 'MateCat';
+    public static $MAILER_FROM_NAME   = 'Matecat';
     public static $MAILER_RETURN_PATH = 'no-reply@matecat.com';
 
     public static $LOG_REPOSITORY;
diff --git a/lib/Controller/API/V2/DownloadFileController.php b/lib/Controller/API/V2/DownloadFileController.php
index 98c35de38e..0b00cee37f 100644
--- a/lib/Controller/API/V2/DownloadFileController.php
+++ b/lib/Controller/API/V2/DownloadFileController.php
@@ -292,7 +292,7 @@ private function processDownload() {
 
                     if ( $fileType[ 'proprietary_short_name' ] === 'matecat_converter' ) {
                         // Set the XLIFF extension to .xlf
-                        // Internally, MateCat continues using .sdlxliff as default
+                        // Internally, Matecat continues using .sdlxliff as default
                         // extension for the XLIFF behind the projects.
                         // Changing this behavior requires a huge refactoring that
                         // it's scheduled for future versions.
diff --git a/lib/Controller/downloadFileController.php b/lib/Controller/downloadFileController.php
index a7d8c9a2a9..018e6fed0a 100644
--- a/lib/Controller/downloadFileController.php
+++ b/lib/Controller/downloadFileController.php
@@ -238,7 +238,7 @@ public function doAction() {
 
                     if ( $fileType[ 'proprietary_short_name' ] === 'matecat_converter' ) {
                         // Set the XLIFF extension to .xlf
-                        // Internally, MateCat continues using .sdlxliff as default
+                        // Internally, Matecat continues using .sdlxliff as default
                         // extension for the XLIFF behind the projects.
                         // Changing this behavior requires a huge refactoring that
                         // it's scheduled for future versions.
diff --git a/lib/Decorator/ActivityLogDecorator.php b/lib/Decorator/ActivityLogDecorator.php
index e772892b87..465ce4d262 100644
--- a/lib/Decorator/ActivityLogDecorator.php
+++ b/lib/Decorator/ActivityLogDecorator.php
@@ -97,7 +97,7 @@ public function prepareForView( $jobLanguageDefinition, $rawContent ) {
         foreach( $rawContent as $k => $value ){
 
             // This filter allows our support team at matecat.com to have their email addresses
-            // replaced by a "MateCat Support Team" tag.
+            // replaced by a "Matecat Support Team" tag.
             $value = $this->featureSet->filter('filterActivityLogEntry', $value);
 
             if( empty( $value->email ) ) {
diff --git a/lib/Model/ConversionHandler.php b/lib/Model/ConversionHandler.php
index 8dc01d563d..3f282e7c4e 100644
--- a/lib/Model/ConversionHandler.php
+++ b/lib/Model/ConversionHandler.php
@@ -182,7 +182,7 @@ public function processConversion(): ?array {
 
                     if ( !$res_insert ) {
                         //custom error message passed directly to JavaScript client and displayed as is
-                        $convertResult[ 'errorMessage' ] = "Error: File upload failed because you have MateCat running in multiple tabs. Please close all other MateCat tabs in your browser.";
+                        $convertResult[ 'errorMessage' ] = "Error: File upload failed because you have Matecat running in multiple tabs. Please close all other Matecat tabs in your browser.";
 
                         $this->result->changeCode( ConversionHandlerStatus::FILESYSTEM_ERROR );
                         $this->result->addError( $convertResult[ 'errorMessage' ], AbstractFilesStorage::basename_fix( $this->file_name ) );
diff --git a/lib/Model/Features.php b/lib/Model/Features.php
index 8926b92606..3a8cfcfe1b 100644
--- a/lib/Model/Features.php
+++ b/lib/Model/Features.php
@@ -13,7 +13,7 @@
 /**
  * Class Features
  *
- * This class is an autoloader for MateCat Features, load external plugins classes
+ * This class is an autoloader for Matecat Features, load external plugins classes
  * defined in the
  *      <matecat_root>/plugins/<plugin>/manifest.php
  *
@@ -177,9 +177,9 @@ public static function loadRoutes( Klein $klein ) {
              * Try to load external plugins classes and fallback to internal plugin code in case of failure
              *
              * If external plugin class is not defined ( no manifest or no plugin installed )
-             * Try to load MateCat core plugins, so they can install it's own routes
+             * Try to load Matecat core plugins, so they can install it's own routes
              *
-             * @deprecated because all MateCat internal route should not have a "plugins" namespace in the route, but they should have it's own controllers defined
+             * @deprecated because all Matecat internal route should not have a "plugins" namespace in the route, but they should have it's own controllers defined
              *             Ex: http://xxxx/plugins/review_extended/quality_report/xxx/xxxxxxx
              *             should be something like
              *             http://xxxx/review_extended/quality_report/xxx/xxxxxxx
diff --git a/lib/Plugins/Features/ReviewExtended/ReviewedWordCountModel.php b/lib/Plugins/Features/ReviewExtended/ReviewedWordCountModel.php
index 4169118511..81c345c5c8 100644
--- a/lib/Plugins/Features/ReviewExtended/ReviewedWordCountModel.php
+++ b/lib/Plugins/Features/ReviewExtended/ReviewedWordCountModel.php
@@ -309,10 +309,12 @@ function _sendNotificationEmail( $finalRevisions, $chunkReviewsWithFinalRevision
         }
 
         $segmentInfo = [
-                'segment_source'  => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getSegmentStruct()->segment ),
-                'old_translation' => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getOldTranslation()->translation ),
-                'new_translation' => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getWantedTranslation()->translation ),
-                'issues'          => $serialized_issues
+            'segment_source'  => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getSegmentStruct()->segment ),
+            'old_translation' => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getOldTranslation()->translation ),
+            'new_translation' => Utils::htmlentitiesToUft8WithoutDoubleEncoding( $this->_event->getWantedTranslation()->translation ),
+            'old_status'      => $this->_event->getOldTranslation()->status,
+            'new_status'      => $this->_event->getWantedTranslation()->status,
+            'issues'          => $serialized_issues
         ];
 
         foreach ( $finalRevisions as $finalRevision ) {
diff --git a/lib/Utils/AsyncTasks/Workers/ErrMailWorker.php b/lib/Utils/AsyncTasks/Workers/ErrMailWorker.php
index f8cb86c32f..47457160b0 100644
--- a/lib/Utils/AsyncTasks/Workers/ErrMailWorker.php
+++ b/lib/Utils/AsyncTasks/Workers/ErrMailWorker.php
@@ -102,7 +102,7 @@ protected function _sendErrMailReport( Params $mailConf ): bool {
 
         }
 
-        $mail->XMailer = 'MateCat Mailer';
+        $mail->XMailer = 'Matecat Mailer';
         $mail->CharSet = 'UTF-8';
         $mail->isHTML();
 
diff --git a/lib/Utils/AsyncTasks/Workers/MailWorker.php b/lib/Utils/AsyncTasks/Workers/MailWorker.php
index e9b5a03ed0..664a233abf 100644
--- a/lib/Utils/AsyncTasks/Workers/MailWorker.php
+++ b/lib/Utils/AsyncTasks/Workers/MailWorker.php
@@ -54,7 +54,7 @@ public function process( AbstractElement $queueElement ) {
 
         $mail->AltBody = $queueElement->params[ 'altBody' ];
 
-        $mail->XMailer = 'MateCat Mailer';
+        $mail->XMailer = 'Matecat Mailer';
         $mail->CharSet = 'UTF-8';
         $mail->isHTML();
 
diff --git a/lib/Utils/Email/AbstractEmail.php b/lib/Utils/Email/AbstractEmail.php
index 6871446916..791c46a183 100644
--- a/lib/Utils/Email/AbstractEmail.php
+++ b/lib/Utils/Email/AbstractEmail.php
@@ -98,7 +98,7 @@ protected function _getLayoutVariables( $messageBody = null ): array {
         if ( isset( $this->title ) ) {
             $title = $this->title;
         } else {
-            $title = 'MateCat';
+            $title = 'Matecat';
         }
 
         return [
diff --git a/lib/Utils/Email/BaseCommentEmail.php b/lib/Utils/Email/BaseCommentEmail.php
index 5464786a7d..88d2b0b10c 100644
--- a/lib/Utils/Email/BaseCommentEmail.php
+++ b/lib/Utils/Email/BaseCommentEmail.php
@@ -8,14 +8,39 @@
 
 namespace Email;
 
+use Comments_CommentStruct;
+use Users_UserStruct;
+
 class BaseCommentEmail extends AbstractEmail {
 
+    /**
+     * @var Users_UserStruct
+     */
     protected $user;
-    protected $comment;
+
+    /**
+     * @var Comments_CommentStruct
+     */
+    protected Comments_CommentStruct $comment;
+
+    /**
+     * @var string
+     */
     protected $url;
+
     protected $project;
 
-    public function __construct( $user, $comment, $url, $project, $job ) {
+    protected $job;
+
+    /**
+     * BaseCommentEmail constructor.
+     * @param Users_UserStruct $user
+     * @param Comments_CommentStruct $comment
+     * @param $url
+     * @param $project
+     * @param $job
+     */
+    public function __construct( Users_UserStruct $user, Comments_CommentStruct $comment, $url, $project, $job ) {
 
         $this->project = $project;
         $this->user    = $user;
@@ -40,13 +65,36 @@ protected function _getTemplateVariables(): array {
         $content = \Comments_CommentDao::placeholdContent( $this->comment->message );
 
         return [
-                'user'    => $this->user->toArray(),
-                'project' => $this->project,
-                'job'     => $this->job,
-                'comment' => $this->comment->toArray(),
-                'url'     => $this->url . ",comment",
-                'content' => $content
+                'user'      => $this->user->toArray(),
+                'project'   => $this->project,
+                'job'       => $this->job,
+                'commenter' => $this->getCommentFullName(),
+                'url'       => $this->url . ",comment",
+                'content'   => $content
         ];
     }
 
+    /**
+     * @return string
+     */
+    private function getCommentFullName()
+    {
+        if($this->comment->is_anonymous == true){
+
+            $revision_number = (int)$this->comment->revision_number;
+
+            switch ($revision_number){
+                case 1:
+                    return "translator";
+
+                case 2:
+                    return "the revisor";
+
+                case 3:
+                    return "the 2nd pass revisor";
+            }
+        }
+
+        return $this->comment->full_name;
+    }
 }
diff --git a/lib/Utils/Email/InvitedToTeamEmail.php b/lib/Utils/Email/InvitedToTeamEmail.php
index fa99513a99..e26e0d6433 100644
--- a/lib/Utils/Email/InvitedToTeamEmail.php
+++ b/lib/Utils/Email/InvitedToTeamEmail.php
@@ -24,7 +24,7 @@ public function __construct( \Users_UserStruct $user, $invited_email, TeamStruct
         $this->user          = $user;
         $this->invited_email = $invited_email;
         $this->team          = $team;
-        $this->title         = "You've been invited to MateCat";
+        $this->title         = "You've been invited to Matecat";
 
         $this->_setLayout( 'skeleton.html' );
         $this->_setTemplate( 'Team/email_invited_to_team.html' );
diff --git a/lib/Utils/Email/SendToTranslatorAbstract.php b/lib/Utils/Email/SendToTranslatorAbstract.php
index 995c4247ea..55c29c8e1f 100644
--- a/lib/Utils/Email/SendToTranslatorAbstract.php
+++ b/lib/Utils/Email/SendToTranslatorAbstract.php
@@ -26,7 +26,7 @@ public function __construct( Users_UserStruct $user, JobsTranslatorsStruct $tran
 
         $this->user        = $user;
         $this->translator  = $translator;
-        $this->title       = "MateCat - Translation Job";
+        $this->title       = "Matecat - Translation Job";
         $this->projectName = $projectName;
 
         $translator->delivery_date =
diff --git a/lib/Utils/Email/SendToTranslatorForDeliveryChangeEmail.php b/lib/Utils/Email/SendToTranslatorForDeliveryChangeEmail.php
index 9906c8e4c6..c4a408ab03 100644
--- a/lib/Utils/Email/SendToTranslatorForDeliveryChangeEmail.php
+++ b/lib/Utils/Email/SendToTranslatorForDeliveryChangeEmail.php
@@ -16,7 +16,7 @@ class SendToTranslatorForDeliveryChangeEmail extends SendToTranslatorAbstract {
 
     public function __construct( Users_UserStruct $user, JobsTranslatorsStruct $translator, $projectName ) {
         parent::__construct( $user, $translator, $projectName );
-        $this->title = "MateCat - Job delivery updated.";
+        $this->title = "Matecat - Job delivery updated.";
         $this->_setTemplate( 'Translator/job_change_delivery_send_to_translator_content.html' );
         $this->_RoutesMethod = '\Routes::translate';
     }
diff --git a/lib/Utils/Email/SendToTranslatorForJobSplitEmail.php b/lib/Utils/Email/SendToTranslatorForJobSplitEmail.php
index 9b72ab45fe..f108253c54 100644
--- a/lib/Utils/Email/SendToTranslatorForJobSplitEmail.php
+++ b/lib/Utils/Email/SendToTranslatorForJobSplitEmail.php
@@ -16,7 +16,7 @@ class SendToTranslatorForJobSplitEmail extends SendToTranslatorAbstract {
 
     public function __construct( Users_UserStruct $user, JobsTranslatorsStruct $translator, $projectName ) {
         parent::__construct( $user, $translator, $projectName );
-        $this->title = "MateCat - Job delivery updated.";
+        $this->title = "Matecat - Job delivery updated.";
         $this->_setTemplate( 'Translator/job_split_send_to_translator_content.html' );
         $this->_RoutesMethod = '\Routes::translate';
     }
diff --git a/lib/Utils/Email/SendToTranslatorForNewJobEmail.php b/lib/Utils/Email/SendToTranslatorForNewJobEmail.php
index a8111f08eb..404faab3e5 100644
--- a/lib/Utils/Email/SendToTranslatorForNewJobEmail.php
+++ b/lib/Utils/Email/SendToTranslatorForNewJobEmail.php
@@ -16,7 +16,7 @@ class SendToTranslatorForNewJobEmail extends SendToTranslatorAbstract {
 
     public function __construct( Users_UserStruct $user, JobsTranslatorsStruct $translator, $projectName ) {
         parent::__construct( $user, $translator, $projectName );
-        $this->title = "MateCat - Translation Job.";
+        $this->title = "Matecat - Translation Job.";
         $this->_setTemplate( 'Translator/job_new_send_to_translator_content.html' );
         $this->_RoutesMethod = '\Routes::translate';
     }
diff --git a/lib/Utils/Email/SignupEmail.php b/lib/Utils/Email/SignupEmail.php
index 3ff62fae81..a50b427c67 100644
--- a/lib/Utils/Email/SignupEmail.php
+++ b/lib/Utils/Email/SignupEmail.php
@@ -20,7 +20,7 @@ class SignupEmail extends AbstractEmail {
      */
     private $user;
 
-    protected $title = 'Confirm your registration with MateCat';
+    protected $title = 'Confirm your registration with Matecat';
 
     public function __construct( \Users_UserStruct $user ) {
 
diff --git a/lib/Utils/Filters.php b/lib/Utils/Filters.php
index 08f07545e8..60477cba13 100644
--- a/lib/Utils/Filters.php
+++ b/lib/Utils/Filters.php
@@ -295,7 +295,7 @@ private static function logConversion( array $response, bool $toXliff, string $s
         if ( $response[ 'successful' ] !== true ) {
 
             if ( INIT::$FILTERS_EMAIL_FAILURES ) {
-                Utils::sendErrMailReport( "MateCat: conversion failed.\n\n" . print_r( $info, true ) );
+                Utils::sendErrMailReport( "Matecat: conversion failed.\n\n" . print_r( $info, true ) );
             }
 
             self::backupFailedConversion( $sentFile );
diff --git a/lib/Utils/Log.php b/lib/Utils/Log.php
index a862f6ddea..398683f129 100644
--- a/lib/Utils/Log.php
+++ b/lib/Utils/Log.php
@@ -62,7 +62,7 @@ protected static function initMonolog() {
         $fileHandler   = new StreamHandler( self::getFileNamePath() );
         $fileFormatter = new LineFormatter( "%message%\n", "", true, true );
         $fileHandler->setFormatter( $fileFormatter );
-        self::$logger = new Logger( 'MateCat', [ $fileHandler ] );
+        self::$logger = new Logger( 'Matecat', [ $fileHandler ] );
     }
 
     protected static function getFileNamePath() {
diff --git a/lib/Utils/OutsourceTo/AbstractProvider.php b/lib/Utils/OutsourceTo/AbstractProvider.php
index 91fd44a079..1d021030cf 100644
--- a/lib/Utils/OutsourceTo/AbstractProvider.php
+++ b/lib/Utils/OutsourceTo/AbstractProvider.php
@@ -39,7 +39,7 @@ abstract class OutsourceTo_AbstractProvider {
     protected $_outsource_login_url_ko = "";
 
     /**
-     * These are the url that the vendor system must call in order to confirm the outsource to MateCat
+     * These are the url that the vendor system must call in order to confirm the outsource to Matecat
      *
      * Set them appropriately in the constructor.
      *
diff --git a/lib/Utils/ProjectManager.php b/lib/Utils/ProjectManager.php
index fd7ad1e8a0..c3228c3d24 100644
--- a/lib/Utils/ProjectManager.php
+++ b/lib/Utils/ProjectManager.php
@@ -890,7 +890,7 @@ public function createProject() {
 
             //Allow projects with less than 250.000 words or characters ( for cjk languages )
             if ( $this->files_word_count > INIT::$MAX_SOURCE_WORDS ) {
-                throw new Exception( "MateCat is unable to create your project. Please contact us at " . INIT::$SUPPORT_MAIL . ", we will be happy to help you!", 128 );
+                throw new Exception( "Matecat is unable to create your project. Please contact us at " . INIT::$SUPPORT_MAIL . ", we will be happy to help you!", 128 );
             }
 
             $featureSet->run( "beforeInsertSegments", $this->projectStructure,
@@ -2896,7 +2896,7 @@ private function __addNotesToProjectStructure( $trans_unit, $fid ) {
      * setSegmentIdForNotes
      *
      * Adds notes to segment, taking into account that a same note may be assigned to
-     * more than one MateCat segment, due to the <mrk> tags.
+     * more than one Matecat segment, due to the <mrk> tags.
      *
      * Example:
      * ['notes'][ $internal_id] => array( 'aaa' );
diff --git a/lib/Utils/TmKeyManagement/ShareKeyEmail.php b/lib/Utils/TmKeyManagement/ShareKeyEmail.php
index 13351aa349..64ddb00456 100644
--- a/lib/Utils/TmKeyManagement/ShareKeyEmail.php
+++ b/lib/Utils/TmKeyManagement/ShareKeyEmail.php
@@ -66,7 +66,7 @@ protected function _getTemplateVariables(): array {
     protected function _getLayoutVariables($messageBody = null): array {
         $vars = parent::_getLayoutVariables();
         $vars['showTitle'] = TRUE ;
-        $vars['title'] = "MateCat - Resource shared" ;
+        $vars['title'] = "Matecat - Resource shared" ;
 
         return $vars ;
     }
diff --git a/lib/Utils/Utils.php b/lib/Utils/Utils.php
index 1e8b7e8ef0..54e2c40629 100644
--- a/lib/Utils/Utils.php
+++ b/lib/Utils/Utils.php
@@ -406,7 +406,7 @@ public static function sendErrMailReport( string $htmlContent, string $subject =
         $mailConf = @parse_ini_file( INIT::$ROOT . '/inc/Error_Mail_List.ini', true );
 
         if ( empty( $subject ) ) {
-            $subject = 'Alert from MateCat: ' . php_uname( 'n' );
+            $subject = 'Alert from Matecat: ' . php_uname( 'n' );
         } else {
             $subject .= ' ' . php_uname( 'n' );
         }
diff --git a/lib/View/Emails/Comment/action_on_a_comment.html b/lib/View/Emails/Comment/action_on_a_comment.html
index 7a32a8c710..4e364c491d 100644
--- a/lib/View/Emails/Comment/action_on_a_comment.html
+++ b/lib/View/Emails/Comment/action_on_a_comment.html
@@ -1,4 +1,4 @@
-<p> Hi <?= $user['first_name']?>, <br/><strong><?= $comment['full_name'] ?></strong> <?= $action ?> <br/> <strong><?= $project['name'] ?></strong> <span> (<?= $project['id'] ?>)</span> |
+<p> Hi <?= $user['first_name']?>, <br/><strong><?= $commenter ?></strong> <?= $action ?> <br/> <strong><?= $project['name'] ?></strong> <span> (<?= $project['id'] ?>)</span> |
     <strong><?= $job['source'] ?></strong> &gt; <strong><?= $job['target'] ?></strong>
 </p>
 <br/>
diff --git a/lib/View/Emails/Revise/second_pass_segment_changed_notice.html b/lib/View/Emails/Revise/second_pass_segment_changed_notice.html
index e314b0ee6b..c768b1046d 100644
--- a/lib/View/Emails/Revise/second_pass_segment_changed_notice.html
+++ b/lib/View/Emails/Revise/second_pass_segment_changed_notice.html
@@ -29,6 +29,14 @@
     <strong>New target</strong>: <?= $segmentInfo['new_translation'] ?>
 </p>
 
+<p>
+    <strong>Old status</strong>: <?= $segmentInfo['old_status'] ?>
+</p>
+
+<p>
+    <strong>New status</strong>: <?= $segmentInfo['new_status'] ?>
+</p>
+
 <p>
     <?php if ( count( $segmentInfo['issues']) > 0 ) { ?>
         <p><strong>Issues</strong><p>
diff --git a/lib/View/templates/_index.html b/lib/View/templates/_index.html
index a8def86491..adf358e6cd 100755
--- a/lib/View/templates/_index.html
+++ b/lib/View/templates/_index.html
@@ -192,7 +192,7 @@
         <div class="page-content"></div>
         <tal:block metal:use-macro="templates/common.html/footer_includes" />
         <tal:block metal:use-macro="${php: INIT::$TRACKING_CODES_VIEW_PATH}/external_sources.html/track_codes_translate"/>
-        <!--Container for MateCat Notifications-->
+        <!--Container for Matecat Notifications-->
         <div class="notifications-wrapper"></div>
     </body>
 
diff --git a/lib/View/templates/_manage.html b/lib/View/templates/_manage.html
index 3c785fff99..b11bd80d81 100755
--- a/lib/View/templates/_manage.html
+++ b/lib/View/templates/_manage.html
@@ -53,7 +53,7 @@
 
 </footer>
 
- <!--Container for MateCat Notifications-->
+ <!--Container for Matecat Notifications-->
 <div class="notifications-wrapper"></div>
 
 <div metal:use-macro="${php: INIT::$TRACKING_CODES_VIEW_PATH}/external_sources.html/track_codes_analyze"/>