diff --git a/JsonGenerator/EscapedString.cpp b/JsonGenerator/EscapedString.cpp
index ac4605a4..d58f9efc 100644
--- a/JsonGenerator/EscapedString.cpp
+++ b/JsonGenerator/EscapedString.cpp
@@ -5,6 +5,7 @@
 
 #include "EscapedString.h"
 
+using namespace ArduinoJson::Internals;
 
 size_t EscapedString::printTo(Print& p) const
 {
diff --git a/JsonGenerator/EscapedString.h b/JsonGenerator/EscapedString.h
index 6f573e11..1887db5a 100644
--- a/JsonGenerator/EscapedString.h
+++ b/JsonGenerator/EscapedString.h
@@ -7,18 +7,23 @@
 
 #include "Print.h"
 
-class EscapedString
+namespace ArduinoJson
 {
-public:
-
-    void set(const char* s)    
+    namespace Internals
     {
-        rawString = s;
+        class EscapedString
+        {
+        public:
+
+            void set(const char* s)
+            {
+                rawString = s;
+            }
+
+            size_t printTo(Print&) const;
+
+        private:
+            const char* rawString;
+        };
     }
-
-    size_t printTo(Print&) const;
-
-private:
-    const char* rawString;
-};
-
+}
\ No newline at end of file
diff --git a/JsonGenerator/JsonArray.h b/JsonGenerator/JsonArray.h
index e7cbcc4a..3ca22d3f 100644
--- a/JsonGenerator/JsonArray.h
+++ b/JsonGenerator/JsonArray.h
@@ -45,7 +45,7 @@ namespace ArduinoJson
             using JsonObjectBase::printTo;
 
         private:
-            JsonValue items[N];
+            Internals::JsonValue items[N];
             int itemCount;
 
             virtual size_t printTo(Print& p) const
diff --git a/JsonGenerator/JsonHashTable.h b/JsonGenerator/JsonHashTable.h
index fc4e0200..5fd65bc8 100644
--- a/JsonGenerator/JsonHashTable.h
+++ b/JsonGenerator/JsonHashTable.h
@@ -53,8 +53,8 @@ namespace ArduinoJson
 
             struct KeyValuePair
             {
-                EscapedString key;
-                JsonValue value;
+                Internals::EscapedString  key;
+                Internals::JsonValue      value;
             };
 
             KeyValuePair items[N];
diff --git a/JsonGenerator/JsonObjectBase.h b/JsonGenerator/JsonObjectBase.h
index 57363c44..7f164612 100644
--- a/JsonGenerator/JsonObjectBase.h
+++ b/JsonGenerator/JsonObjectBase.h
@@ -19,6 +19,8 @@ namespace ArduinoJson
 
             size_t printTo(char* buffer, size_t bufferSize)
             {
+                using namespace Internals;
+
                 StringBuilder sb(buffer, bufferSize);
                 return printTo(sb);
             }
diff --git a/JsonGenerator/JsonValue.cpp b/JsonGenerator/JsonValue.cpp
index 1398b07a..521178dc 100644
--- a/JsonGenerator/JsonValue.cpp
+++ b/JsonGenerator/JsonValue.cpp
@@ -6,7 +6,7 @@
 #include "EscapedString.h"
 #include "JsonValue.h"
 
-using namespace ArduinoJson::Generator;
+using namespace ArduinoJson::Internals;
 
 size_t JsonValue::printBoolTo(const Content& c, Print& p)
 {
diff --git a/JsonGenerator/JsonValue.h b/JsonGenerator/JsonValue.h
index a72507bc..e255148b 100644
--- a/JsonGenerator/JsonValue.h
+++ b/JsonGenerator/JsonValue.h
@@ -11,7 +11,7 @@
 
 namespace ArduinoJson
 {
-    namespace Generator
+    namespace Internals
     {
         class JsonValue
         {
diff --git a/JsonGenerator/StringBuilder.cpp b/JsonGenerator/StringBuilder.cpp
index aaa96a2b..debf4fd7 100644
--- a/JsonGenerator/StringBuilder.cpp
+++ b/JsonGenerator/StringBuilder.cpp
@@ -5,7 +5,7 @@
 
 #include "StringBuilder.h"
 
-using namespace ArduinoJson::Generator;
+using namespace ArduinoJson::Internals;
 
 size_t StringBuilder::write(uint8_t c)
 {
diff --git a/JsonGenerator/StringBuilder.h b/JsonGenerator/StringBuilder.h
index dc16b4cb..3e0bc96f 100644
--- a/JsonGenerator/StringBuilder.h
+++ b/JsonGenerator/StringBuilder.h
@@ -9,7 +9,7 @@
 
 namespace ArduinoJson
 {
-    namespace Generator
+    namespace Internals
     {
         class StringBuilder : public Print
         {
diff --git a/JsonGeneratorTests/JsonValueTests.cpp b/JsonGeneratorTests/JsonValueTests.cpp
index de3a82f6..89bcd2cb 100644
--- a/JsonGeneratorTests/JsonValueTests.cpp
+++ b/JsonGeneratorTests/JsonValueTests.cpp
@@ -3,7 +3,7 @@
 #include "JsonValue.h"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-using namespace ArduinoJson::Generator;
+using namespace ArduinoJson::Internals;
 
 namespace JsonGeneratorTests
 {
diff --git a/JsonGeneratorTests/StringBuilderTests.cpp b/JsonGeneratorTests/StringBuilderTests.cpp
index fe76490a..c202aba2 100644
--- a/JsonGeneratorTests/StringBuilderTests.cpp
+++ b/JsonGeneratorTests/StringBuilderTests.cpp
@@ -2,18 +2,18 @@
 #include "StringBuilder.h"
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-using namespace ArduinoJson::Generator;
+using namespace ArduinoJson::Internals;
 
 namespace JsonGeneratorTests
 {
-	TEST_CLASS(StringBuilderTests)
-	{
+    TEST_CLASS(StringBuilderTests)
+    {
         char buffer[20];
         Print* sb;
         size_t returnValue;
 
-	public:
-		
+    public:
+        
         TEST_METHOD_INITIALIZE(Initialize)
         {
             sb = new StringBuilder(buffer, sizeof(buffer));
@@ -77,5 +77,5 @@ namespace JsonGeneratorTests
         {
             Assert::AreEqual(expected, returnValue);
         }
-	};
+    };
 }
\ No newline at end of file