diff --git a/extras/tests/Misc/StringAdapters.cpp b/extras/tests/Misc/StringAdapters.cpp
index 4b19b9bb..2567a282 100644
--- a/extras/tests/Misc/StringAdapters.cpp
+++ b/extras/tests/Misc/StringAdapters.cpp
@@ -10,7 +10,7 @@
 #include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
 #include <ArduinoJson/Strings/FlashStringAdapter.hpp>
 #include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
-#include <ArduinoJson/Strings/StlStringAdapter.hpp>
+#include <ArduinoJson/Strings/StdStringAdapter.hpp>
 
 #include <catch.hpp>
 
@@ -102,7 +102,7 @@ TEST_CASE("FlashStringAdapter") {
 
 TEST_CASE("std::string") {
   std::string str("bravo");
-  StlStringAdapter<std::string> adapter = adaptString(str);
+  StdStringAdapter<std::string> adapter = adaptString(str);
 
   CHECK(adapter.compare(NULL) > 0);
   CHECK(adapter.compare("alpha") > 0);
@@ -132,7 +132,7 @@ TEST_CASE("Arduino String") {
 
 TEST_CASE("custom_string") {
   custom_string str("bravo");
-  StlStringAdapter<custom_string> adapter = adaptString(str);
+  StdStringAdapter<custom_string> adapter = adaptString(str);
 
   CHECK(adapter.compare(NULL) > 0);
   CHECK(adapter.compare("alpha") > 0);
diff --git a/src/ArduinoJson/Strings/StlStringAdapter.hpp b/src/ArduinoJson/Strings/StdStringAdapter.hpp
similarity index 85%
rename from src/ArduinoJson/Strings/StlStringAdapter.hpp
rename to src/ArduinoJson/Strings/StdStringAdapter.hpp
index a7d2c915..21862ed7 100644
--- a/src/ArduinoJson/Strings/StlStringAdapter.hpp
+++ b/src/ArduinoJson/Strings/StdStringAdapter.hpp
@@ -13,9 +13,9 @@
 namespace ARDUINOJSON_NAMESPACE {
 
 template <typename TString>
-class StlStringAdapter {
+class StdStringAdapter {
  public:
-  StlStringAdapter(const TString& str) : _str(&str) {}
+  StdStringAdapter(const TString& str) : _str(&str) {}
 
   void copyTo(char* p, size_t n) const {
     memcpy(p, _str->c_str(), n);
@@ -56,9 +56,9 @@ struct IsString<std::basic_string<char, TCharTraits, TAllocator> > : true_type {
 };
 
 template <typename TCharTraits, typename TAllocator>
-inline StlStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >
+inline StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >
 adaptString(const std::basic_string<char, TCharTraits, TAllocator>& str) {
-  return StlStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >(
+  return StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >(
       str);
 }
 
diff --git a/src/ArduinoJson/Strings/StringAdapters.hpp b/src/ArduinoJson/Strings/StringAdapters.hpp
index 30b45d04..986f3052 100644
--- a/src/ArduinoJson/Strings/StringAdapters.hpp
+++ b/src/ArduinoJson/Strings/StringAdapters.hpp
@@ -9,7 +9,7 @@
 #include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
 
 #if ARDUINOJSON_ENABLE_STD_STRING
-#include <ArduinoJson/Strings/StlStringAdapter.hpp>
+#include <ArduinoJson/Strings/StdStringAdapter.hpp>
 #endif
 
 #if ARDUINOJSON_ENABLE_ARDUINO_STRING