diff --git a/client/distance/src/lib.rs b/client/distance/src/lib.rs
index f2b29cbe9786b9f96b1e7238673da787baf25fe7..b27dd5f6e3e728b4ce292a30a50590664efbe765 100644
--- a/client/distance/src/lib.rs
+++ b/client/distance/src/lib.rs
@@ -52,7 +52,7 @@ where
         .storage(
             parent,
             &StorageKey(
-                frame_support::storage::storage_prefix(b"Session", b"CurrentIndex").to_vec(),
+                frame_support::storage::storage_prefix(b"Distance", b"CurrentPoolIndex").to_vec(),
             ),
         )
         .expect("CurrentIndex is Err")
@@ -66,7 +66,7 @@ where
             &StorageKey(
                 frame_support::storage::storage_prefix(
                     b"Distance",
-                    match session_index % 3 {
+                    match session_index {
                         0 => b"StoragePublishedResults1",
                         1 => b"StoragePublishedResults2",
                         2 => b"StoragePublishedResults0",
@@ -81,9 +81,9 @@ where
                 .expect("cannot decode EvaluationPool")
         });
 
-    // Have we already published a result for this session?
+    // Have we already published a result for this period?
     if published_results.evaluators.contains(&owner_key) {
-        log::debug!("🧙 [distance oracle] Already published a result for this session");
+        log::debug!("🧙 [distance oracle] Already published a result for this period");
         return Ok(sp_distance::InherentDataProvider::<IdtyIndex>::new(None));
     }