2 files changed, 10 insertions, 10 deletions
diff --git a/include/iterator.h b/include/iterator.h
index 13b30fc..ad9820a 100644
--- a/include/iterator.h
+++ b/include/iterator.h
@@ -2,19 +2,19 @@
  *  Iterator.h
  *
  *  Base class for iterators. Extension writers that want to create traversable
- *  classes, should override this class and implement all pure virtual methods
- *  in it.
+ *  classes, should override the Php::Traversable base class. This base class
+ *  forces you to implement a getIterator() method that returns an instance of 
+ *  a Php::Iterator class.
+ * 
+ *  In this file you find the signature of the Php::Iterator class. It mostly has
+ *  pure virtual methods, which means that you should create a derived class
+ *  that implements all these methods.
  *
  *  @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
  *  @copyright 2014 Copernica BV
  */
 
 /**
- *  Forward declarations
- */
-struct _zend_object_iterator_funcs;
-
-/**
  *  Set up namespace
  */
 namespace Php {
diff --git a/include/valueiterator.h b/include/valueiterator.h
index fd8118d..8bc9208 100644
--- a/include/valueiterator.h
+++ b/include/valueiterator.h
@@ -25,7 +25,7 @@ namespace Php {
 /**
  *  Forward declarations
  */
-class IteratorImpl;
+class ValueIteratorImpl;
 
 /**
  *  Class definition
@@ -37,7 +37,7 @@ public:
      *  Constructor
      *  @param  impl        Implementation iterator
      */
-    ValueIterator(IteratorImpl *impl) : _impl(impl) {}
+    ValueIterator(ValueIteratorImpl *impl) : _impl(impl) {}
     
     /**
      *  Copy constructor
@@ -125,7 +125,7 @@ private:
      *  Pointer to the actual implementation
      *  @var    std::unique_ptr
      */
-    IteratorImpl *_impl;
+    ValueIteratorImpl *_impl;
 
 };