diff --git a/lib/Entities/NewsletterLinkEntity.php b/lib/Entities/NewsletterLinkEntity.php
index 556a24aa42..42cafcf19b 100644
--- a/lib/Entities/NewsletterLinkEntity.php
+++ b/lib/Entities/NewsletterLinkEntity.php
@@ -53,8 +53,9 @@ class NewsletterLinkEntity {
   /**
    * Extra lazy is here for `getTotalClicksCount`.
    * If we didn't specify extra lazy the function would load all clicks and count them. This way it uses a single count query.
-   * @ORM\OneToMany(targetEntity="MailPoet\Entities\StatisticsClicksEntity", mappedBy="link", fetch="EXTRA_LAZY")
-   * @var StatisticsClicksEntity[]|ArrayCollection
+   * @ORM\OneToMany(targetEntity="StatisticsClickEntity", mappedBy="link", fetch="EXTRA_LAZY")
+   *
+   * @var StatisticsClickEntity[]|ArrayCollection
    */
   private $clicks;
 
diff --git a/lib/Entities/StatisticsClicksEntity.php b/lib/Entities/StatisticsClickEntity.php
similarity index 97%
rename from lib/Entities/StatisticsClicksEntity.php
rename to lib/Entities/StatisticsClickEntity.php
index 64e32de911..82983cdec9 100644
--- a/lib/Entities/StatisticsClicksEntity.php
+++ b/lib/Entities/StatisticsClickEntity.php
@@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
  * @ORM\Entity()
  * @ORM\Table(name="statistics_clicks")
  */
-class StatisticsClicksEntity {
+class StatisticsClickEntity {
   use AutoincrementedIdTrait;
   use CreatedAtTrait;
   use UpdatedAtTrait;
diff --git a/lib/Entities/StatisticsOpensEntity.php b/lib/Entities/StatisticsOpenEntity.php
similarity index 96%
rename from lib/Entities/StatisticsOpensEntity.php
rename to lib/Entities/StatisticsOpenEntity.php
index 63ac94f0a5..3c35899b86 100644
--- a/lib/Entities/StatisticsOpensEntity.php
+++ b/lib/Entities/StatisticsOpenEntity.php
@@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
  * @ORM\Entity()
  * @ORM\Table(name="statistics_opens")
  */
-class StatisticsOpensEntity {
+class StatisticsOpenEntity {
   use AutoincrementedIdTrait;
   use CreatedAtTrait;
   use UpdatedAtTrait;
diff --git a/lib/Entities/StatisticsUnsubscribesEntity.php b/lib/Entities/StatisticsUnsubscribeEntity.php
similarity index 96%
rename from lib/Entities/StatisticsUnsubscribesEntity.php
rename to lib/Entities/StatisticsUnsubscribeEntity.php
index 83e9bf58a7..a6de921fcf 100644
--- a/lib/Entities/StatisticsUnsubscribesEntity.php
+++ b/lib/Entities/StatisticsUnsubscribeEntity.php
@@ -11,7 +11,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
  * @ORM\Entity()
  * @ORM\Table(name="statistics_unsubscribes")
  */
-class StatisticsUnsubscribesEntity {
+class StatisticsUnsubscribeEntity {
   use AutoincrementedIdTrait;
   use CreatedAtTrait;
   use UpdatedAtTrait;
diff --git a/lib/Newsletter/Statistics/NewsletterStatisticsRepository.php b/lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
index c0bf18767a..69ac6feee0 100644
--- a/lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
+++ b/lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
@@ -5,9 +5,9 @@ namespace MailPoet\Newsletter\Statistics;
 use MailPoet\Doctrine\Repository;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\ScheduledTaskEntity;
-use MailPoet\Entities\StatisticsClicksEntity;
-use MailPoet\Entities\StatisticsOpensEntity;
-use MailPoet\Entities\StatisticsUnsubscribesEntity;
+use MailPoet\Entities\StatisticsClickEntity;
+use MailPoet\Entities\StatisticsOpenEntity;
+use MailPoet\Entities\StatisticsUnsubscribeEntity;
 use MailPoetVendor\Doctrine\Common\Collections\Criteria;
 use MailPoetVendor\Doctrine\ORM\UnexpectedResultException as UnexpectedResultExceptionAlias;
 
@@ -54,7 +54,7 @@ class NewsletterStatisticsRepository extends Repository {
    * @return int
    */
   function getStatisticsClickCount(NewsletterEntity $newsletter) {
-    return $this->getStatisticsCount($newsletter, StatisticsClicksEntity::class);
+    return $this->getStatisticsCount($newsletter, StatisticsClickEntity::class);
   }
 
   /**
@@ -62,7 +62,7 @@ class NewsletterStatisticsRepository extends Repository {
    * @return int
    */
   function getStatisticsOpenCount(NewsletterEntity $newsletter) {
-    return $this->getStatisticsCount($newsletter, StatisticsOpensEntity::class);
+    return $this->getStatisticsCount($newsletter, StatisticsOpenEntity::class);
   }
 
   /**
@@ -70,7 +70,7 @@ class NewsletterStatisticsRepository extends Repository {
    * @return int
    */
   function getStatisticsUnsubscribeCount(NewsletterEntity $newsletter) {
-    return $this->getStatisticsCount($newsletter, StatisticsUnsubscribesEntity::class);
+    return $this->getStatisticsCount($newsletter, StatisticsUnsubscribeEntity::class);
   }
 
   private function getStatisticsCount(NewsletterEntity $newsletter, $statistics_entity_name) {