From 2998a55f0bf52bfc43fdcaaff8921ab64cdf54ec Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Mon, 3 Sep 2018 16:14:21 +0200
Subject: [PATCH] Renamed JsonBuffer to MemoryPool

---
 src/ArduinoJson/Data/List.hpp                 |  6 +--
 src/ArduinoJson/Data/ListNode.hpp             |  4 +-
 .../Deserialization/deserialize.hpp           | 29 ++++++------
 src/ArduinoJson/DynamicJsonDocument.hpp       | 21 ++++-----
 src/ArduinoJson/Json/JsonDeserializer.hpp     | 16 +++----
 src/ArduinoJson/JsonArray.hpp                 | 16 +++----
 src/ArduinoJson/JsonArrayData.hpp             | 10 ++---
 src/ArduinoJson/JsonArrayImpl.hpp             |  4 +-
 src/ArduinoJson/JsonArrayIterator.hpp         | 14 +++---
 src/ArduinoJson/JsonObject.hpp                | 30 +++++++------
 src/ArduinoJson/JsonObjectData.hpp            | 10 ++---
 src/ArduinoJson/JsonObjectImpl.hpp            |  4 +-
 src/ArduinoJson/JsonObjectIterator.hpp        | 14 +++---
 src/ArduinoJson/JsonPair.hpp                  |  4 +-
 src/ArduinoJson/JsonVariant.hpp               | 16 +++----
 src/ArduinoJson/JsonVariantImpl.hpp           |  4 +-
 .../Memory/AllocableInMemoryPool.hpp          | 22 ++++++++++
 ...icJsonBuffer.hpp => DynamicMemoryPool.hpp} | 26 +++++------
 .../Memory/JsonBufferAllocated.hpp            | 22 ----------
 .../Memory/{JsonBuffer.hpp => MemoryPool.hpp} |  8 ++--
 ...ticJsonBuffer.hpp => StaticMemoryPool.hpp} | 32 +++++++-------
 .../MsgPack/MsgPackDeserializer.hpp           | 16 +++----
 src/ArduinoJson/StaticJsonDocument.hpp        | 18 ++++----
 .../StringStorage/StringCopier.hpp            | 10 ++---
 src/ArduinoJson/StringStorage/StringMover.hpp |  2 +-
 .../StringStorage/StringStorage.hpp           | 28 ++++++------
 src/ArduinoJson/Strings/ArduinoString.hpp     |  4 +-
 .../Strings/FixedSizeFlashString.hpp          |  4 +-
 .../Strings/FixedSizeRamString.hpp            |  4 +-
 src/ArduinoJson/Strings/StlString.hpp         |  4 +-
 .../Strings/ZeroTerminatedFlashString.hpp     |  4 +-
 .../Strings/ZeroTerminatedRamString.hpp       |  4 +-
 test/CMakeLists.txt                           |  4 +-
 test/DynamicJsonBuffer/CMakeLists.txt         | 13 ------
 test/DynamicJsonBuffer/size.cpp               | 29 ------------
 test/DynamicMemoryPool/CMakeLists.txt         | 13 ++++++
 .../alloc.cpp                                 | 32 +++++++-------
 .../no_memory.cpp                             |  8 ++--
 test/DynamicMemoryPool/size.cpp               | 29 ++++++++++++
 .../startString.cpp                           | 22 +++++-----
 test/JsonArray/copyFrom.cpp                   |  4 +-
 .../deserializeJsonArrayStatic.cpp            |  2 +-
 test/StaticJsonBuffer/CMakeLists.txt          | 12 -----
 test/StaticJsonBuffer/size.cpp                | 44 -------------------
 test/StaticMemoryPool/CMakeLists.txt          | 12 +++++
 .../alloc.cpp                                 | 28 ++++++------
 test/StaticMemoryPool/size.cpp                | 44 +++++++++++++++++++
 .../startString.cpp                           | 20 ++++-----
 48 files changed, 365 insertions(+), 361 deletions(-)
 create mode 100644 src/ArduinoJson/Memory/AllocableInMemoryPool.hpp
 rename src/ArduinoJson/Memory/{DynamicJsonBuffer.hpp => DynamicMemoryPool.hpp} (85%)
 delete mode 100644 src/ArduinoJson/Memory/JsonBufferAllocated.hpp
 rename src/ArduinoJson/Memory/{JsonBuffer.hpp => MemoryPool.hpp} (87%)
 rename src/ArduinoJson/Memory/{StaticJsonBuffer.hpp => StaticMemoryPool.hpp} (74%)
 delete mode 100644 test/DynamicJsonBuffer/CMakeLists.txt
 delete mode 100644 test/DynamicJsonBuffer/size.cpp
 create mode 100644 test/DynamicMemoryPool/CMakeLists.txt
 rename test/{DynamicJsonBuffer => DynamicMemoryPool}/alloc.cpp (68%)
 rename test/{DynamicJsonBuffer => DynamicMemoryPool}/no_memory.cpp (79%)
 create mode 100644 test/DynamicMemoryPool/size.cpp
 rename test/{DynamicJsonBuffer => DynamicMemoryPool}/startString.cpp (55%)
 delete mode 100644 test/StaticJsonBuffer/CMakeLists.txt
 delete mode 100644 test/StaticJsonBuffer/size.cpp
 create mode 100644 test/StaticMemoryPool/CMakeLists.txt
 rename test/{StaticJsonBuffer => StaticMemoryPool}/alloc.cpp (59%)
 create mode 100644 test/StaticMemoryPool/size.cpp
 rename test/{StaticJsonBuffer => StaticMemoryPool}/startString.cpp (58%)

diff --git a/src/ArduinoJson/Data/List.hpp b/src/ArduinoJson/Data/List.hpp
index 5a1a91c3..e3f2f63d 100644
--- a/src/ArduinoJson/Data/List.hpp
+++ b/src/ArduinoJson/Data/List.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "../Memory/JsonBuffer.hpp"
+#include "../Memory/MemoryPool.hpp"
 #include "ListConstIterator.hpp"
 #include "ListIterator.hpp"
 
@@ -32,8 +32,8 @@ class List {
     return nodeCount;
   }
 
-  iterator add(JsonBuffer *buffer) {
-    node_type *newNode = new (buffer) node_type();
+  iterator add(MemoryPool *memoryPool) {
+    node_type *newNode = new (memoryPool) node_type();
 
     if (_firstNode) {
       node_type *lastNode = _firstNode;
diff --git a/src/ArduinoJson/Data/ListNode.hpp b/src/ArduinoJson/Data/ListNode.hpp
index 0dbb5dcf..cea708a3 100644
--- a/src/ArduinoJson/Data/ListNode.hpp
+++ b/src/ArduinoJson/Data/ListNode.hpp
@@ -6,7 +6,7 @@
 
 #include <stddef.h>  // for NULL
 
-#include "../Memory/JsonBufferAllocated.hpp"
+#include "../Memory/AllocableInMemoryPool.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -14,7 +14,7 @@ namespace Internals {
 // A node for a singly-linked list.
 // Used by List<T> and its iterators.
 template <typename T>
-struct ListNode : public Internals::JsonBufferAllocated {
+struct ListNode : public Internals::AllocableInMemoryPool {
   ListNode() NOEXCEPT : next(NULL) {}
 
   ListNode<T> *next;
diff --git a/src/ArduinoJson/Deserialization/deserialize.hpp b/src/ArduinoJson/Deserialization/deserialize.hpp
index 736e1bad..3c97364a 100644
--- a/src/ArduinoJson/Deserialization/deserialize.hpp
+++ b/src/ArduinoJson/Deserialization/deserialize.hpp
@@ -16,11 +16,12 @@ namespace ArduinoJson {
 namespace Internals {
 
 template <template <typename, typename> class TDeserializer,
-          typename TJsonBuffer, typename TReader, typename TWriter>
-TDeserializer<TReader, TWriter> makeDeserializer(TJsonBuffer *buffer,
+          typename TMemoryPool, typename TReader, typename TWriter>
+TDeserializer<TReader, TWriter> makeDeserializer(TMemoryPool &memoryPool,
                                                  TReader reader, TWriter writer,
                                                  uint8_t nestingLimit) {
-  return TDeserializer<TReader, TWriter>(buffer, reader, writer, nestingLimit);
+  return TDeserializer<TReader, TWriter>(memoryPool, reader, writer,
+                                         nestingLimit);
 }
 
 // DeserializationError deserialize(TDocument& doc, TString input);
@@ -32,9 +33,9 @@ typename Internals::enable_if<!Internals::is_array<TString>::value,
                               DeserializationError>::type
 deserialize(TDocument &doc, const TString &input) {
   using namespace Internals;
-  return makeDeserializer<TDeserializer>(&doc.buffer(), makeReader(input),
-                                         makeStringStorage(doc.buffer(), input),
-                                         doc.nestingLimit)
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), makeReader(input),
+             makeStringStorage(doc.memoryPool(), input), doc.nestingLimit)
       .parse(doc.template to<JsonVariantData>());
 }
 //
@@ -45,9 +46,9 @@ template <template <typename, typename> class TDeserializer, typename TDocument,
           typename TChar>
 DeserializationError deserialize(TDocument &doc, TChar *input) {
   using namespace Internals;
-  return makeDeserializer<TDeserializer>(&doc.buffer(), makeReader(input),
-                                         makeStringStorage(doc.buffer(), input),
-                                         doc.nestingLimit)
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), makeReader(input),
+             makeStringStorage(doc.memoryPool(), input), doc.nestingLimit)
       .parse(doc.template to<JsonVariantData>());
 }
 //
@@ -61,8 +62,8 @@ DeserializationError deserialize(TDocument &doc, TChar *input,
                                  size_t inputSize) {
   using namespace Internals;
   return makeDeserializer<TDeserializer>(
-             &doc.buffer(), makeReader(input, inputSize),
-             makeStringStorage(doc.buffer(), input), doc.nestingLimit)
+             doc.memoryPool(), makeReader(input, inputSize),
+             makeStringStorage(doc.memoryPool(), input), doc.nestingLimit)
       .parse(doc.template to<JsonVariantData>());
 }
 //
@@ -73,9 +74,9 @@ template <template <typename, typename> class TDeserializer, typename TDocument,
           typename TStream>
 DeserializationError deserialize(TDocument &doc, TStream &input) {
   using namespace Internals;
-  return makeDeserializer<TDeserializer>(&doc.buffer(), makeReader(input),
-                                         makeStringStorage(doc.buffer(), input),
-                                         doc.nestingLimit)
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), makeReader(input),
+             makeStringStorage(doc.memoryPool(), input), doc.nestingLimit)
       .parse(doc.template to<JsonVariantData>());
 }
 }  // namespace Internals
