diff --git a/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py b/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
index e80942310e4907719a3dbfdb166a4a6f8501613e..d5a16bbe7d74e50f0ae41058dbbfea02fc6f9ab4 100644
--- a/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
+++ b/tangostationcontrol/tangostationcontrol/clients/statistics/consumer.py
@@ -12,7 +12,7 @@ from threading import Thread
 from queue import Queue
 
 from tangostationcontrol.clients.statistics.client_thread import StatisticsClientThread
-from tangostationcontrol.devices.sdp.statistics_collector import StatisticsCollector
+from tangostationcontrol.statistics.collector import StatisticsCollector
 
 logger = logging.getLogger()
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py b/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
index 10ebe6e92724b167bcac8bbd9040bb0da6cd8a45..09622f1f623e995940ab4457d50e32bb91af7ebd 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/bst.py
@@ -13,13 +13,14 @@
 
 from tango.server import device_property, attribute
 from tango import AttrWriteType
+
 # Own imports
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.clients.opcua_client import OPCUAConnection
 from tangostationcontrol.clients.statistics.client import StatisticsClient
 from tangostationcontrol.devices.sdp.statistics import Statistics
-from tangostationcontrol.statistics.statistics_collector import BSTCollector
+from tangostationcontrol.statistics.collector import BSTCollector
 
 import numpy
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
index a7747918de48fab90c3b4ab5e670bc8a42edc115..ceeffdd3553ba1da823279e0313544badc04c83b 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sst.py
@@ -21,7 +21,7 @@ from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.clients.opcua_client import OPCUAConnection
 from tangostationcontrol.clients.statistics.client import StatisticsClient
 from tangostationcontrol.devices.sdp.statistics import Statistics
-from tangostationcontrol.statistics.statistics_collector import SSTCollector
+from tangostationcontrol.statistics.collector import SSTCollector
 
 import numpy
 
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
index e2907240e772d0b21acd0abe18704bf40b8be940..39325dc19c7b87c117716c7dc2752a1fcaa4b9a0 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/statistics/test_writer_sst.py
@@ -9,7 +9,7 @@
 
 from tangostationcontrol.integration_test.base import BaseIntegrationTestCase
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
-from tangostationcontrol.statistics.statistics_collector import SSTCollector
+from tangostationcontrol.statistics.collector import SSTCollector
 from tangostationcontrol.statistics_writer import statistics_reader
 from tangostationcontrol.statistics import writer
 
diff --git a/tangostationcontrol/tangostationcontrol/statistics/statistics_collector.py b/tangostationcontrol/tangostationcontrol/statistics/collector.py
similarity index 100%
rename from tangostationcontrol/tangostationcontrol/statistics/statistics_collector.py
rename to tangostationcontrol/tangostationcontrol/statistics/collector.py
diff --git a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
index b58ccd39b1174dc9da49dc515468d6815f37af6f..af617b7d6aad1fb29b73eb77b480e9405ccbdaad 100644
--- a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
+++ b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
@@ -13,7 +13,7 @@ from abc import ABC, abstractmethod
 import sys
 sys.path.append("..")
 from tangostationcontrol.statistics.packets import SSTPacket, XSTPacket, BSTPacket
-import tangostationcontrol.statistics.statistics_collector as statistics_collector
+import tangostationcontrol.statistics.collector as statistics_collector
 
 
 logger = logging.getLogger("statistics_writer")
diff --git a/tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py b/tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
similarity index 99%
rename from tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py
rename to tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
index c53a96712e712daab6bf087e1fc58ca3e2c40413..aaf39ba86f336477cfac6bb35585d44cdbd53867 100644
--- a/tangostationcontrol/tangostationcontrol/test/statistics/test_statistics_collector.py
+++ b/tangostationcontrol/tangostationcontrol/test/statistics/test_collector.py
@@ -7,7 +7,7 @@
 # Distributed under the terms of the APACHE license.
 # See LICENSE.txt for more info.
 
-from tangostationcontrol.statistics.statistics_collector import XSTCollector, BSTCollector
+from tangostationcontrol.statistics.collector import XSTCollector, BSTCollector
 from tangostationcontrol.statistics.packets import XSTPacket, BSTPacket
 
 from tangostationcontrol.test import base