diff --git a/extras/tests/Misc/TypeTraits.cpp b/extras/tests/Misc/TypeTraits.cpp
index 5f861afa..8fc5199a 100644
--- a/extras/tests/Misc/TypeTraits.cpp
+++ b/extras/tests/Misc/TypeTraits.cpp
@@ -183,8 +183,8 @@ TEST_CASE("Polyfills/type_traits") {
     CHECK((is_convertible<JsonPair, JsonVariantConst>::value == false));
     CHECK((is_convertible<VariantRef, JsonVariantConst>::value == true));
     CHECK((is_convertible<VariantConstRef, JsonVariantConst>::value == true));
-    CHECK((is_convertible<ArrayRef, JsonVariantConst>::value == true));
-    CHECK((is_convertible<ElementProxy<ArrayRef>, JsonVariantConst>::value ==
+    CHECK((is_convertible<JsonArray, JsonVariantConst>::value == true));
+    CHECK((is_convertible<ElementProxy<JsonArray>, JsonVariantConst>::value ==
            true));
     CHECK((is_convertible<ArrayConstRef, JsonVariantConst>::value == true));
     CHECK((is_convertible<ObjectRef, JsonVariantConst>::value == true));
diff --git a/src/ArduinoJson.hpp b/src/ArduinoJson.hpp
index b63cb756..406ddf80 100644
--- a/src/ArduinoJson.hpp
+++ b/src/ArduinoJson.hpp
@@ -21,15 +21,15 @@
 #  endif
 #endif
 
-#include "ArduinoJson/Array/ArrayRef.hpp"
+#include "ArduinoJson/Array/JsonArray.hpp"
 #include "ArduinoJson/Object/ObjectRef.hpp"
 #include "ArduinoJson/Variant/VariantConstRef.hpp"
 
 #include "ArduinoJson/Document/DynamicJsonDocument.hpp"
 #include "ArduinoJson/Document/StaticJsonDocument.hpp"
 
-#include "ArduinoJson/Array/ArrayImpl.hpp"
 #include "ArduinoJson/Array/ElementProxy.hpp"
+#include "ArduinoJson/Array/JsonArrayImpl.hpp"
 #include "ArduinoJson/Array/Utilities.hpp"
 #include "ArduinoJson/Collection/CollectionImpl.hpp"
 #include "ArduinoJson/Object/MemberProxy.hpp"
@@ -48,7 +48,7 @@
 
 namespace ArduinoJson {
 typedef ARDUINOJSON_NAMESPACE::ArrayConstRef JsonArrayConst;
-typedef ARDUINOJSON_NAMESPACE::ArrayRef JsonArray;
+using ARDUINOJSON_NAMESPACE::JsonArray;
 typedef ARDUINOJSON_NAMESPACE::Float JsonFloat;
 typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger;
 typedef ARDUINOJSON_NAMESPACE::ObjectConstRef JsonObjectConst;
diff --git a/src/ArduinoJson/Array/ArrayConstRef.hpp b/src/ArduinoJson/Array/ArrayConstRef.hpp
index 2b47fc3c..74bcb7ee 100644
--- a/src/ArduinoJson/Array/ArrayConstRef.hpp
+++ b/src/ArduinoJson/Array/ArrayConstRef.hpp
@@ -13,7 +13,7 @@ namespace ARDUINOJSON_NAMESPACE {
 class ObjectRef;
 
 class ArrayConstRef : public VariantOperators<ArrayConstRef> {
-  friend class ArrayRef;
+  friend class JsonArray;
   friend class VariantAttorney;
 
  public:
diff --git a/src/ArduinoJson/Array/ArrayIterator.hpp b/src/ArduinoJson/Array/ArrayIterator.hpp
index 8c3494fc..3e5326a1 100644
--- a/src/ArduinoJson/Array/ArrayIterator.hpp
+++ b/src/ArduinoJson/Array/ArrayIterator.hpp
@@ -26,7 +26,7 @@ class VariantPtr {
 };
 
 class ArrayIterator {
-  friend class ArrayRef;
+  friend class JsonArray;
 
  public:
   ArrayIterator() : _slot(0) {}
@@ -80,7 +80,7 @@ class VariantConstPtr {
 };
 
 class ArrayConstRefIterator {
-  friend class ArrayRef;
+  friend class JsonArray;
 
  public:
   ArrayConstRefIterator() : _slot(0) {}
diff --git a/src/ArduinoJson/Array/ArrayRef.hpp b/src/ArduinoJson/Array/JsonArray.hpp
similarity index 81%
rename from src/ArduinoJson/Array/ArrayRef.hpp
rename to src/ArduinoJson/Array/JsonArray.hpp
index c351905b..dc940fa6 100644
--- a/src/ArduinoJson/Array/ArrayRef.hpp
+++ b/src/ArduinoJson/Array/JsonArray.hpp
@@ -11,14 +11,14 @@ namespace ARDUINOJSON_NAMESPACE {
 
 class ObjectRef;
 
-class ArrayRef : public VariantOperators<ArrayRef> {
+class JsonArray : public VariantOperators<JsonArray> {
   friend class VariantAttorney;
 
  public:
   typedef ArrayIterator iterator;
 
-  FORCE_INLINE ArrayRef() : _data(0), _pool(0) {}
-  FORCE_INLINE ArrayRef(MemoryPool* pool, CollectionData* data)
+  FORCE_INLINE JsonArray() : _data(0), _pool(0) {}
+  FORCE_INLINE JsonArray(MemoryPool* pool, CollectionData* data)
       : _data(data), _pool(pool) {}
 
   operator VariantRef() {
@@ -56,14 +56,14 @@ class ArrayRef : public VariantOperators<ArrayRef> {
     return iterator();
   }
 
-  // Copy a ArrayRef
+  // Copy a JsonArray
   FORCE_INLINE bool set(ArrayConstRef src) const {
     if (!_data || !src._data)
       return false;
     return _data->copyFrom(*src._data, _pool);
   }
 
-  FORCE_INLINE bool operator==(ArrayRef rhs) const {
+  FORCE_INLINE bool operator==(JsonArray rhs) const {
     return ArrayConstRef(_data) == ArrayConstRef(rhs._data);
   }
 
@@ -88,14 +88,14 @@ class ArrayRef : public VariantOperators<ArrayRef> {
   }
 
   // Returns the element at specified index if the variant is an array.
-  FORCE_INLINE ElementProxy<ArrayRef> operator[](size_t index) const {
-    return ElementProxy<ArrayRef>(*this, index);
+  FORCE_INLINE ElementProxy<JsonArray> operator[](size_t index) const {
+    return ElementProxy<JsonArray>(*this, index);
   }
 
   FORCE_INLINE ObjectRef createNestedObject() const;
 
-  FORCE_INLINE ArrayRef createNestedArray() const {
-    return add().to<ArrayRef>();
+  FORCE_INLINE JsonArray createNestedArray() const {
+    return add().to<JsonArray>();
   }
 
   operator VariantConstRef() const {
@@ -140,18 +140,19 @@ class ArrayRef : public VariantOperators<ArrayRef> {
 };
 
 template <>
-struct Converter<ArrayRef> : private VariantAttorney {
+struct Converter<JsonArray> : private VariantAttorney {
   static void toJson(VariantConstRef src, VariantRef dst) {
     variantCopyFrom(getData(dst), getData(src), getPool(dst));
   }
 
-  static ArrayRef fromJson(VariantRef src) {
+  static JsonArray fromJson(VariantRef src) {
     VariantData* data = getData(src);
     MemoryPool* pool = getPool(src);
-    return ArrayRef(pool, data != 0 ? data->asArray() : 0);
+    return JsonArray(pool, data != 0 ? data->asArray() : 0);
   }
 
-  static InvalidConversion<VariantConstRef, ArrayRef> fromJson(VariantConstRef);
+  static InvalidConversion<VariantConstRef, JsonArray> fromJson(
+      VariantConstRef);
 
   static bool checkJson(VariantConstRef) {
     return false;
diff --git a/src/ArduinoJson/Array/ArrayImpl.hpp b/src/ArduinoJson/Array/JsonArrayImpl.hpp
similarity index 74%
rename from src/ArduinoJson/Array/ArrayImpl.hpp
rename to src/ArduinoJson/Array/JsonArrayImpl.hpp
index 646820ef..a65d6086 100644
--- a/src/ArduinoJson/Array/ArrayImpl.hpp
+++ b/src/ArduinoJson/Array/JsonArrayImpl.hpp
@@ -4,18 +4,18 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Array/JsonArray.hpp>
 #include <ArduinoJson/Object/ObjectRef.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
-inline ObjectRef ArrayRef::createNestedObject() const {
+inline ObjectRef JsonArray::createNestedObject() const {
   return add().to<ObjectRef>();
 }
 
 template <typename TDerived>
-inline ArrayRef VariantRefBase<TDerived>::createNestedArray() const {
-  return add().template to<ArrayRef>();
+inline JsonArray VariantRefBase<TDerived>::createNestedArray() const {
+  return add().template to<JsonArray>();
 }
 
 template <typename TDerived>
diff --git a/src/ArduinoJson/Array/Utilities.hpp b/src/ArduinoJson/Array/Utilities.hpp
index 974535d7..9a2d1ea5 100644
--- a/src/ArduinoJson/Array/Utilities.hpp
+++ b/src/ArduinoJson/Array/Utilities.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Array/JsonArray.hpp>
 #include <ArduinoJson/Document/JsonDocument.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
@@ -45,13 +45,13 @@ inline bool copyArray(const char* src, size_t, const TDestination& dst) {
 // Copy array to a JsonDocument
 template <typename T>
 inline bool copyArray(const T& src, JsonDocument& dst) {
-  return copyArray(src, dst.to<ArrayRef>());
+  return copyArray(src, dst.to<JsonArray>());
 }
 
 // Copy a ptr+size array to a JsonDocument
 template <typename T>
 inline bool copyArray(const T* src, size_t len, JsonDocument& dst) {
-  return copyArray(src, len, dst.to<ArrayRef>());
+  return copyArray(src, len, dst.to<JsonArray>());
 }
 
 // Trivial case form to stop the recursion
diff --git a/src/ArduinoJson/Document/BasicJsonDocument.hpp b/src/ArduinoJson/Document/BasicJsonDocument.hpp
index 23e16d9b..687f6462 100644
--- a/src/ArduinoJson/Document/BasicJsonDocument.hpp
+++ b/src/ArduinoJson/Document/BasicJsonDocument.hpp
@@ -66,7 +66,7 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
       const T& src,
       typename enable_if<
           is_same<T, VariantRef>::value || is_same<T, VariantConstRef>::value ||
-          is_same<T, ArrayRef>::value || is_same<T, ArrayConstRef>::value ||
+          is_same<T, JsonArray>::value || is_same<T, ArrayConstRef>::value ||
           is_same<T, ObjectRef>::value ||
           is_same<T, ObjectConstRef>::value>::type* = 0)
       : JsonDocument(allocPool(src.memoryUsage())) {
diff --git a/src/ArduinoJson/Document/JsonDocument.hpp b/src/ArduinoJson/Document/JsonDocument.hpp
index 371ea379..6014f71d 100644
--- a/src/ArduinoJson/Document/JsonDocument.hpp
+++ b/src/ArduinoJson/Document/JsonDocument.hpp
@@ -83,23 +83,23 @@ class JsonDocument : public VariantOperators<const JsonDocument&> {
     return getVariant().template to<T>();
   }
 
-  ArrayRef createNestedArray() {
-    return add().to<ArrayRef>();
+  JsonArray createNestedArray() {
+    return add().to<JsonArray>();
   }
 
   // createNestedArray(char*)
   // createNestedArray(const char*)
   // createNestedArray(const __FlashStringHelper*)
   template <typename TChar>
-  ArrayRef createNestedArray(TChar* key) {
-    return operator[](key).template to<ArrayRef>();
+  JsonArray createNestedArray(TChar* key) {
+    return operator[](key).template to<JsonArray>();
   }
 
   // createNestedArray(const std::string&)
   // createNestedArray(const String&)
   template <typename TString>
-  ArrayRef createNestedArray(const TString& key) {
-    return operator[](key).template to<ArrayRef>();
+  JsonArray createNestedArray(const TString& key) {
+    return operator[](key).template to<JsonArray>();
   }
 
   ObjectRef createNestedObject() {
diff --git a/src/ArduinoJson/Object/ObjectImpl.hpp b/src/ArduinoJson/Object/ObjectImpl.hpp
index 15d86539..fa1839c9 100644
--- a/src/ArduinoJson/Object/ObjectImpl.hpp
+++ b/src/ArduinoJson/Object/ObjectImpl.hpp
@@ -4,32 +4,32 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Array/JsonArray.hpp>
 #include <ArduinoJson/Object/ObjectRef.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
 template <typename TString>
-inline ArrayRef ObjectRef::createNestedArray(const TString& key) const {
-  return operator[](key).template to<ArrayRef>();
+inline JsonArray ObjectRef::createNestedArray(const TString& key) const {
+  return operator[](key).template to<JsonArray>();
 }
 
 template <typename TChar>
-inline ArrayRef ObjectRef::createNestedArray(TChar* key) const {
-  return operator[](key).template to<ArrayRef>();
+inline JsonArray ObjectRef::createNestedArray(TChar* key) const {
+  return operator[](key).template to<JsonArray>();
 }
 
 template <typename TDerived>
 template <typename TString>
-inline ArrayRef VariantRefBase<TDerived>::createNestedArray(
+inline JsonArray VariantRefBase<TDerived>::createNestedArray(
     const TString& key) const {
-  return operator[](key).template to<ArrayRef>();
+  return operator[](key).template to<JsonArray>();
 }
 
 template <typename TDerived>
 template <typename TChar>
-inline ArrayRef VariantRefBase<TDerived>::createNestedArray(TChar* key) const {
-  return operator[](key).template to<ArrayRef>();
+inline JsonArray VariantRefBase<TDerived>::createNestedArray(TChar* key) const {
+  return operator[](key).template to<JsonArray>();
 }
 
 template <typename TDerived>
diff --git a/src/ArduinoJson/Object/ObjectRef.hpp b/src/ArduinoJson/Object/ObjectRef.hpp
index 469316dd..a247b652 100644
--- a/src/ArduinoJson/Object/ObjectRef.hpp
+++ b/src/ArduinoJson/Object/ObjectRef.hpp
@@ -9,7 +9,7 @@
 
 namespace ARDUINOJSON_NAMESPACE {
 
-class ArrayRef;
+class JsonArray;
 
 class ObjectRef : public VariantOperators<ObjectRef> {
   friend class VariantAttorney;
@@ -128,10 +128,10 @@ class ObjectRef : public VariantOperators<ObjectRef> {
   }
 
   template <typename TString>
-  FORCE_INLINE ArrayRef createNestedArray(const TString& key) const;
+  FORCE_INLINE JsonArray createNestedArray(const TString& key) const;
 
   template <typename TChar>
-  FORCE_INLINE ArrayRef createNestedArray(TChar* key) const;
+  FORCE_INLINE JsonArray createNestedArray(TChar* key) const;
 
   template <typename TString>
   ObjectRef createNestedObject(const TString& key) const {
diff --git a/src/ArduinoJson/Variant/VariantConstRef.hpp b/src/ArduinoJson/Variant/VariantConstRef.hpp
index b6cf3c1c..7ecf57af 100644
--- a/src/ArduinoJson/Variant/VariantConstRef.hpp
+++ b/src/ArduinoJson/Variant/VariantConstRef.hpp
@@ -20,7 +20,7 @@
 namespace ARDUINOJSON_NAMESPACE {
 
 // Forward declarations.
-class ArrayRef;
+class JsonArray;
 class ObjectRef;
 
 class VariantConstRef : public VariantTag,
diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp
index 10ab52cb..051bd752 100644
--- a/src/ArduinoJson/Variant/VariantImpl.hpp
+++ b/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Array/JsonArray.hpp>
 #include <ArduinoJson/Configuration.hpp>
 #include <ArduinoJson/Numbers/convertNumber.hpp>
 #include <ArduinoJson/Numbers/parseNumber.hpp>
@@ -121,9 +121,9 @@ inline VariantRef VariantRefBase<TDerived>::getOrCreateVariant() const {
 
 template <typename TDerived>
 template <typename T>
-inline typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type
+inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type
 VariantRefBase<TDerived>::to() const {
-  return ArrayRef(getPool(), variantToArray(getOrCreateData()));
+  return JsonArray(getPool(), variantToArray(getOrCreateData()));
 }
 
 template <typename TDerived>
diff --git a/src/ArduinoJson/Variant/VariantRefBase.hpp b/src/ArduinoJson/Variant/VariantRefBase.hpp
index 47064eb0..754b2171 100644
--- a/src/ArduinoJson/Variant/VariantRefBase.hpp
+++ b/src/ArduinoJson/Variant/VariantRefBase.hpp
@@ -74,9 +74,9 @@ class VariantRefBase : public VariantTag {
 
   // Change the type of the variant
   //
-  // ArrayRef to<ArrayRef>()
+  // JsonArray to<JsonArray>()
   template <typename T>
-  typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type to() const;
+  typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type to() const;
   //
   // ObjectRef to<ObjectRef>()
   template <typename T>
@@ -199,7 +199,7 @@ class VariantRefBase : public VariantTag {
       data->remove(adaptString(key));
   }
 
-  FORCE_INLINE ArrayRef createNestedArray() const;
+  FORCE_INLINE JsonArray createNestedArray() const;
   FORCE_INLINE ObjectRef createNestedObject() const;
   FORCE_INLINE ElementProxy<TDerived> operator[](size_t index) const;
 
@@ -222,10 +222,10 @@ class VariantRefBase : public VariantTag {
   operator[](TChar* key) const;
 
   template <typename TString>
-  FORCE_INLINE ArrayRef createNestedArray(const TString& key) const;
+  FORCE_INLINE JsonArray createNestedArray(const TString& key) const;
 
   template <typename TChar>
-  FORCE_INLINE ArrayRef createNestedArray(TChar* key) const;
+  FORCE_INLINE JsonArray createNestedArray(TChar* key) const;
 
   template <typename TString>
   ObjectRef createNestedObject(const TString& key) const;
diff --git a/src/ArduinoJson/Variant/VariantTo.hpp b/src/ArduinoJson/Variant/VariantTo.hpp
index 932977f7..02558d2a 100644
--- a/src/ArduinoJson/Variant/VariantTo.hpp
+++ b/src/ArduinoJson/Variant/VariantTo.hpp
@@ -7,7 +7,7 @@
 #include <ArduinoJson/Namespace.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
-class ArrayRef;
+class JsonArray;
 class ObjectRef;
 class VariantRef;
 
@@ -17,8 +17,8 @@ template <typename T>
 struct VariantTo {};
 
 template <>
-struct VariantTo<ArrayRef> {
-  typedef ArrayRef type;
+struct VariantTo<JsonArray> {
+  typedef JsonArray type;
 };
 template <>
 struct VariantTo<ObjectRef> {