diff --git a/src/TimeOrderedArray.php b/src/TimeOrderedArray.php
index d9ba8fa..2549de5 100644
--- a/src/TimeOrderedArray.php
+++ b/src/TimeOrderedArray.php
@@ -29,7 +29,7 @@
  *
  * For large number of items this implementation uses 10% of memory as SplPriorityQueue and is ~ 50% faster
  */
-class TimeOrderedArray implements Iterator, Countable, TimeBucketImplementationInterface {
+class TimeOrderedArray implements Iterator, Countable, TimeOrderedStorageInterface {
 
     /**
      * Queue elements (keyed by priority)
diff --git a/src/TimeOrderedQueue.php b/src/TimeOrderedQueue.php
index ff682d5..6e92c58 100644
--- a/src/TimeOrderedQueue.php
+++ b/src/TimeOrderedQueue.php
@@ -13,7 +13,7 @@
 
 use SplPriorityQueue;
 
-class TimeOrderedQueue extends SplPriorityQueue implements TimeBucketImplementationInterface {
+class TimeOrderedQueue extends SplPriorityQueue implements TimeOrderedStorageInterface {
     /**
      * @var int
      */
diff --git a/src/TimeBucketImplementationInterface.php b/src/TimeOrderedStorageInterface.php
similarity index 91%
rename from src/TimeBucketImplementationInterface.php
rename to src/TimeOrderedStorageInterface.php
index b89eaec..74a6f53 100644
--- a/src/TimeBucketImplementationInterface.php
+++ b/src/TimeOrderedStorageInterface.php
@@ -11,7 +11,7 @@
 
 namespace EdgeTelemetrics\TimeBucket;
 
-interface TimeBucketImplementationInterface {
+interface TimeOrderedStorageInterface {
     public function insert($value, $priority);
     public function count();
     public function current();