diff --git a/src/ArduinoJson/DynamicJsonDocument.hpp b/src/ArduinoJson/DynamicJsonDocument.hpp
index 3da4f509..91620af0 100644
--- a/src/ArduinoJson/DynamicJsonDocument.hpp
+++ b/src/ArduinoJson/DynamicJsonDocument.hpp
@@ -7,7 +7,7 @@
 #include "JsonArray.hpp"
 #include "JsonObject.hpp"
 #include "JsonVariant.hpp"
-#include "Memory/DynamicJsonBuffer.hpp"
+#include "Memory/DynamicMemoryPool.hpp"
 
 namespace ArduinoJson {
 
@@ -17,7 +17,8 @@ class DynamicJsonDocument {
 
   DynamicJsonDocument() : nestingLimit(ARDUINOJSON_DEFAULT_NESTING_LIMIT) {}
   DynamicJsonDocument(size_t capacity)
-      : nestingLimit(ARDUINOJSON_DEFAULT_NESTING_LIMIT), _buffer(capacity) {}
+      : nestingLimit(ARDUINOJSON_DEFAULT_NESTING_LIMIT),
+        _memoryPool(capacity) {}
 
   template <typename T>
   bool is() const {
@@ -35,7 +36,7 @@ class DynamicJsonDocument {
                                 JsonObject>::type
   to() {
     clear();
-    JsonObject object(&_buffer);
+    JsonObject object(&_memoryPool);
     getVariant().set(object);
     return object;
   }
@@ -46,7 +47,7 @@ class DynamicJsonDocument {
                                 JsonArray>::type
   to() {
     clear();
-    JsonArray array(&_buffer);
+    JsonArray array(&_memoryPool);
     getVariant().set(array);
     return array;
   }
@@ -70,17 +71,17 @@ class DynamicJsonDocument {
     return _rootData;
   }
 
-  Internals::DynamicJsonBuffer& buffer() {
-    return _buffer;
+  Internals::DynamicMemoryPool& memoryPool() {
+    return _memoryPool;
   }
 
   void clear() {
-    _buffer.clear();
+    _memoryPool.clear();
     _rootData.setNull();
   }
 
   size_t memoryUsage() const {
-    return _buffer.size();
+    return _memoryPool.size();
   }
 
   template <typename Visitor>
@@ -90,10 +91,10 @@ class DynamicJsonDocument {
 
  private:
   JsonVariant getVariant() const {
-    return JsonVariant(&_buffer, &_rootData);
+    return JsonVariant(&_memoryPool, &_rootData);
   }
 
-  mutable Internals::DynamicJsonBuffer _buffer;
+  mutable Internals::DynamicMemoryPool _memoryPool;
   mutable Internals::JsonVariantData _rootData;
 };
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/Json/JsonDeserializer.hpp b/src/ArduinoJson/Json/JsonDeserializer.hpp
index 465ce1af..38979616 100644
--- a/src/ArduinoJson/Json/JsonDeserializer.hpp
+++ b/src/ArduinoJson/Json/JsonDeserializer.hpp
@@ -6,7 +6,7 @@
 
 #include "../Deserialization/deserialize.hpp"
 #include "../JsonVariant.hpp"
-#include "../Memory/JsonBuffer.hpp"
+#include "../Memory/MemoryPool.hpp"
 #include "../Numbers/isFloat.hpp"
 #include "../Numbers/isInteger.hpp"
 #include "../Polyfills/type_traits.hpp"
@@ -18,9 +18,9 @@ namespace Internals {
 template <typename TReader, typename TStringStorage>
 class JsonDeserializer {
  public:
-  JsonDeserializer(JsonBuffer *buffer, TReader reader,
+  JsonDeserializer(MemoryPool &memoryPool, TReader reader,
                    TStringStorage stringStorage, uint8_t nestingLimit)
-      : _buffer(buffer),
+      : _memoryPool(&memoryPool),
         _reader(reader),
         _stringStorage(stringStorage),
         _nestingLimit(nestingLimit),
@@ -68,7 +68,7 @@ class JsonDeserializer {
   DeserializationError parseArray(JsonVariantData &variant) {
     if (_nestingLimit == 0) return DeserializationError::TooDeep;
 
-    JsonArrayData *array = new (_buffer) JsonArrayData;
+    JsonArrayData *array = new (_memoryPool) JsonArrayData;
     if (!array) return DeserializationError::NoMemory;
     variant.setArray(*array);
 
@@ -85,7 +85,7 @@ class JsonDeserializer {
     // Read each value
     for (;;) {
       // Allocate slot in array
-      JsonVariantData *value = array->addSlot(_buffer);
+      JsonVariantData *value = array->addSlot(_memoryPool);
       if (!value) return DeserializationError::NoMemory;
 
       // 1 - Parse value
@@ -107,7 +107,7 @@ class JsonDeserializer {
   DeserializationError parseObject(JsonVariantData &variant) {
     if (_nestingLimit == 0) return DeserializationError::TooDeep;
 
-    JsonObjectData *object = new (_buffer) JsonObjectData;
+    JsonObjectData *object = new (_memoryPool) JsonObjectData;
     if (!object) return DeserializationError::NoMemory;
     variant.setObject(*object);
 
@@ -134,7 +134,7 @@ class JsonDeserializer {
       if (!eat(':')) return DeserializationError::InvalidInput;
 
       // Allocate slot in object
-      JsonVariantData *value = object->addSlot(_buffer, key);
+      JsonVariantData *value = object->addSlot(_memoryPool, key);
       if (!value) return DeserializationError::NoMemory;
 
       // Parse value
@@ -335,7 +335,7 @@ class JsonDeserializer {
     }
   }
 
-  JsonBuffer *_buffer;
+  MemoryPool *_memoryPool;
   TReader _reader;
   TStringStorage _stringStorage;
   uint8_t _nestingLimit;
diff --git a/src/ArduinoJson/JsonArray.hpp b/src/ArduinoJson/JsonArray.hpp
index c8f8485a..92cf64b2 100644
--- a/src/ArduinoJson/JsonArray.hpp
+++ b/src/ArduinoJson/JsonArray.hpp
@@ -21,12 +21,12 @@ class JsonArray {
  public:
   typedef JsonArrayIterator iterator;
 
-  FORCE_INLINE JsonArray() : _buffer(0), _data(0) {}
-  FORCE_INLINE JsonArray(Internals::JsonBuffer* buf,
+  FORCE_INLINE JsonArray() : _memoryPool(0), _data(0) {}
+  FORCE_INLINE JsonArray(Internals::MemoryPool* buf,
                          Internals::JsonArrayData* arr)
-      : _buffer(buf), _data(arr) {}
-  FORCE_INLINE explicit JsonArray(Internals::JsonBuffer* buf)
-      : _buffer(buf), _data(new (buf) Internals::JsonArrayData()) {}
+      : _memoryPool(buf), _data(arr) {}
+  FORCE_INLINE explicit JsonArray(Internals::MemoryPool* buf)
+      : _memoryPool(buf), _data(new (buf) Internals::JsonArrayData()) {}
 
   // Adds the specified value at the end of the array.
   //
@@ -47,7 +47,7 @@ class JsonArray {
 
   FORCE_INLINE iterator begin() const {
     if (!_data) return iterator();
-    return iterator(_buffer, _data->begin());
+    return iterator(_memoryPool, _data->begin());
   }
 
   FORCE_INLINE iterator end() const {
@@ -192,12 +192,12 @@ class JsonArray {
   template <typename TValueRef>
   FORCE_INLINE bool add_impl(TValueRef value) {
     if (!_data) return false;
-    iterator it = iterator(_buffer, _data->add(_buffer));
+    iterator it = iterator(_memoryPool, _data->add(_memoryPool));
     if (it == end()) return false;
     return it->set(value);
   }
 
-  Internals::JsonBuffer* _buffer;
+  Internals::MemoryPool* _memoryPool;
   Internals::JsonArrayData* _data;
 };
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/JsonArrayData.hpp b/src/ArduinoJson/JsonArrayData.hpp
index 46b9cabf..7f5ac342 100644
--- a/src/ArduinoJson/JsonArrayData.hpp
+++ b/src/ArduinoJson/JsonArrayData.hpp
@@ -6,11 +6,11 @@
 
 #include "Data/JsonVariantData.hpp"
 #include "Data/List.hpp"
-#include "Memory/JsonBufferAllocated.hpp"
+#include "Memory/AllocableInMemoryPool.hpp"
 #include "Polyfills/type_traits.hpp"
 
 // Returns the size (in bytes) of an array with n elements.
-// Can be very handy to determine the size of a StaticJsonBuffer.
+// Can be very handy to determine the size of a StaticMemoryPool.
 #define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS)        \
   (sizeof(ArduinoJson::Internals::JsonArrayData) + \
    (NUMBER_OF_ELEMENTS) *                          \
@@ -18,9 +18,9 @@
 
 namespace ArduinoJson {
 namespace Internals {
-struct JsonArrayData : List<JsonVariantData>, JsonBufferAllocated {
-  JsonVariantData* addSlot(JsonBuffer* buffer) {
-    iterator it = add(buffer);
+struct JsonArrayData : List<JsonVariantData>, AllocableInMemoryPool {
+  JsonVariantData* addSlot(MemoryPool* memoryPool) {
+    iterator it = add(memoryPool);
     return it != end() ? &*it : 0;
   }
 };
diff --git a/src/ArduinoJson/JsonArrayImpl.hpp b/src/ArduinoJson/JsonArrayImpl.hpp
index 0b175988..9bffd904 100644
--- a/src/ArduinoJson/JsonArrayImpl.hpp
+++ b/src/ArduinoJson/JsonArrayImpl.hpp
@@ -11,14 +11,14 @@ namespace ArduinoJson {
 
 inline JsonArray JsonArray::createNestedArray() {
   if (!_data) return JsonArray();
-  JsonArray array(_buffer);
+  JsonArray array(_memoryPool);
   if (!array.isNull()) add(array);
   return array;
 }
 
 inline JsonObject JsonArray::createNestedObject() {
   if (!_data) return JsonObject();
-  JsonObject object(_buffer);
+  JsonObject object(_memoryPool);
   if (!object.isNull()) add(object);
   return object;
 }
diff --git a/src/ArduinoJson/JsonArrayIterator.hpp b/src/ArduinoJson/JsonArrayIterator.hpp
index 68456e5c..7d83fbfa 100644
--- a/src/ArduinoJson/JsonArrayIterator.hpp
+++ b/src/ArduinoJson/JsonArrayIterator.hpp
@@ -11,9 +11,9 @@ namespace ArduinoJson {
 
 class JsonVariantPtr {
  public:
-  JsonVariantPtr(Internals::JsonBuffer *buffer,
+  JsonVariantPtr(Internals::MemoryPool *memoryPool,
                  Internals::JsonVariantData *data)
-      : _variant(buffer, data) {}
+      : _variant(memoryPool, data) {}
 
   JsonVariant *operator->() {
     return &_variant;
@@ -32,15 +32,15 @@ class JsonArrayIterator {
 
  public:
   JsonArrayIterator() {}
-  explicit JsonArrayIterator(Internals::JsonBuffer *buffer,
+  explicit JsonArrayIterator(Internals::MemoryPool *memoryPool,
                              internal_iterator iterator)
-      : _iterator(iterator), _buffer(buffer) {}
+      : _iterator(iterator), _memoryPool(memoryPool) {}
 
   JsonVariant operator*() const {
-    return JsonVariant(_buffer, &*_iterator);
+    return JsonVariant(_memoryPool, &*_iterator);
   }
   JsonVariantPtr operator->() {
-    return JsonVariantPtr(_buffer, &*_iterator);
+    return JsonVariantPtr(_memoryPool, &*_iterator);
   }
 
   bool operator==(const JsonArrayIterator &other) const {
@@ -67,6 +67,6 @@ class JsonArrayIterator {
 
  private:
   internal_iterator _iterator;
-  Internals::JsonBuffer *_buffer;
+  Internals::MemoryPool *_memoryPool;
 };
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/JsonObject.hpp b/src/ArduinoJson/JsonObject.hpp
index 36b6475f..c14026a4 100644
--- a/src/ArduinoJson/JsonObject.hpp
+++ b/src/ArduinoJson/JsonObject.hpp
@@ -16,16 +16,16 @@ class JsonObject {
  public:
   typedef JsonObjectIterator iterator;
 
-  FORCE_INLINE JsonObject() : _buffer(0), _data(0) {}
-  FORCE_INLINE JsonObject(Internals::JsonBuffer* buf,
+  FORCE_INLINE JsonObject() : _memoryPool(0), _data(0) {}
+  FORCE_INLINE JsonObject(Internals::MemoryPool* buf,
                           Internals::JsonObjectData* object)
-      : _buffer(buf), _data(object) {}
-  FORCE_INLINE explicit JsonObject(Internals::JsonBuffer* buf)
-      : _buffer(buf), _data(new (buf) Internals::JsonObjectData()) {}
+      : _memoryPool(buf), _data(object) {}
+  FORCE_INLINE explicit JsonObject(Internals::MemoryPool* buf)
+      : _memoryPool(buf), _data(new (buf) Internals::JsonObjectData()) {}
 
   FORCE_INLINE iterator begin() const {
     if (!_data) return iterator();
-    return iterator(_buffer, _data->begin());
+    return iterator(_memoryPool, _data->begin());
   }
 
   // Tells weither the specified key is present and associated with a value.
@@ -264,15 +264,17 @@ class JsonObject {
   FORCE_INLINE typename Internals::JsonVariantAs<TValue>::type get_impl(
       TStringRef key) const {
     internal_iterator it = findKey<TStringRef>(key);
-    return it != _data->end() ? JsonVariant(_buffer, &it->value).as<TValue>()
-                              : TValue();
+    return it != _data->end()
+               ? JsonVariant(_memoryPool, &it->value).as<TValue>()
+               : TValue();
   }
 
   template <typename TStringRef, typename TValue>
   FORCE_INLINE bool is_impl(TStringRef key) const {
     internal_iterator it = findKey<TStringRef>(key);
-    return it != _data->end() ? JsonVariant(_buffer, &it->value).is<TValue>()
-                              : false;
+    return it != _data->end()
+               ? JsonVariant(_memoryPool, &it->value).is<TValue>()
+               : false;
   }
 
   template <typename TStringRef>
@@ -293,13 +295,13 @@ class JsonObject {
     if (it == _data->end()) {
       // add the key
       // TODO: use JsonPairData directly, we don't need an iterator
-      it = _data->add(_buffer);
+      it = _data->add(_memoryPool);
       if (it == _data->end()) return false;
       if (!set_key(it, key)) return false;
     }
 
     // save the value
-    return JsonVariant(_buffer, &it->value).set(value);
+    return JsonVariant(_memoryPool, &it->value).set(value);
   }
 
   FORCE_INLINE bool set_key(internal_iterator& it, const char* key) {
@@ -309,13 +311,13 @@ class JsonObject {
 
   template <typename T>
   FORCE_INLINE bool set_key(internal_iterator& it, const T& key) {
-    const char* dup = Internals::makeString(key).save(_buffer);
+    const char* dup = Internals::makeString(key).save(_memoryPool);
     if (!dup) return false;
     it->key = dup;
     return true;
   }
 
-  mutable Internals::JsonBuffer* _buffer;
+  mutable Internals::MemoryPool* _memoryPool;
   mutable Internals::JsonObjectData* _data;
 };
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/JsonObjectData.hpp b/src/ArduinoJson/JsonObjectData.hpp
index 5c2945b3..6aa2851b 100644
--- a/src/ArduinoJson/JsonObjectData.hpp
+++ b/src/ArduinoJson/JsonObjectData.hpp
@@ -6,11 +6,11 @@
 
 #include "Data/List.hpp"
 #include "JsonPair.hpp"
-#include "Memory/JsonBufferAllocated.hpp"
+#include "Memory/AllocableInMemoryPool.hpp"
 #include "Polyfills/type_traits.hpp"
 
 // Returns the size (in bytes) of an object with n elements.
-// Can be very handy to determine the size of a StaticJsonBuffer.
+// Can be very handy to determine the size of a StaticMemoryPool.
 #define JSON_OBJECT_SIZE(NUMBER_OF_ELEMENTS)        \
   (sizeof(ArduinoJson::Internals::JsonObjectData) + \
    (NUMBER_OF_ELEMENTS) *                           \
@@ -18,9 +18,9 @@
 
 namespace ArduinoJson {
 namespace Internals {
-struct JsonObjectData : List<JsonPairData>, JsonBufferAllocated {
-  JsonVariantData* addSlot(JsonBuffer* buffer, const char* key) {
-    iterator it = add(buffer);
+struct JsonObjectData : List<JsonPairData>, AllocableInMemoryPool {
+  JsonVariantData* addSlot(MemoryPool* memoryPool, const char* key) {
+    iterator it = add(memoryPool);
     if (it == end()) return 0;
     it->key = key;
     return &it->value;
diff --git a/src/ArduinoJson/JsonObjectImpl.hpp b/src/ArduinoJson/JsonObjectImpl.hpp
index f30c0dda..90abcbb5 100644
--- a/src/ArduinoJson/JsonObjectImpl.hpp
+++ b/src/ArduinoJson/JsonObjectImpl.hpp
@@ -22,7 +22,7 @@ inline JsonArray JsonObject::createNestedArray(TString* key) {
 template <typename TStringRef>
 inline JsonArray JsonObject::createNestedArray_impl(TStringRef key) {
   if (!_data) return JsonArray();
-  JsonArray array(_buffer);
+  JsonArray array(_memoryPool);
   if (!array.isNull()) set(key, array);
   return array;
 }
@@ -30,7 +30,7 @@ inline JsonArray JsonObject::createNestedArray_impl(TStringRef key) {
 template <typename TStringRef>
 inline JsonObject JsonObject::createNestedObject_impl(TStringRef key) {
   if (!_data) return JsonObject();
-  JsonObject object(_buffer);
+  JsonObject object(_memoryPool);
   if (!object.isNull()) set(key, object);
   return object;
 }
diff --git a/src/ArduinoJson/JsonObjectIterator.hpp b/src/ArduinoJson/JsonObjectIterator.hpp
index cdbc97b5..cf61635c 100644
--- a/src/ArduinoJson/JsonObjectIterator.hpp
+++ b/src/ArduinoJson/JsonObjectIterator.hpp
@@ -11,8 +11,8 @@ namespace ArduinoJson {
 
 class JsonPairPtr {
  public:
-  JsonPairPtr(Internals::JsonBuffer *buffer, Internals::JsonPairData *data)
-      : _pair(buffer, data) {}
+  JsonPairPtr(Internals::MemoryPool *memoryPool, Internals::JsonPairData *data)
+      : _pair(memoryPool, data) {}
 
   const JsonPair *operator->() const {
     return &_pair;
@@ -32,15 +32,15 @@ class JsonObjectIterator {
 
  public:
   JsonObjectIterator() {}
-  explicit JsonObjectIterator(Internals::JsonBuffer *buffer,
+  explicit JsonObjectIterator(Internals::MemoryPool *memoryPool,
                               internal_iterator iterator)
-      : _buffer(buffer), _iterator(iterator) {}
+      : _memoryPool(memoryPool), _iterator(iterator) {}
 
   JsonPair operator*() const {
-    return JsonPair(_buffer, &*_iterator);
+    return JsonPair(_memoryPool, &*_iterator);
   }
   JsonPairPtr operator->() {
-    return JsonPairPtr(_buffer, &*_iterator);
+    return JsonPairPtr(_memoryPool, &*_iterator);
   }
 
   bool operator==(const JsonObjectIterator &other) const {
@@ -66,7 +66,7 @@ class JsonObjectIterator {
   }
 
  private:
-  Internals::JsonBuffer *_buffer;
+  Internals::MemoryPool *_memoryPool;
   internal_iterator _iterator;
 };
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/JsonPair.hpp b/src/ArduinoJson/JsonPair.hpp
index 40eeaf0a..71596abf 100644
--- a/src/ArduinoJson/JsonPair.hpp
+++ b/src/ArduinoJson/JsonPair.hpp
@@ -19,8 +19,8 @@ struct JsonPairData {
 // A key value pair for JsonObjectData.
 class JsonPair {
  public:
-  JsonPair(Internals::JsonBuffer* buffer, Internals::JsonPairData* data)
-      : _key(data->key), _value(buffer, &data->value) {}
+  JsonPair(Internals::MemoryPool* memoryPool, Internals::JsonPairData* data)
+      : _key(data->key), _value(memoryPool, &data->value) {}
 
   const char* key() const {
     return _key;
diff --git a/src/ArduinoJson/JsonVariant.hpp b/src/ArduinoJson/JsonVariant.hpp
index 93d8e1f6..d35b49a5 100644
--- a/src/ArduinoJson/JsonVariant.hpp
+++ b/src/ArduinoJson/JsonVariant.hpp
@@ -10,7 +10,7 @@
 #include "Data/JsonVariantData.hpp"
 #include "JsonVariant.hpp"
 #include "JsonVariantBase.hpp"
-#include "Memory/JsonBuffer.hpp"
+#include "Memory/MemoryPool.hpp"
 #include "Polyfills/type_traits.hpp"
 #include "Serialization/DynamicStringWriter.hpp"
 #include "SerializedValue.hpp"
@@ -31,12 +31,12 @@ class JsonObject;
 class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
  public:
   // Intenal use only
-  FORCE_INLINE JsonVariant(Internals::JsonBuffer *buffer,
+  FORCE_INLINE JsonVariant(Internals::MemoryPool *memoryPool,
                            Internals::JsonVariantData *data)
-      : _buffer(buffer), _data(data) {}
+      : _memoryPool(memoryPool), _data(data) {}
 
   // Creates an uninitialized JsonVariant
-  FORCE_INLINE JsonVariant() : _buffer(0), _data(0) {}
+  FORCE_INLINE JsonVariant() : _memoryPool(0), _data(0) {}
 
   // set(bool value)
   FORCE_INLINE bool set(bool value) {
@@ -106,7 +106,7 @@ class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
           !Internals::is_same<const char *, T>::value>::type * = 0) {
     if (!_data) return false;
     const char *dup =
-        Internals::makeString(value.data(), value.size()).save(_buffer);
+        Internals::makeString(value.data(), value.size()).save(_memoryPool);
     if (dup)
       _data->setRaw(dup, value.size());
     else
@@ -122,7 +122,7 @@ class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
       typename Internals::enable_if<Internals::IsString<T>::value>::type * =
           0) {
     if (!_data) return false;
-    const char *dup = Internals::makeString(value).save(_buffer);
+    const char *dup = Internals::makeString(value).save(_memoryPool);
     if (dup) {
       _data->setString(dup);
       return true;
@@ -139,7 +139,7 @@ class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
       typename Internals::enable_if<Internals::IsString<T *>::value>::type * =
           0) {
     if (!_data) return false;
-    const char *dup = Internals::makeString(value).save(_buffer);
+    const char *dup = Internals::makeString(value).save(_memoryPool);
     if (dup) {
       _data->setString(dup);
       return true;
@@ -341,7 +341,7 @@ class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
   }
 
  private:
-  Internals::JsonBuffer *_buffer;
+  Internals::MemoryPool *_memoryPool;
   Internals::JsonVariantData *_data;
 };  // namespace ArduinoJson
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/JsonVariantImpl.hpp b/src/ArduinoJson/JsonVariantImpl.hpp
index 626aa337..02ea3fbf 100644
--- a/src/ArduinoJson/JsonVariantImpl.hpp
+++ b/src/ArduinoJson/JsonVariantImpl.hpp
@@ -49,7 +49,7 @@ inline typename Internals::enable_if<
                        JsonArray>::value,
     JsonArray>::type
 JsonVariant::as() const {
-  return _data ? JsonArray(_buffer, _data->asArray()) : JsonArray();
+  return _data ? JsonArray(_memoryPool, _data->asArray()) : JsonArray();
 }
 
 template <typename T>
@@ -58,6 +58,6 @@ inline typename Internals::enable_if<
                        JsonObject>::value,
     T>::type
 JsonVariant::as() const {
-  return _data ? JsonObject(_buffer, _data->asObject()) : JsonObject();
+  return _data ? JsonObject(_memoryPool, _data->asObject()) : JsonObject();
 }
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/Memory/AllocableInMemoryPool.hpp b/src/ArduinoJson/Memory/AllocableInMemoryPool.hpp
new file mode 100644
index 00000000..a8b414f4
--- /dev/null
+++ b/src/ArduinoJson/Memory/AllocableInMemoryPool.hpp
@@ -0,0 +1,22 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#pragma once
+
+#include "MemoryPool.hpp"
+
+namespace ArduinoJson {
+namespace Internals {
+
+class AllocableInMemoryPool {
+ public:
+  void *operator new(size_t n, MemoryPool *memoryPool) NOEXCEPT {
+    if (!memoryPool) return NULL;
+    return memoryPool->alloc(n);
+  }
+
+  void operator delete(void *, MemoryPool *)NOEXCEPT {}
+};
+}  // namespace Internals
+}  // namespace ArduinoJson
diff --git a/src/ArduinoJson/Memory/DynamicJsonBuffer.hpp b/src/ArduinoJson/Memory/DynamicMemoryPool.hpp
similarity index 85%
rename from src/ArduinoJson/Memory/DynamicJsonBuffer.hpp
rename to src/ArduinoJson/Memory/DynamicMemoryPool.hpp
index 3b67deea..3c775426 100644
--- a/src/ArduinoJson/Memory/DynamicJsonBuffer.hpp
+++ b/src/ArduinoJson/Memory/DynamicMemoryPool.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "JsonBuffer.hpp"
+#include "MemoryPool.hpp"
 
 #include <stdlib.h>
 
@@ -31,7 +31,7 @@ class DefaultAllocator {
 };
 
 template <typename TAllocator>
-class DynamicJsonBufferBase : public JsonBuffer {
+class DynamicMemoryPoolBase : public MemoryPool {
   struct Block;
   struct EmptyBlock {
     Block* next;
@@ -45,27 +45,27 @@ class DynamicJsonBufferBase : public JsonBuffer {
  public:
   enum { EmptyBlockSize = sizeof(EmptyBlock) };
 
-  DynamicJsonBufferBase(size_t initialSize = 256)
+  DynamicMemoryPoolBase(size_t initialSize = 256)
       : _head(NULL), _nextBlockCapacity(initialSize) {}
 
-  ~DynamicJsonBufferBase() {
+  ~DynamicMemoryPoolBase() {
     clear();
   }
 
-  // Gets the number of bytes occupied in the buffer
+  // Gets the number of bytes occupied in the memoryPool
   size_t size() const {
     size_t total = 0;
     for (const Block* b = _head; b; b = b->next) total += b->size;
     return total;
   }
 
-  // Allocates the specified amount of bytes in the buffer
+  // Allocates the specified amount of bytes in the memoryPool
   virtual void* alloc(size_t bytes) {
     alignNextAlloc();
     return canAllocInHead(bytes) ? allocInHead(bytes) : allocInNewBlock(bytes);
   }
 
-  // Resets the buffer.
+  // Resets the memoryPool.
   // USE WITH CAUTION: this invalidates all previously allocated data
   void clear() {
     Block* currentBlock = _head;
@@ -80,7 +80,7 @@ class DynamicJsonBufferBase : public JsonBuffer {
 
   class String {
    public:
-    String(DynamicJsonBufferBase* parent)
+    String(DynamicMemoryPoolBase* parent)
         : _parent(parent), _start(NULL), _length(0) {}
 
     void append(char c) {
@@ -104,7 +104,7 @@ class DynamicJsonBufferBase : public JsonBuffer {
     }
 
    private:
-    DynamicJsonBufferBase* _parent;
+    DynamicMemoryPoolBase* _parent;
     char* _start;
     size_t _length;
   };
@@ -152,11 +152,11 @@ class DynamicJsonBufferBase : public JsonBuffer {
   size_t _nextBlockCapacity;
 };
 
-// Implements a JsonBuffer with dynamic memory allocation.
-// You are strongly encouraged to consider using StaticJsonBuffer which is much
+// Implements a MemoryPool with dynamic memory allocation.
+// You are strongly encouraged to consider using StaticMemoryPool which is much
 // more suitable for embedded systems.
-typedef Internals::DynamicJsonBufferBase<Internals::DefaultAllocator>
-    DynamicJsonBuffer;
+typedef Internals::DynamicMemoryPoolBase<Internals::DefaultAllocator>
+    DynamicMemoryPool;
 }  // namespace Internals
 
 #if defined(__clang__)
diff --git a/src/ArduinoJson/Memory/JsonBufferAllocated.hpp b/src/ArduinoJson/Memory/JsonBufferAllocated.hpp
deleted file mode 100644
index 2d48ff8c..00000000
--- a/src/ArduinoJson/Memory/JsonBufferAllocated.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2018
-// MIT License
-
-#pragma once
-
-#include "JsonBuffer.hpp"
-
-namespace ArduinoJson {
-namespace Internals {
-
-class JsonBufferAllocated {
- public:
-  void *operator new(size_t n, JsonBuffer *jsonBuffer) NOEXCEPT {
-    if (!jsonBuffer) return NULL;
-    return jsonBuffer->alloc(n);
-  }
-
-  void operator delete(void *, JsonBuffer *)NOEXCEPT {}
-};
-}  // namespace Internals
-}  // namespace ArduinoJson
diff --git a/src/ArduinoJson/Memory/JsonBuffer.hpp b/src/ArduinoJson/Memory/MemoryPool.hpp
similarity index 87%
rename from src/ArduinoJson/Memory/JsonBuffer.hpp
rename to src/ArduinoJson/Memory/MemoryPool.hpp
index dd2f3483..2cb435d1 100644
--- a/src/ArduinoJson/Memory/JsonBuffer.hpp
+++ b/src/ArduinoJson/Memory/MemoryPool.hpp
@@ -14,11 +14,11 @@
 namespace ArduinoJson {
 namespace Internals {
 // Handle the memory management (done in derived classes) and calls the parser.
-// This abstract class is implemented by StaticJsonBuffer which implements a
+// This abstract class is implemented by StaticMemoryPool which implements a
 // fixed memory allocation.
-class JsonBuffer {
+class MemoryPool {
  public:
-  // Allocates n bytes in the JsonBuffer.
+  // Allocates n bytes in the MemoryPool.
   // Return a pointer to the allocated memory or NULL if allocation fails.
   virtual void *alloc(size_t size) = 0;
 
@@ -26,7 +26,7 @@ class JsonBuffer {
   // CAUTION: NO VIRTUAL DESTRUCTOR!
   // If we add a virtual constructor the Arduino compiler will add malloc()
   // and free() to the binary, adding 706 useless bytes.
-  ~JsonBuffer() {}
+  ~MemoryPool() {}
 
   // Preserve aligment if necessary
   static FORCE_INLINE size_t round_size_up(size_t bytes) {
diff --git a/src/ArduinoJson/Memory/StaticJsonBuffer.hpp b/src/ArduinoJson/Memory/StaticMemoryPool.hpp
similarity index 74%
rename from src/ArduinoJson/Memory/StaticJsonBuffer.hpp
rename to src/ArduinoJson/Memory/StaticMemoryPool.hpp
index 71d6ddbc..16492799 100644
--- a/src/ArduinoJson/Memory/StaticJsonBuffer.hpp
+++ b/src/ArduinoJson/Memory/StaticMemoryPool.hpp
@@ -5,16 +5,16 @@
 #pragma once
 
 #include "../Polyfills/mpl/max.hpp"
-#include "JsonBuffer.hpp"
+#include "MemoryPool.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
 
-class StaticJsonBufferBase : public JsonBuffer {
+class StaticMemoryPoolBase : public MemoryPool {
  public:
   class String {
    public:
-    String(StaticJsonBufferBase* parent) : _parent(parent) {
+    String(StaticMemoryPoolBase* parent) : _parent(parent) {
       _start = parent->_buffer + parent->_size;
     }
 
@@ -36,31 +36,31 @@ class StaticJsonBufferBase : public JsonBuffer {
     }
 
    private:
-    StaticJsonBufferBase* _parent;
+    StaticMemoryPoolBase* _parent;
     char* _start;
   };
 
-  StaticJsonBufferBase(char* buffer, size_t capa)
-      : _buffer(buffer), _capacity(capa), _size(0) {}
+  StaticMemoryPoolBase(char* memoryPool, size_t capa)
+      : _buffer(memoryPool), _capacity(capa), _size(0) {}
 
-  // Gets the capacity of the buffer in bytes
+  // Gets the capacity of the memoryPool in bytes
   size_t capacity() const {
     return _capacity;
   }
 
-  // Gets the current usage of the buffer in bytes
+  // Gets the current usage of the memoryPool in bytes
   size_t size() const {
     return _size;
   }
 
-  // Allocates the specified amount of bytes in the buffer
+  // Allocates the specified amount of bytes in the memoryPool
   virtual void* alloc(size_t bytes) {
     alignNextAlloc();
     if (!canAlloc(bytes)) return NULL;
     return doAlloc(bytes);
   }
 
-  // Resets the buffer.
+  // Resets the memoryPool.
   // USE WITH CAUTION: this invalidates all previously allocated data
   void clear() {
     _size = 0;
@@ -71,7 +71,7 @@ class StaticJsonBufferBase : public JsonBuffer {
   }
 
  protected:
-  ~StaticJsonBufferBase() {}
+  ~StaticMemoryPoolBase() {}
 
  private:
   void alignNextAlloc() {
@@ -103,16 +103,16 @@ class StaticJsonBufferBase : public JsonBuffer {
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
 #endif
 
-// Implements a JsonBuffer with fixed memory allocation.
-// The template paramenter CAPACITY specifies the capacity of the buffer in
+// Implements a MemoryPool with fixed memory allocation.
+// The template paramenter CAPACITY specifies the capacity of the memoryPool in
 // bytes.
 template <size_t CAPACITY>
-class StaticJsonBuffer : public Internals::StaticJsonBufferBase {
+class StaticMemoryPool : public Internals::StaticMemoryPoolBase {
   static const size_t ACTUAL_CAPACITY = Internals::Max<1, CAPACITY>::value;
 
  public:
-  explicit StaticJsonBuffer()
-      : Internals::StaticJsonBufferBase(_buffer, ACTUAL_CAPACITY) {}
+  explicit StaticMemoryPool()
+      : Internals::StaticMemoryPoolBase(_buffer, ACTUAL_CAPACITY) {}
 
  private:
   char _buffer[ACTUAL_CAPACITY];
diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
index 132de6cb..ecce8717 100644
--- a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
+++ b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
@@ -6,7 +6,7 @@
 
 #include "../Deserialization/deserialize.hpp"
 #include "../JsonVariant.hpp"
-#include "../Memory/JsonBuffer.hpp"
+#include "../Memory/MemoryPool.hpp"
 #include "../Polyfills/type_traits.hpp"
 #include "./endianess.hpp"
 #include "./ieee754.hpp"
@@ -17,9 +17,9 @@ namespace Internals {
 template <typename TReader, typename TStringStorage>
 class MsgPackDeserializer {
  public:
-  MsgPackDeserializer(JsonBuffer *buffer, TReader reader,
+  MsgPackDeserializer(MemoryPool &memoryPool, TReader reader,
                       TStringStorage stringStorage, uint8_t nestingLimit)
-      : _buffer(buffer),
+      : _memoryPool(&memoryPool),
         _reader(reader),
         _stringStorage(stringStorage),
         _nestingLimit(nestingLimit) {}
@@ -240,7 +240,7 @@ class MsgPackDeserializer {
   }
 
   DeserializationError readArray(JsonVariantData &variant, size_t n) {
-    JsonArrayData *array = new (_buffer) JsonArrayData;
+    JsonArrayData *array = new (_memoryPool) JsonArrayData;
     if (!array) return DeserializationError::NoMemory;
 
     variant.setArray(*array);
@@ -251,7 +251,7 @@ class MsgPackDeserializer {
     if (_nestingLimit == 0) return DeserializationError::TooDeep;
     --_nestingLimit;
     for (; n; --n) {
-      JsonVariantData *value = array.addSlot(_buffer);
+      JsonVariantData *value = array.addSlot(_memoryPool);
       if (!value) return DeserializationError::NoMemory;
 
       DeserializationError err = parse(*value);
@@ -269,7 +269,7 @@ class MsgPackDeserializer {
   }
 
   DeserializationError readObject(JsonVariantData &variant, size_t n) {
-    JsonObjectData *object = new (_buffer) JsonObjectData;
+    JsonObjectData *object = new (_memoryPool) JsonObjectData;
     if (!object) return DeserializationError::NoMemory;
     variant.setObject(*object);
 
@@ -285,7 +285,7 @@ class MsgPackDeserializer {
       if (err) return err;
       if (!key.isString()) return DeserializationError::NotSupported;
 
-      JsonVariantData *value = object.addSlot(_buffer, key.asString());
+      JsonVariantData *value = object.addSlot(_memoryPool, key.asString());
       if (!value) return DeserializationError::NoMemory;
 
       err = parse(*value);
@@ -295,7 +295,7 @@ class MsgPackDeserializer {
     return DeserializationError::Ok;
   }
 
-  JsonBuffer *_buffer;
+  MemoryPool *_memoryPool;
   TReader _reader;
   TStringStorage _stringStorage;
   uint8_t _nestingLimit;
diff --git a/src/ArduinoJson/StaticJsonDocument.hpp b/src/ArduinoJson/StaticJsonDocument.hpp
index bdf3a5d4..97f6a673 100644
--- a/src/ArduinoJson/StaticJsonDocument.hpp
+++ b/src/ArduinoJson/StaticJsonDocument.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "JsonVariant.hpp"
-#include "Memory/StaticJsonBuffer.hpp"
+#include "Memory/StaticMemoryPool.hpp"
 
 namespace ArduinoJson {
 
@@ -16,8 +16,8 @@ class StaticJsonDocument {
 
   StaticJsonDocument() : nestingLimit(ARDUINOJSON_DEFAULT_NESTING_LIMIT) {}
 
-  Internals::StaticJsonBufferBase& buffer() {
-    return _buffer;
+  Internals::StaticMemoryPoolBase& memoryPool() {
+    return _memoryPool;
   }
 
   template <typename T>
@@ -36,7 +36,7 @@ class StaticJsonDocument {
                                 JsonObject>::type
   to() {
     clear();
-    JsonObject object(&_buffer);
+    JsonObject object(&_memoryPool);
     getVariant().set(object);
     return object;
   }
@@ -47,7 +47,7 @@ class StaticJsonDocument {
                                 JsonArray>::type
   to() {
     clear();
-    JsonArray array(&_buffer);
+    JsonArray array(&_memoryPool);
     getVariant().set(array);
     return array;
   }
@@ -72,12 +72,12 @@ class StaticJsonDocument {
   }
 
   void clear() {
-    _buffer.clear();
+    _memoryPool.clear();
     _rootData.setNull();
   }
 
   size_t memoryUsage() const {
-    return _buffer.size();
+    return _memoryPool.size();
   }
 
   template <typename Visitor>
@@ -87,10 +87,10 @@ class StaticJsonDocument {
 
  private:
   JsonVariant getVariant() const {
-    return JsonVariant(&_buffer, &_rootData);
+    return JsonVariant(&_memoryPool, &_rootData);
   }
 
-  mutable Internals::StaticJsonBuffer<CAPACITY> _buffer;
+  mutable Internals::StaticMemoryPool<CAPACITY> _memoryPool;
   mutable Internals::JsonVariantData _rootData;
 };
 
diff --git a/src/ArduinoJson/StringStorage/StringCopier.hpp b/src/ArduinoJson/StringStorage/StringCopier.hpp
index a5304a1b..7b44e944 100644
--- a/src/ArduinoJson/StringStorage/StringCopier.hpp
+++ b/src/ArduinoJson/StringStorage/StringCopier.hpp
@@ -7,19 +7,19 @@
 namespace ArduinoJson {
 namespace Internals {
 
-template <typename TJsonBuffer>
+template <typename TMemoryPool>
 class StringCopier {
  public:
-  StringCopier(TJsonBuffer& jb) : _jb(&jb) {}
+  StringCopier(TMemoryPool& memoryPool) : _memoryPool(&memoryPool) {}
 
-  typedef typename TJsonBuffer::String String;
+  typedef typename TMemoryPool::String String;
 
   String startString() {
-    return _jb->startString();
+    return _memoryPool->startString();
   }
 
  private:
-  TJsonBuffer* _jb;
+  TMemoryPool* _memoryPool;
 };
 }  // namespace Internals
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/StringStorage/StringMover.hpp b/src/ArduinoJson/StringStorage/StringMover.hpp
index 9c3e751d..75b28815 100644
--- a/src/ArduinoJson/StringStorage/StringMover.hpp
+++ b/src/ArduinoJson/StringStorage/StringMover.hpp
@@ -28,7 +28,7 @@ class StringMover {
     TChar* _startPtr;
   };
 
-  StringMover(TChar* buffer) : _ptr(buffer) {}
+  StringMover(TChar* ptr) : _ptr(ptr) {}
 
   String startString() {
     return String(&_ptr);
diff --git a/src/ArduinoJson/StringStorage/StringStorage.hpp b/src/ArduinoJson/StringStorage/StringStorage.hpp
index 6bbf6e93..51bb9c7b 100644
--- a/src/ArduinoJson/StringStorage/StringStorage.hpp
+++ b/src/ArduinoJson/StringStorage/StringStorage.hpp
@@ -10,35 +10,35 @@
 namespace ArduinoJson {
 namespace Internals {
 
-template <typename TJsonBuffer, typename TInput, typename Enable = void>
+template <typename TMemoryPool, typename TInput, typename Enable = void>
 struct StringStorage {
-  typedef StringCopier<TJsonBuffer> type;
+  typedef StringCopier<TMemoryPool> type;
 
-  static type create(TJsonBuffer& jb, TInput&) {
+  static type create(TMemoryPool& jb, TInput&) {
     return type(jb);
   }
 };
 
-template <typename TJsonBuffer, typename TChar>
-struct StringStorage<TJsonBuffer, TChar*,
+template <typename TMemoryPool, typename TChar>
+struct StringStorage<TMemoryPool, TChar*,
                      typename enable_if<!is_const<TChar>::value>::type> {
   typedef StringMover<TChar> type;
 
-  static type create(TJsonBuffer&, TChar* input) {
+  static type create(TMemoryPool&, TChar* input) {
     return type(input);
   }
 };
 
-template <typename TJsonBuffer, typename TInput>
-typename StringStorage<TJsonBuffer, TInput>::type makeStringStorage(
-    TJsonBuffer& jb, TInput& input) {
-  return StringStorage<TJsonBuffer, TInput>::create(jb, input);
+template <typename TMemoryPool, typename TInput>
+typename StringStorage<TMemoryPool, TInput>::type makeStringStorage(
+    TMemoryPool& jb, TInput& input) {
+  return StringStorage<TMemoryPool, TInput>::create(jb, input);
 }
 
-template <typename TJsonBuffer, typename TChar>
-typename StringStorage<TJsonBuffer, TChar*>::type makeStringStorage(
-    TJsonBuffer& jb, TChar* input) {
-  return StringStorage<TJsonBuffer, TChar*>::create(jb, input);
+template <typename TMemoryPool, typename TChar>
+typename StringStorage<TMemoryPool, TChar*>::type makeStringStorage(
+    TMemoryPool& jb, TChar* input) {
+  return StringStorage<TMemoryPool, TChar*>::create(jb, input);
 }
 }  // namespace Internals
 }  // namespace ArduinoJson
diff --git a/src/ArduinoJson/Strings/ArduinoString.hpp b/src/ArduinoJson/Strings/ArduinoString.hpp
index 723ac204..687d2a9a 100644
--- a/src/ArduinoJson/Strings/ArduinoString.hpp
+++ b/src/ArduinoJson/Strings/ArduinoString.hpp
@@ -14,10 +14,10 @@ class ArduinoString {
   ArduinoString(const ::String& str) : _str(&str) {}
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     if (is_null()) return NULL;
     size_t n = _str->length() + 1;
-    void* dup = buffer->alloc(n);
+    void* dup = memoryPool->alloc(n);
     if (dup != NULL) memcpy(dup, _str->c_str(), n);
     return static_cast<const char*>(dup);
   }
diff --git a/src/ArduinoJson/Strings/FixedSizeFlashString.hpp b/src/ArduinoJson/Strings/FixedSizeFlashString.hpp
index 893cace8..ef1e22a7 100644
--- a/src/ArduinoJson/Strings/FixedSizeFlashString.hpp
+++ b/src/ArduinoJson/Strings/FixedSizeFlashString.hpp
@@ -23,9 +23,9 @@ class FixedSizeFlashString {
   }
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     if (!_str) return NULL;
-    void* dup = buffer->alloc(_size);
+    void* dup = memoryPool->alloc(_size);
     if (dup != NULL) memcpy_P(dup, (const char*)_str, _size);
     return static_cast<const char*>(dup);
   }
diff --git a/src/ArduinoJson/Strings/FixedSizeRamString.hpp b/src/ArduinoJson/Strings/FixedSizeRamString.hpp
index 48ce4ad3..b1edf391 100644
--- a/src/ArduinoJson/Strings/FixedSizeRamString.hpp
+++ b/src/ArduinoJson/Strings/FixedSizeRamString.hpp
@@ -24,9 +24,9 @@ class FixedSizeRamString {
   }
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     if (!_str) return NULL;
-    void* dup = buffer->alloc(_size);
+    void* dup = memoryPool->alloc(_size);
     if (!dup) return NULL;
     memcpy(dup, _str, _size);
     return static_cast<const char*>(dup);
diff --git a/src/ArduinoJson/Strings/StlString.hpp b/src/ArduinoJson/Strings/StlString.hpp
index 9d47f7e8..d463c00d 100644
--- a/src/ArduinoJson/Strings/StlString.hpp
+++ b/src/ArduinoJson/Strings/StlString.hpp
@@ -14,9 +14,9 @@ class StlString {
   StlString(const std::string& str) : _str(&str) {}
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     size_t n = _str->length() + 1;
-    void* dup = buffer->alloc(n);
+    void* dup = memoryPool->alloc(n);
     if (dup != NULL) memcpy(dup, _str->c_str(), n);
     return static_cast<const char*>(dup);
   }
diff --git a/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp b/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp
index 5b101272..4773bce0 100644
--- a/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp
+++ b/src/ArduinoJson/Strings/ZeroTerminatedFlashString.hpp
@@ -22,10 +22,10 @@ class ZeroTerminatedFlashString {
   }
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     if (!_str) return NULL;
     size_t n = size() + 1;  // copy the terminator
-    void* dup = buffer->alloc(n);
+    void* dup = memoryPool->alloc(n);
     if (dup != NULL) memcpy_P(dup, (const char*)_str, n);
     return static_cast<const char*>(dup);
   }
diff --git a/src/ArduinoJson/Strings/ZeroTerminatedRamString.hpp b/src/ArduinoJson/Strings/ZeroTerminatedRamString.hpp
index cf0bffbf..c5ed8926 100644
--- a/src/ArduinoJson/Strings/ZeroTerminatedRamString.hpp
+++ b/src/ArduinoJson/Strings/ZeroTerminatedRamString.hpp
@@ -22,10 +22,10 @@ class ZeroTerminatedRamString {
   }
 
   template <typename Buffer>
-  const char* save(Buffer* buffer) const {
+  const char* save(Buffer* memoryPool) const {
     if (!_str) return NULL;
     size_t n = size() + 1;
-    void* dup = buffer->alloc(n);
+    void* dup = memoryPool->alloc(n);
     if (!dup) return NULL;
     memcpy(dup, _str, n);
     return static_cast<const char*>(dup);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8c8cd6ff..38fbd05a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -71,7 +71,7 @@ if(MSVC)
 	)
 endif()
 
-add_subdirectory(DynamicJsonBuffer)
+add_subdirectory(DynamicMemoryPool)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)
 add_subdirectory(JsonDeserializer)
@@ -84,4 +84,4 @@ add_subdirectory(Misc)
 add_subdirectory(MsgPackDeserializer)
 add_subdirectory(MsgPackSerializer)
 add_subdirectory(Numbers)
-add_subdirectory(StaticJsonBuffer)
+add_subdirectory(StaticMemoryPool)
diff --git a/test/DynamicJsonBuffer/CMakeLists.txt b/test/DynamicJsonBuffer/CMakeLists.txt
deleted file mode 100644
index c22c0801..00000000
--- a/test/DynamicJsonBuffer/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2018
-# MIT License
-
-add_executable(DynamicJsonBufferTests 
-	alloc.cpp
-	no_memory.cpp
-	size.cpp
-	startString.cpp
-)
-
-target_link_libraries(DynamicJsonBufferTests catch)
-add_test(DynamicJsonBuffer DynamicJsonBufferTests)
diff --git a/test/DynamicJsonBuffer/size.cpp b/test/DynamicJsonBuffer/size.cpp
deleted file mode 100644
index 06b187d5..00000000
--- a/test/DynamicJsonBuffer/size.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2018
-// MIT License
-
-#include <ArduinoJson/Memory/DynamicJsonBuffer.hpp>
-#include <catch.hpp>
-
-using namespace ArduinoJson::Internals;
-
-TEST_CASE("DynamicJsonBuffer::size()") {
-  DynamicJsonBuffer buffer;
-
-  SECTION("Initial size is 0") {
-    REQUIRE(0 == buffer.size());
-  }
-
-  SECTION("Increases after alloc()") {
-    buffer.alloc(1);
-    REQUIRE(1U <= buffer.size());
-    buffer.alloc(1);
-    REQUIRE(2U <= buffer.size());
-  }
-
-  SECTION("Goes back to 0 after clear()") {
-    buffer.alloc(1);
-    buffer.clear();
-    REQUIRE(0 == buffer.size());
-  }
-}
diff --git a/test/DynamicMemoryPool/CMakeLists.txt b/test/DynamicMemoryPool/CMakeLists.txt
new file mode 100644
index 00000000..35cf4133
--- /dev/null
+++ b/test/DynamicMemoryPool/CMakeLists.txt
@@ -0,0 +1,13 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2018
+# MIT License
+
+add_executable(DynamicMemoryPoolTests 
+	alloc.cpp
+	no_memory.cpp
+	size.cpp
+	startString.cpp
+)
+
+target_link_libraries(DynamicMemoryPoolTests catch)
+add_test(DynamicMemoryPool DynamicMemoryPoolTests)
diff --git a/test/DynamicJsonBuffer/alloc.cpp b/test/DynamicMemoryPool/alloc.cpp
similarity index 68%
rename from test/DynamicJsonBuffer/alloc.cpp
rename to test/DynamicMemoryPool/alloc.cpp
index c45e6866..bd7aaa31 100644
--- a/test/DynamicJsonBuffer/alloc.cpp
+++ b/test/DynamicMemoryPool/alloc.cpp
@@ -18,7 +18,7 @@ std::stringstream allocatorLog;
 
 struct SpyingAllocator : DefaultAllocator {
   void* allocate(size_t n) {
-    allocatorLog << "A" << (n - DynamicJsonBuffer::EmptyBlockSize);
+    allocatorLog << "A" << (n - DynamicMemoryPool::EmptyBlockSize);
     return DefaultAllocator::allocate(n);
   }
   void deallocate(void* p) {
@@ -27,20 +27,20 @@ struct SpyingAllocator : DefaultAllocator {
   }
 };
 
-TEST_CASE("DynamicJsonBuffer::alloc()") {
+TEST_CASE("DynamicMemoryPool::alloc()") {
   SECTION("Returns different pointers") {
-    DynamicJsonBuffer buffer;
-    void* p1 = buffer.alloc(1);
-    void* p2 = buffer.alloc(2);
+    DynamicMemoryPool memoryPool;
+    void* p1 = memoryPool.alloc(1);
+    void* p2 = memoryPool.alloc(2);
     REQUIRE(p1 != p2);
   }
 
   SECTION("Doubles allocation size when full") {
     allocatorLog.str("");
     {
-      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
-      buffer.alloc(1);
-      buffer.alloc(1);
+      DynamicMemoryPoolBase<SpyingAllocator> memoryPool(1);
+      memoryPool.alloc(1);
+      memoryPool.alloc(1);
     }
     REQUIRE(allocatorLog.str() == "A1A2FF");
   }
@@ -48,11 +48,11 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {
   SECTION("Resets allocation size after clear()") {
     allocatorLog.str("");
     {
-      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
-      buffer.alloc(1);
-      buffer.alloc(1);
-      buffer.clear();
-      buffer.alloc(1);
+      DynamicMemoryPoolBase<SpyingAllocator> memoryPool(1);
+      memoryPool.alloc(1);
+      memoryPool.alloc(1);
+      memoryPool.clear();
+      memoryPool.alloc(1);
     }
     REQUIRE(allocatorLog.str() == "A1A2FFA1F");
   }
@@ -60,15 +60,15 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {
   SECTION("Makes a big allocation when needed") {
     allocatorLog.str("");
     {
-      DynamicJsonBufferBase<SpyingAllocator> buffer(1);
-      buffer.alloc(42);
+      DynamicMemoryPoolBase<SpyingAllocator> memoryPool(1);
+      memoryPool.alloc(42);
     }
     REQUIRE(allocatorLog.str() == "A42F");
   }
 
   SECTION("Alignment") {
     // make room for two but not three
-    DynamicJsonBuffer tinyBuf(2 * sizeof(void*) + 1);
+    DynamicMemoryPool tinyBuf(2 * sizeof(void*) + 1);
 
     REQUIRE(isAligned(tinyBuf.alloc(1)));  // this on is aligned by design
     REQUIRE(isAligned(tinyBuf.alloc(1)));  // this one fits in the first block
diff --git a/test/DynamicJsonBuffer/no_memory.cpp b/test/DynamicMemoryPool/no_memory.cpp
similarity index 79%
rename from test/DynamicJsonBuffer/no_memory.cpp
rename to test/DynamicMemoryPool/no_memory.cpp
index 06eec36b..fb775443 100644
--- a/test/DynamicJsonBuffer/no_memory.cpp
+++ b/test/DynamicMemoryPool/no_memory.cpp
@@ -14,8 +14,8 @@ struct NoMemoryAllocator {
   void deallocate(void*) {}
 };
 
-TEST_CASE("DynamicJsonBuffer no memory") {
-  DynamicJsonBufferBase<NoMemoryAllocator> _jsonBuffer;
+TEST_CASE("DynamicMemoryPool no memory") {
+  DynamicMemoryPoolBase<NoMemoryAllocator> _memoryPool;
 
   SECTION("FixCodeCoverage") {
     // call this function to fix code coverage
@@ -33,8 +33,8 @@ TEST_CASE("DynamicJsonBuffer no memory") {
   // }
 
   SECTION("startString()") {
-    DynamicJsonBufferBase<NoMemoryAllocator>::String str =
-        _jsonBuffer.startString();
+    DynamicMemoryPoolBase<NoMemoryAllocator>::String str =
+        _memoryPool.startString();
     str.append('!');
     REQUIRE(0 == str.c_str());
   }
diff --git a/test/DynamicMemoryPool/size.cpp b/test/DynamicMemoryPool/size.cpp
new file mode 100644
index 00000000..d9c28fce
--- /dev/null
+++ b/test/DynamicMemoryPool/size.cpp
@@ -0,0 +1,29 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson/Memory/DynamicMemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ArduinoJson::Internals;
+
+TEST_CASE("DynamicMemoryPool::size()") {
+  DynamicMemoryPool memoryPool;
+
+  SECTION("Initial size is 0") {
+    REQUIRE(0 == memoryPool.size());
+  }
+
+  SECTION("Increases after alloc()") {
+    memoryPool.alloc(1);
+    REQUIRE(1U <= memoryPool.size());
+    memoryPool.alloc(1);
+    REQUIRE(2U <= memoryPool.size());
+  }
+
+  SECTION("Goes back to 0 after clear()") {
+    memoryPool.alloc(1);
+    memoryPool.clear();
+    REQUIRE(0 == memoryPool.size());
+  }
+}
diff --git a/test/DynamicJsonBuffer/startString.cpp b/test/DynamicMemoryPool/startString.cpp
similarity index 55%
rename from test/DynamicJsonBuffer/startString.cpp
rename to test/DynamicMemoryPool/startString.cpp
index 3253f1ad..53237bd1 100644
--- a/test/DynamicJsonBuffer/startString.cpp
+++ b/test/DynamicMemoryPool/startString.cpp
@@ -2,16 +2,16 @@
 // Copyright Benoit Blanchon 2014-2018
 // MIT License
 
-#include <ArduinoJson/Memory/DynamicJsonBuffer.hpp>
+#include <ArduinoJson/Memory/DynamicMemoryPool.hpp>
 #include <catch.hpp>
 
 using namespace ArduinoJson::Internals;
 
-TEST_CASE("DynamicJsonBuffer::startString()") {
+TEST_CASE("DynamicMemoryPool::startString()") {
   SECTION("WorksWhenBufferIsBigEnough") {
-    DynamicJsonBuffer jsonBuffer(6);
+    DynamicMemoryPool memoryPool(6);
 
-    DynamicJsonBuffer::String str = jsonBuffer.startString();
+    DynamicMemoryPool::String str = memoryPool.startString();
     str.append('h');
     str.append('e');
     str.append('l');
@@ -22,9 +22,9 @@ TEST_CASE("DynamicJsonBuffer::startString()") {
   }
 
   SECTION("GrowsWhenBufferIsTooSmall") {
-    DynamicJsonBuffer jsonBuffer(5);
+    DynamicMemoryPool memoryPool(5);
 
-    DynamicJsonBuffer::String str = jsonBuffer.startString();
+    DynamicMemoryPool::String str = memoryPool.startString();
     str.append('h');
     str.append('e');
     str.append('l');
@@ -35,15 +35,15 @@ TEST_CASE("DynamicJsonBuffer::startString()") {
   }
 
   SECTION("SizeIncreases") {
-    DynamicJsonBuffer jsonBuffer(5);
+    DynamicMemoryPool memoryPool(5);
 
-    DynamicJsonBuffer::String str = jsonBuffer.startString();
-    REQUIRE(0 == jsonBuffer.size());
+    DynamicMemoryPool::String str = memoryPool.startString();
+    REQUIRE(0 == memoryPool.size());
 
     str.append('h');
-    REQUIRE(1 == jsonBuffer.size());
+    REQUIRE(1 == memoryPool.size());
 
     str.c_str();
-    REQUIRE(2 == jsonBuffer.size());
+    REQUIRE(2 == memoryPool.size());
   }
 }
diff --git a/test/JsonArray/copyFrom.cpp b/test/JsonArray/copyFrom.cpp
index 0838c074..c0ce1b03 100644
--- a/test/JsonArray/copyFrom.cpp
+++ b/test/JsonArray/copyFrom.cpp
@@ -19,7 +19,7 @@ TEST_CASE("JsonArray::copyFrom()") {
     REQUIRE(std::string("[1,2,3]") == json);
   }
 
-  SECTION("OneDimension_JsonBufferTooSmall") {
+  SECTION("OneDimension_MemoryPoolTooSmall") {
     const size_t SIZE = JSON_ARRAY_SIZE(2);
     StaticJsonDocument<SIZE> doc;
     JsonArray array = doc.to<JsonArray>();
@@ -46,7 +46,7 @@ TEST_CASE("JsonArray::copyFrom()") {
     REQUIRE(std::string("[[1,2,3],[4,5,6]]") == json);
   }
 
-  SECTION("TwoDimensions_JsonBufferTooSmall") {
+  SECTION("TwoDimensions_MemoryPoolTooSmall") {
     const size_t SIZE =
         JSON_ARRAY_SIZE(2) + JSON_ARRAY_SIZE(3) + JSON_ARRAY_SIZE(2);
     StaticJsonDocument<SIZE> doc;
diff --git a/test/JsonDeserializer/deserializeJsonArrayStatic.cpp b/test/JsonDeserializer/deserializeJsonArrayStatic.cpp
index c4fa6bce..c9f31fad 100644
--- a/test/JsonDeserializer/deserializeJsonArrayStatic.cpp
+++ b/test/JsonDeserializer/deserializeJsonArrayStatic.cpp
@@ -57,7 +57,7 @@ TEST_CASE("deserialize JSON array with a StaticJsonDocument") {
     deserializeJson(doc, "  [ \"1234567\" ] ");
 
     REQUIRE(JSON_ARRAY_SIZE(1) + sizeof("1234567") == doc.memoryUsage());
-    // note: we use a string of 8 bytes to be sure that the StaticJsonBuffer
+    // note: we use a string of 8 bytes to be sure that the StaticMemoryPool
     // will not insert bytes to enforce alignement
   }
 
diff --git a/test/StaticJsonBuffer/CMakeLists.txt b/test/StaticJsonBuffer/CMakeLists.txt
deleted file mode 100644
index 0be97fbe..00000000
--- a/test/StaticJsonBuffer/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2018
-# MIT License
-
-add_executable(StaticJsonBufferTests 
-	alloc.cpp
-	size.cpp
-	startString.cpp
-)
-
-target_link_libraries(StaticJsonBufferTests catch)
-add_test(StaticJsonBuffer StaticJsonBufferTests)
diff --git a/test/StaticJsonBuffer/size.cpp b/test/StaticJsonBuffer/size.cpp
deleted file mode 100644
index 88b3dc20..00000000
--- a/test/StaticJsonBuffer/size.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2018
-// MIT License
-
-#include <ArduinoJson/Memory/StaticJsonBuffer.hpp>
-#include <catch.hpp>
-
-using namespace ArduinoJson::Internals;
-
-TEST_CASE("StaticJsonBuffer::size()") {
-  StaticJsonBuffer<64> buffer;
-
-  SECTION("Capacity equals template parameter") {
-    REQUIRE(64 == buffer.capacity());
-  }
-
-  SECTION("Initial size is 0") {
-    REQUIRE(0 == buffer.size());
-  }
-
-  SECTION("Increases after alloc()") {
-    buffer.alloc(1);
-    REQUIRE(1U <= buffer.size());
-    buffer.alloc(1);
-    REQUIRE(2U <= buffer.size());
-  }
-
-  SECTION("Doesn't grow when buffer is full") {
-    buffer.alloc(64);
-    buffer.alloc(1);
-    REQUIRE(64 == buffer.size());
-  }
-
-  SECTION("Does't grow when buffer is too small for alloc") {
-    buffer.alloc(65);
-    REQUIRE(0 == buffer.size());
-  }
-
-  SECTION("Goes back to zero after clear()") {
-    buffer.alloc(1);
-    buffer.clear();
-    REQUIRE(0 == buffer.size());
-  }
-}
diff --git a/test/StaticMemoryPool/CMakeLists.txt b/test/StaticMemoryPool/CMakeLists.txt
new file mode 100644
index 00000000..5d026dc9
--- /dev/null
+++ b/test/StaticMemoryPool/CMakeLists.txt
@@ -0,0 +1,12 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2018
+# MIT License
+
+add_executable(StaticMemoryPoolTests 
+	alloc.cpp
+	size.cpp
+	startString.cpp
+)
+
+target_link_libraries(StaticMemoryPoolTests catch)
+add_test(StaticMemoryPool StaticMemoryPoolTests)
diff --git a/test/StaticJsonBuffer/alloc.cpp b/test/StaticMemoryPool/alloc.cpp
similarity index 59%
rename from test/StaticJsonBuffer/alloc.cpp
rename to test/StaticMemoryPool/alloc.cpp
index 13387185..0671cad4 100644
--- a/test/StaticJsonBuffer/alloc.cpp
+++ b/test/StaticMemoryPool/alloc.cpp
@@ -2,7 +2,7 @@
 // Copyright Benoit Blanchon 2014-2018
 // MIT License
 
-#include <ArduinoJson/Memory/StaticJsonBuffer.hpp>
+#include <ArduinoJson/Memory/StaticMemoryPool.hpp>
 #include <catch.hpp>
 
 using namespace ArduinoJson::Internals;
@@ -13,42 +13,42 @@ static bool isAligned(void *ptr) {
   return (addr & mask) == 0;
 }
 
-TEST_CASE("StaticJsonBuffer::alloc()") {
-  StaticJsonBuffer<64> buffer;
+TEST_CASE("StaticMemoryPool::alloc()") {
+  StaticMemoryPool<64> memoryPool;
 
   SECTION("Returns different addresses") {
-    void *p1 = buffer.alloc(1);
-    void *p2 = buffer.alloc(1);
+    void *p1 = memoryPool.alloc(1);
+    void *p2 = memoryPool.alloc(1);
     REQUIRE(p1 != p2);
   }
 
   SECTION("Returns non-NULL when using full capacity") {
-    void *p = buffer.alloc(64);
+    void *p = memoryPool.alloc(64);
     REQUIRE(0 != p);
   }
 
   SECTION("Returns NULL when full") {
-    buffer.alloc(64);
-    void *p = buffer.alloc(1);
+    memoryPool.alloc(64);
+    void *p = memoryPool.alloc(1);
     REQUIRE(0 == p);
   }
 
-  SECTION("Returns NULL when buffer is too small") {
-    void *p = buffer.alloc(65);
+  SECTION("Returns NULL when memoryPool is too small") {
+    void *p = memoryPool.alloc(65);
     REQUIRE(0 == p);
   }
 
   SECTION("Returns aligned pointers") {
     for (size_t size = 1; size <= sizeof(void *); size++) {
-      void *p = buffer.alloc(1);
+      void *p = memoryPool.alloc(1);
       REQUIRE(isAligned(p));
     }
   }
 
   SECTION("Returns same address after clear()") {
-    void *p1 = buffer.alloc(1);
-    buffer.clear();
-    void *p2 = buffer.alloc(1);
+    void *p1 = memoryPool.alloc(1);
+    memoryPool.clear();
+    void *p2 = memoryPool.alloc(1);
     REQUIRE(p1 == p2);
   }
 }
diff --git a/test/StaticMemoryPool/size.cpp b/test/StaticMemoryPool/size.cpp
new file mode 100644
index 00000000..a3af0d1f
--- /dev/null
+++ b/test/StaticMemoryPool/size.cpp
@@ -0,0 +1,44 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson/Memory/StaticMemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ArduinoJson::Internals;
+
+TEST_CASE("StaticMemoryPool::size()") {
+  StaticMemoryPool<64> memoryPool;
+
+  SECTION("Capacity equals template parameter") {
+    REQUIRE(64 == memoryPool.capacity());
+  }
+
+  SECTION("Initial size is 0") {
+    REQUIRE(0 == memoryPool.size());
+  }
+
+  SECTION("Increases after alloc()") {
+    memoryPool.alloc(1);
+    REQUIRE(1U <= memoryPool.size());
+    memoryPool.alloc(1);
+    REQUIRE(2U <= memoryPool.size());
+  }
+
+  SECTION("Doesn't grow when memoryPool is full") {
+    memoryPool.alloc(64);
+    memoryPool.alloc(1);
+    REQUIRE(64 == memoryPool.size());
+  }
+
+  SECTION("Does't grow when memoryPool is too small for alloc") {
+    memoryPool.alloc(65);
+    REQUIRE(0 == memoryPool.size());
+  }
+
+  SECTION("Goes back to zero after clear()") {
+    memoryPool.alloc(1);
+    memoryPool.clear();
+    REQUIRE(0 == memoryPool.size());
+  }
+}
diff --git a/test/StaticJsonBuffer/startString.cpp b/test/StaticMemoryPool/startString.cpp
similarity index 58%
rename from test/StaticJsonBuffer/startString.cpp
rename to test/StaticMemoryPool/startString.cpp
index 282823b7..c8e570fc 100644
--- a/test/StaticJsonBuffer/startString.cpp
+++ b/test/StaticMemoryPool/startString.cpp
@@ -7,11 +7,11 @@
 
 using namespace ArduinoJson::Internals;
 
-TEST_CASE("StaticJsonBuffer::startString()") {
+TEST_CASE("StaticMemoryPool::startString()") {
   SECTION("WorksWhenBufferIsBigEnough") {
-    StaticJsonBuffer<6> jsonBuffer;
+    StaticMemoryPool<6> memoryPool;
 
-    StaticJsonBufferBase::String str = jsonBuffer.startString();
+    StaticMemoryPoolBase::String str = memoryPool.startString();
     str.append('h');
     str.append('e');
     str.append('l');
@@ -22,9 +22,9 @@ TEST_CASE("StaticJsonBuffer::startString()") {
   }
 
   SECTION("ReturnsNullWhenTooSmall") {
-    StaticJsonBuffer<5> jsonBuffer;
+    StaticMemoryPool<5> memoryPool;
 
-    StaticJsonBufferBase::String str = jsonBuffer.startString();
+    StaticMemoryPoolBase::String str = memoryPool.startString();
     str.append('h');
     str.append('e');
     str.append('l');
@@ -35,15 +35,15 @@ TEST_CASE("StaticJsonBuffer::startString()") {
   }
 
   SECTION("SizeIncreases") {
-    StaticJsonBuffer<5> jsonBuffer;
+    StaticMemoryPool<5> memoryPool;
 
-    StaticJsonBufferBase::String str = jsonBuffer.startString();
-    REQUIRE(0 == jsonBuffer.size());
+    StaticMemoryPoolBase::String str = memoryPool.startString();
+    REQUIRE(0 == memoryPool.size());
 
     str.append('h');
-    REQUIRE(1 == jsonBuffer.size());
+    REQUIRE(1 == memoryPool.size());
 
     str.c_str();
-    REQUIRE(2 == jsonBuffer.size());
+    REQUIRE(2 == memoryPool.size());
   }
 }