diff --git a/src/ArduinoJson/Array/JsonArray.hpp b/src/ArduinoJson/Array/JsonArray.hpp
index c1346e8a..938e5425 100644
--- a/src/ArduinoJson/Array/JsonArray.hpp
+++ b/src/ArduinoJson/Array/JsonArray.hpp
@@ -65,7 +65,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   bool add(const T& value) const {
     if (!impl_.isArray())
       return false;
-    return addValue(value, impl_.getData(), impl_.getResourceManager());
+    return addValue(value, impl_.data(), impl_.getResourceManager());
   }
 
   // Appends a value to the array.
@@ -75,7 +75,7 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   bool add(T* value) const {
     if (!impl_.isArray())
       return false;
-    return addValue(value, impl_.getData(), impl_.getResourceManager());
+    return addValue(value, impl_.data(), impl_.getResourceManager());
   }
 
   // Returns an iterator to the first element of the array.
@@ -204,11 +204,11 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   }
 
   detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::VariantData* getOrCreateData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   // HACK: this function has been pulled out of VariantImpl to avoid the
diff --git a/src/ArduinoJson/Array/JsonArrayConst.hpp b/src/ArduinoJson/Array/JsonArrayConst.hpp
index b9c6c765..d3772ac3 100644
--- a/src/ArduinoJson/Array/JsonArrayConst.hpp
+++ b/src/ArduinoJson/Array/JsonArrayConst.hpp
@@ -64,7 +64,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   }
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(impl_.getData(), impl_.getResourceManager());
+    return JsonVariantConst(impl_.data(), impl_.getResourceManager());
   }
 
   // Returns true if the reference is unbound.
@@ -99,7 +99,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
 
  private:
   const detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::VariantImpl impl_;
diff --git a/src/ArduinoJson/Object/JsonObject.hpp b/src/ArduinoJson/Object/JsonObject.hpp
index f71bcde2..56d7afb0 100644
--- a/src/ArduinoJson/Object/JsonObject.hpp
+++ b/src/ArduinoJson/Object/JsonObject.hpp
@@ -226,11 +226,11 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   }
 
   detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::VariantData* getOrCreateData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   mutable detail::VariantImpl impl_;
diff --git a/src/ArduinoJson/Object/JsonObjectConst.hpp b/src/ArduinoJson/Object/JsonObjectConst.hpp
index 735b7248..f2139200 100644
--- a/src/ArduinoJson/Object/JsonObjectConst.hpp
+++ b/src/ArduinoJson/Object/JsonObjectConst.hpp
@@ -29,7 +29,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   JsonObjectConst(const detail::VariantImpl& impl) : impl_(impl) {}
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(impl_.getData(), impl_.getResourceManager());
+    return JsonVariantConst(impl_.data(), impl_.getResourceManager());
   }
 
   // Returns true if the reference is unbound.
@@ -133,7 +133,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
 
  private:
   const detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::VariantImpl impl_;
diff --git a/src/ArduinoJson/Variant/JsonVariant.hpp b/src/ArduinoJson/Variant/JsonVariant.hpp
index e3c09e1f..3a9498d5 100644
--- a/src/ArduinoJson/Variant/JsonVariant.hpp
+++ b/src/ArduinoJson/Variant/JsonVariant.hpp
@@ -31,11 +31,11 @@ class JsonVariant : public detail::VariantRefBase<JsonVariant>,
   }
 
   detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::VariantData* getOrCreateData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   mutable detail::VariantImpl impl_;
diff --git a/src/ArduinoJson/Variant/JsonVariantConst.hpp b/src/ArduinoJson/Variant/JsonVariantConst.hpp
index 46683926..9ecb4894 100644
--- a/src/ArduinoJson/Variant/JsonVariantConst.hpp
+++ b/src/ArduinoJson/Variant/JsonVariantConst.hpp
@@ -50,7 +50,7 @@ class JsonVariantConst : public detail::VariantTag,
 
   // Returns true if the reference is unbound.
   bool isUnbound() const {
-    return impl_.getData() == nullptr;
+    return impl_.data() == nullptr;
   }
 
   // Returns the depth (nesting level) of the value.
@@ -177,7 +177,7 @@ class JsonVariantConst : public detail::VariantTag,
 
  protected:
   detail::VariantData* getData() const {
-    return impl_.getData();
+    return impl_.data();
   }
 
   detail::ResourceManager* getResourceManager() const {
diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp
index df561944..e04d5434 100644
--- a/src/ArduinoJson/Variant/VariantImpl.hpp
+++ b/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -25,7 +25,7 @@ class VariantImpl {
   VariantImpl(VariantData* data, ResourceManager* resources)
       : data_(data), resources_(resources) {}
 
-  VariantData* getData() const {
+  VariantData* data() const {
     return data_;
   }