diff --git a/src/ArduinoJson.hpp b/src/ArduinoJson.hpp
index 498eebb4..f99f7377 100644
--- a/src/ArduinoJson.hpp
+++ b/src/ArduinoJson.hpp
@@ -53,8 +53,8 @@ typedef ARDUINOJSON_NAMESPACE::Float JsonFloat;
 typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger;
 using ARDUINOJSON_NAMESPACE::JsonObject;
 using ARDUINOJSON_NAMESPACE::JsonObjectConst;
-typedef ARDUINOJSON_NAMESPACE::Pair JsonPair;
-typedef ARDUINOJSON_NAMESPACE::PairConst JsonPairConst;
+using ARDUINOJSON_NAMESPACE::JsonPair;
+using ARDUINOJSON_NAMESPACE::JsonPairConst;
 typedef ARDUINOJSON_NAMESPACE::String JsonString;
 typedef ARDUINOJSON_NAMESPACE::UInt JsonUInt;
 typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst;
diff --git a/src/ArduinoJson/Object/Pair.hpp b/src/ArduinoJson/Object/JsonPair.hpp
similarity index 88%
rename from src/ArduinoJson/Object/Pair.hpp
rename to src/ArduinoJson/Object/JsonPair.hpp
index 29f10a5f..cad11d7e 100644
--- a/src/ArduinoJson/Object/Pair.hpp
+++ b/src/ArduinoJson/Object/JsonPair.hpp
@@ -10,9 +10,9 @@
 
 namespace ARDUINOJSON_NAMESPACE {
 // A key value pair for CollectionData.
-class Pair {
+class JsonPair {
  public:
-  Pair(MemoryPool* pool, VariantSlot* slot) {
+  JsonPair(MemoryPool* pool, VariantSlot* slot) {
     if (slot) {
       _key = String(slot->key(),
                     slot->ownsKey() ? String::Copied : String::Linked);
@@ -33,9 +33,9 @@ class Pair {
   VariantRef _value;
 };
 
-class PairConst {
+class JsonPairConst {
  public:
-  PairConst(const VariantSlot* slot) {
+  JsonPairConst(const VariantSlot* slot) {
     if (slot) {
       _key = String(slot->key(),
                     slot->ownsKey() ? String::Copied : String::Linked);
diff --git a/src/ArduinoJson/Object/ObjectIterator.hpp b/src/ArduinoJson/Object/ObjectIterator.hpp
index 01456bd6..adc18f18 100644
--- a/src/ArduinoJson/Object/ObjectIterator.hpp
+++ b/src/ArduinoJson/Object/ObjectIterator.hpp
@@ -4,25 +4,25 @@
 
 #pragma once
 
-#include <ArduinoJson/Object/Pair.hpp>
+#include <ArduinoJson/Object/JsonPair.hpp>
 #include <ArduinoJson/Variant/SlotFunctions.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
-class PairPtr {
+class JsonPairPtr {
  public:
-  PairPtr(MemoryPool* pool, VariantSlot* slot) : _pair(pool, slot) {}
+  JsonPairPtr(MemoryPool* pool, VariantSlot* slot) : _pair(pool, slot) {}
 
-  const Pair* operator->() const {
+  const JsonPair* operator->() const {
     return &_pair;
   }
 
-  const Pair& operator*() const {
+  const JsonPair& operator*() const {
     return _pair;
   }
 
  private:
-  Pair _pair;
+  JsonPair _pair;
 };
 
 class ObjectIterator {
@@ -34,11 +34,11 @@ class ObjectIterator {
   explicit ObjectIterator(MemoryPool* pool, VariantSlot* slot)
       : _pool(pool), _slot(slot) {}
 
-  Pair operator*() const {
-    return Pair(_pool, _slot);
+  JsonPair operator*() const {
+    return JsonPair(_pool, _slot);
   }
-  PairPtr operator->() {
-    return PairPtr(_pool, _slot);
+  JsonPairPtr operator->() {
+    return JsonPairPtr(_pool, _slot);
   }
 
   bool operator==(const ObjectIterator& other) const {
@@ -64,20 +64,20 @@ class ObjectIterator {
   VariantSlot* _slot;
 };
 
-class PairConstPtr {
+class JsonPairConstPtr {
  public:
-  PairConstPtr(const VariantSlot* slot) : _pair(slot) {}
+  JsonPairConstPtr(const VariantSlot* slot) : _pair(slot) {}
 
-  const PairConst* operator->() const {
+  const JsonPairConst* operator->() const {
     return &_pair;
   }
 
-  const PairConst& operator*() const {
+  const JsonPairConst& operator*() const {
     return _pair;
   }
 
  private:
-  PairConst _pair;
+  JsonPairConst _pair;
 };
 
 class ObjectConstIterator {
@@ -88,11 +88,11 @@ class ObjectConstIterator {
 
   explicit ObjectConstIterator(const VariantSlot* slot) : _slot(slot) {}
 
-  PairConst operator*() const {
-    return PairConst(_slot);
+  JsonPairConst operator*() const {
+    return JsonPairConst(_slot);
   }
-  PairConstPtr operator->() {
-    return PairConstPtr(_slot);
+  JsonPairConstPtr operator->() {
+    return JsonPairConstPtr(_slot);
   }
 
   bool operator==(const ObjectConstIterator& other) const {