diff --git a/src/ArduinoJson/Array/JsonArray.hpp b/src/ArduinoJson/Array/JsonArray.hpp
index fecfaeb1..f8311cc0 100644
--- a/src/ArduinoJson/Array/JsonArray.hpp
+++ b/src/ArduinoJson/Array/JsonArray.hpp
@@ -15,7 +15,7 @@ class JsonArray : public VariantOperators<JsonArray> {
   friend class VariantAttorney;
 
  public:
-  typedef ArrayIterator iterator;
+  typedef JsonArrayIterator iterator;
 
   FORCE_INLINE JsonArray() : _data(0), _pool(0) {}
   FORCE_INLINE JsonArray(MemoryPool* pool, CollectionData* data)
diff --git a/src/ArduinoJson/Array/JsonArrayConst.hpp b/src/ArduinoJson/Array/JsonArrayConst.hpp
index 98876984..d5a0d1af 100644
--- a/src/ArduinoJson/Array/JsonArrayConst.hpp
+++ b/src/ArduinoJson/Array/JsonArrayConst.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayIterator.hpp>
+#include <ArduinoJson/Array/JsonArrayIterator.hpp>
 #include <ArduinoJson/Variant/VariantAttorney.hpp>
 #include <ArduinoJson/Variant/VariantData.hpp>
 
diff --git a/src/ArduinoJson/Array/ArrayIterator.hpp b/src/ArduinoJson/Array/JsonArrayIterator.hpp
similarity index 86%
rename from src/ArduinoJson/Array/ArrayIterator.hpp
rename to src/ArduinoJson/Array/JsonArrayIterator.hpp
index 27c84cd4..4d0afe29 100644
--- a/src/ArduinoJson/Array/ArrayIterator.hpp
+++ b/src/ArduinoJson/Array/JsonArrayIterator.hpp
@@ -25,12 +25,12 @@ class VariantPtr {
   VariantRef _variant;
 };
 
-class ArrayIterator {
+class JsonArrayIterator {
   friend class JsonArray;
 
  public:
-  ArrayIterator() : _slot(0) {}
-  explicit ArrayIterator(MemoryPool* pool, VariantSlot* slot)
+  JsonArrayIterator() : _slot(0) {}
+  explicit JsonArrayIterator(MemoryPool* pool, VariantSlot* slot)
       : _pool(pool), _slot(slot) {}
 
   VariantRef operator*() const {
@@ -40,20 +40,20 @@ class ArrayIterator {
     return VariantPtr(_pool, _slot->data());
   }
 
-  bool operator==(const ArrayIterator& other) const {
+  bool operator==(const JsonArrayIterator& other) const {
     return _slot == other._slot;
   }
 
-  bool operator!=(const ArrayIterator& other) const {
+  bool operator!=(const JsonArrayIterator& other) const {
     return _slot != other._slot;
   }
 
-  ArrayIterator& operator++() {
+  JsonArrayIterator& operator++() {
     _slot = _slot->next();
     return *this;
   }
 
-  ArrayIterator& operator+=(size_t distance) {
+  JsonArrayIterator& operator+=(size_t distance) {
     _slot = _slot->next(distance);
     return *this;
   }