diff --git a/lib/domain/libimaghabit/src/iter.rs b/lib/domain/libimaghabit/src/iter.rs
index 8a1e5a75..8cdb7c70 100644
--- a/lib/domain/libimaghabit/src/iter.rs
+++ b/lib/domain/libimaghabit/src/iter.rs
@@ -52,7 +52,7 @@ impl From<StoreIdIterator> for HabitTemplateStoreIdIterator {
 
 impl<'a> From<StoreIdIteratorWithStore<'a>> for HabitTemplateStoreIdIterator {
     fn from(sii: StoreIdIteratorWithStore<'a>) -> Self {
-        HabitTemplateStoreIdIterator(sii.without_store())
+        HabitTemplateStoreIdIterator(sii.into_storeid_iter())
     }
 }
 
@@ -88,7 +88,7 @@ impl From<StoreIdIterator> for HabitInstanceStoreIdIterator {
 
 impl<'a> From<StoreIdIteratorWithStore<'a>> for HabitInstanceStoreIdIterator {
     fn from(sii: StoreIdIteratorWithStore<'a>) -> Self {
-        HabitInstanceStoreIdIterator(sii.without_store())
+        HabitInstanceStoreIdIterator(sii.into_storeid_iter())
     }
 }
 
diff --git a/lib/domain/libimaghabit/src/store.rs b/lib/domain/libimaghabit/src/store.rs
index 197a1b64..5fbcf0cd 100644
--- a/lib/domain/libimaghabit/src/store.rs
+++ b/lib/domain/libimaghabit/src/store.rs
@@ -49,11 +49,11 @@ pub trait HabitStore {
 impl HabitStore for Store {
     /// Get an iterator over all habits
     fn all_habit_templates(&self) -> Result<HabitTemplateStoreIdIterator> {
-        Ok(HabitTemplateStoreIdIterator::from(self.entries()?.without_store()))
+        Ok(HabitTemplateStoreIdIterator::from(self.entries()?.into_storeid_iter()))
     }
 
     fn all_habit_instances(&self) -> Result<HabitInstanceStoreIdIterator> {
-        Ok(HabitInstanceStoreIdIterator::from(self.entries()?.without_store()))
+        Ok(HabitInstanceStoreIdIterator::from(self.entries()?.into_storeid_iter()))
     }
 }