1 files changed, 13 insertions, 16 deletions

diff --git a/ecs/src/query.rs b/ecs/src/query.rs
index 1889e00..d7d2d1c 100644
--- a/ecs/src/query.rs
+++ b/ecs/src/query.rs
@@ -5,11 +5,8 @@ use std::marker::PhantomData;
 use seq_macro::seq;
 
 use crate::component::{Component, FromLockedOptional, Ref as ComponentRef};
-use crate::query::flexible::{
-    EntityHandle,
-    Iter as FlexibleQueryIter,
-    Query as FlexibleQuery,
-};
+use crate::entity::Handle as EntityHandle;
+use crate::query::flexible::{Iter as FlexibleQueryIter, Query as FlexibleQuery};
 use crate::system::{Param as SystemParam, System};
 use crate::uid::Uid;
 use crate::util::VecExt;
@@ -39,11 +36,11 @@ where
     #[must_use]
     pub fn iter<'query>(
         &'query self,
-    ) -> ComponentIter<'query, 'world, FieldTerms, FlexibleQueryIter<'query>>
+    ) -> Iter<'query, 'world, FieldTerms, FlexibleQueryIter<'query>>
     {
         tracing::trace!("Searching for {}", std::any::type_name::<FieldTerms>());
 
-        ComponentIter {
+        Iter {
             world: self.world,
             iter: self.inner.iter(),
             comps_pd: PhantomData,
@@ -51,7 +48,7 @@ where
     }
 
     /// Iterates over the entities matching this query, the iterator item being the entity
-    /// [`Uid`] and the entity components.
+    /// [`Uid`] and the matching entity components.
     #[must_use]
     pub fn iter_with_euids<'query>(
         &'query self,
@@ -70,18 +67,18 @@ where
     /// `func`.
     ///
     /// This function exists so that a custom [`EntityHandle`] iterator can be given to
-    /// [`ComponentIter`] without giving the user access to a reference to the [`World`].
+    /// [`Iter`] without giving the user access to a reference to the [`World`].
     #[must_use]
     pub fn iter_with<'query, OutIter>(
         &'query self,
         func: impl FnOnce(FlexibleQueryIter<'query>) -> OutIter,
-    ) -> ComponentIter<'query, 'world, FieldTerms, OutIter>
+    ) -> Iter<'query, 'world, FieldTerms, OutIter>
     where
         OutIter: Iterator<Item = EntityHandle<'query>>,
     {
         tracing::trace!("Searching for {}", std::any::type_name::<FieldTerms>());
 
-        ComponentIter {
+        Iter {
             world: self.world,
             iter: func(self.inner.iter()),
             comps_pd: PhantomData,
@@ -116,7 +113,7 @@ where
     FieldTerms: TermWithFieldTuple + 'world,
     FieldlessTerms: TermWithoutFieldTuple,
 {
-    type IntoIter = ComponentIter<'query, 'world, FieldTerms, FlexibleQueryIter<'query>>;
+    type IntoIter = Iter<'query, 'world, FieldTerms, FlexibleQueryIter<'query>>;
     type Item = FieldTerms::Fields<'query>;
 
     fn into_iter(self) -> Self::IntoIter
@@ -304,7 +301,7 @@ impl<ComponentRefT: ComponentRef> TermWithField for ComponentRefT
         Self::Field::from_locked_optional_component(
             entity_handle
                 .get_component(ComponentRefT::Component::id())
-                .map(|component| &component.component),
+                .map(|component| component.component()),
             world,
         )
         .unwrap_or_else(|err| {
@@ -333,7 +330,7 @@ pub trait TermWithFieldTuple
     ) -> Self::Fields<'component>;
 }
 
-pub struct ComponentIter<'query, 'world, FieldTerms, EntityHandleIter>
+pub struct Iter<'query, 'world, FieldTerms, EntityHandleIter>
 where
     FieldTerms: TermWithFieldTuple + 'world,
     EntityHandleIter: Iterator<Item = EntityHandle<'query>>,
@@ -344,7 +341,7 @@ where
 }
 
 impl<'query, 'world, FieldTerms, EntityHandleIter>
-    ComponentIter<'query, 'world, FieldTerms, EntityHandleIter>
+    Iter<'query, 'world, FieldTerms, EntityHandleIter>
 where
     FieldTerms: TermWithFieldTuple + 'world,
     EntityHandleIter: Iterator<Item = EntityHandle<'query>>,
@@ -363,7 +360,7 @@ where
 }
 
 impl<'query, 'world, FieldTerms, EntityHandleIter> Iterator
-    for ComponentIter<'query, 'world, FieldTerms, EntityHandleIter>
+    for Iter<'query, 'world, FieldTerms, EntityHandleIter>
 where
     FieldTerms: TermWithFieldTuple + 'world,
     EntityHandleIter: Iterator<Item = EntityHandle<'query>>,