diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
similarity index 95%
rename from src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
rename to src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
index b9da17114..edf654a10 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/CountCalendars.php
@@ -22,9 +22,8 @@ use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Process\Exception\LogicException;
-use Symfony\Component\Security\Core\Role\Role;
 
-class CountAppointments implements ExportInterface, GroupedExportInterface
+class CountCalendars implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
similarity index 96%
rename from src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
rename to src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
index 491cb38b9..51e94a288 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarAvgDuration.php
@@ -22,7 +22,7 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterface
+class StatCalendarAvgDuration implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
similarity index 96%
rename from src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
rename to src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
index 286c73be5..51591c670 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Export/StatCalendarSumDuration.php
@@ -22,7 +22,7 @@ use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterface
+class StatCalendarSumDuration implements ExportInterface, GroupedExportInterface
 {
     private CalendarRepository $calendarRepository;
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/exports.yaml b/src/Bundle/ChillCalendarBundle/Resources/config/services/exports.yaml
index 56580dba1..a7508f3b5 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/exports.yaml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/exports.yaml
@@ -1,26 +1,26 @@
 services:
 
   ## Indicators
-  chill.calendar.export.count_appointments:
-    class: Chill\CalendarBundle\Export\Export\CountAppointments
+  chill.calendar.export.count_calendars:
+    class: Chill\CalendarBundle\Export\Export\CountCalendars
     autowire: true
     autoconfigure: true
     tags:
-      - { name: chill.export, alias: count_appointments }
+      - { name: chill.export, alias: count_calendars }
 
-  chill.calendar.export.average_duration_appointments:
-    class: Chill\CalendarBundle\Export\Export\StatAppointmentAvgDuration
+  chill.calendar.export.average_duration_calendars:
+    class: Chill\CalendarBundle\Export\Export\StatCalendarAvgDuration
     autowire: true
     autoconfigure: true
     tags:
-      - { name: chill.export, alias: average_duration_appointments }
+      - { name: chill.export, alias: average_duration_calendars }
 
-  chill.calendar.export.sum_duration_appointments:
-    class: Chill\CalendarBundle\Export\Export\StatAppointmentSumDuration
+  chill.calendar.export.sum_duration_calendars:
+    class: Chill\CalendarBundle\Export\Export\StatCalendarSumDuration
     autowire: true
     autoconfigure: true
     tags:
-      - { name: chill.export, alias: sum_duration_appointments }
+      - { name: chill.export, alias: sum_duration_calendars }
 
   ## Filters
 
@@ -101,4 +101,4 @@ services:
     autowire: true
     autoconfigure: true
     tags:
-      - { name: chill.export_aggregator, alias: month_aggregator }
\ No newline at end of file
+      - { name: chill.export_aggregator, alias: month_aggregator }