diff --git a/include/ArduinoJson/Internals/List.hpp b/include/ArduinoJson/Internals/List.hpp
index 2800b681..264b4adb 100644
--- a/include/ArduinoJson/Internals/List.hpp
+++ b/include/ArduinoJson/Internals/List.hpp
@@ -17,7 +17,7 @@ template <typename T>
 class List {
  public:
   typedef T value_type;
-  typedef Node<T> node_type;
+  typedef ListNode<T> node_type;
   typedef ListIterator<T> iterator;
   typedef ListConstIterator<T> const_iterator;
 
diff --git a/include/ArduinoJson/Internals/ListConstIterator.hpp b/include/ArduinoJson/Internals/ListConstIterator.hpp
index a4381399..9f41d06d 100644
--- a/include/ArduinoJson/Internals/ListConstIterator.hpp
+++ b/include/ArduinoJson/Internals/ListConstIterator.hpp
@@ -12,7 +12,7 @@ namespace Internals {
 template <typename T>
 class ListConstIterator {
  public:
-  explicit ListConstIterator(const Node<T> *node = NULL) : _node(node) {}
+  explicit ListConstIterator(const ListNode<T> *node = NULL) : _node(node) {}
 
   const T &operator*() const { return _node->content; }
   const T *operator->() { return &_node->content; }
@@ -31,7 +31,7 @@ class ListConstIterator {
   }
 
  private:
-  const Node<T> *_node;
+  const ListNode<T> *_node;
 };
 }
 }
diff --git a/include/ArduinoJson/Internals/ListIterator.hpp b/include/ArduinoJson/Internals/ListIterator.hpp
index 5ac40b78..84d0f7d5 100644
--- a/include/ArduinoJson/Internals/ListIterator.hpp
+++ b/include/ArduinoJson/Internals/ListIterator.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Node.hpp"
+#include "ListNode.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -14,7 +14,7 @@ namespace Internals {
 template <typename T>
 class ListIterator {
  public:
-  explicit ListIterator(Node<T> *node = NULL) : _node(node) {}
+  explicit ListIterator(ListNode<T> *node = NULL) : _node(node) {}
 
   T &operator*() const { return _node->content; }
   T *operator->() { return &_node->content; }
@@ -33,7 +33,7 @@ class ListIterator {
   }
 
  private:
-  Node<T> *_node;
+  ListNode<T> *_node;
 };
 }
 }
diff --git a/include/ArduinoJson/Internals/Node.hpp b/include/ArduinoJson/Internals/ListNode.hpp
similarity index 79%
rename from include/ArduinoJson/Internals/Node.hpp
rename to include/ArduinoJson/Internals/ListNode.hpp
index 2bd47ad0..508537b3 100644
--- a/include/ArduinoJson/Internals/Node.hpp
+++ b/include/ArduinoJson/Internals/ListNode.hpp
@@ -12,10 +12,10 @@ namespace ArduinoJson {
 namespace Internals {
 
 template <typename T>
-struct Node {
-  Node() : next(NULL) {}
+struct ListNode {
+  ListNode() : next(NULL) {}
 
-  Node<T>* next;
+  ListNode<T>* next;
   T content;
 };
 }