diff --git a/JsonGeneratorTests/JsonArray.h b/JsonGeneratorTests/JsonArray.h
index 6e9f45fc..e279bace 100644
--- a/JsonGeneratorTests/JsonArray.h
+++ b/JsonGeneratorTests/JsonArray.h
@@ -19,28 +19,28 @@ public:
     
     void add(const char* value)
     {
-        ObjectValue v;
+        JsonValueContent v;
         v.string = value;
         addItem(JSON_STRING, v);
     }
 
     void add(double value)
     {
-        ObjectValue v;
+        JsonValueContent v;
         v.number = value;
         addItem(JSON_NUMBER, v);
     }
 
     void add(bool value)
     {
-        ObjectValue v;
+        JsonValueContent v;
         v.boolean = value;
         addItem(JSON_BOOLEAN, v);
     }
 
     void add(JsonObjectBase& value)
     {
-        ObjectValue v;
+        JsonValueContent v;
         v.object = &value;
         addItem(JSON_OBJECT, v);
     }
@@ -48,7 +48,7 @@ public:
     using JsonObjectBase::writeTo;
 
 private:
-    ObjectContainer items[N];
+    JsonValue items[N];
     int itemCount;
 
     virtual void writeTo(StringBuilder& sb)
@@ -58,18 +58,18 @@ private:
         for (int i = 0; i < itemCount; i++)
         {
             if (i>0) sb.append(",");
-            writeObjectTo(items[i], sb);
+            writeValueTo(items[i], sb);
         }
 
         sb.append("]");
     }
 
-    void addItem(ObjectType type, ObjectValue value)
+    void addItem(JsonValueType type, JsonValueContent content)
     {
         if (itemCount >= N) return;
 
         items[itemCount].type = type;
-        items[itemCount].value = value;
+        items[itemCount].content = content;
         itemCount++;
     }
 };
diff --git a/JsonGeneratorTests/JsonHashTable.h b/JsonGeneratorTests/JsonHashTable.h
index 3ae984c0..6932618d 100644
--- a/JsonGeneratorTests/JsonHashTable.h
+++ b/JsonGeneratorTests/JsonHashTable.h
@@ -19,7 +19,7 @@ public:
 
     void add(const char* key, const char* value)
     {
-        ObjectValue v;
+        JsonValueContent v;
         v.string = value;
         addItem(key, JSON_STRING, v);
     }
@@ -31,7 +31,7 @@ private:
     struct KeyValuePair
     {
         const char* key;
-        ObjectContainer value;
+        JsonValue value;
     };
 
     KeyValuePair items[N];
@@ -46,19 +46,19 @@ private:
             if (i>0) sb.append(",");
             sb.appendEscaped(items[i].key);
             sb.append(":");
-            writeObjectTo(items[i].value, sb);
+            writeValueTo(items[i].value, sb);
         }
 
         sb.append("}");
     }
 
-    void addItem(const char* key, ObjectType type, ObjectValue value)
+    void addItem(const char* key, JsonValueType type, JsonValueContent content)
     {
         if (itemCount >= N) return;
 
         items[itemCount].key = key;
         items[itemCount].value.type = type;
-        items[itemCount].value.value = value;
+        items[itemCount].value.content = content;
         itemCount++;
     }
 };
diff --git a/JsonGeneratorTests/JsonObjectBase.cpp b/JsonGeneratorTests/JsonObjectBase.cpp
index 6c8d75f7..008278c2 100644
--- a/JsonGeneratorTests/JsonObjectBase.cpp
+++ b/JsonGeneratorTests/JsonObjectBase.cpp
@@ -1,24 +1,24 @@
 #include "JsonObjectBase.h"
 
-void JsonObjectBase::writeObjectTo(ObjectContainer& obj, StringBuilder& sb)
+void JsonObjectBase::writeValueTo(JsonValue& obj, StringBuilder& sb)
 {
     switch (obj.type)
     {
     case JSON_STRING:
-        sb.appendEscaped(obj.value.string);
+        sb.appendEscaped(obj.content.string);
         break;
 
     case JSON_NUMBER:
-        sb.append(obj.value.number);
+        sb.append(obj.content.number);
         break;
 
     case JSON_BOOLEAN:
-        sb.append(obj.value.boolean ? "true" : "false");
+        sb.append(obj.content.boolean ? "true" : "false");
         break;
 
     case JSON_OBJECT:
-        if (obj.value.object)
-            obj.value.object->writeTo(sb);
+        if (obj.content.object)
+            obj.content.object->writeTo(sb);
         else
             sb.append("null");
         break;
diff --git a/JsonGeneratorTests/JsonObjectBase.h b/JsonGeneratorTests/JsonObjectBase.h
index 0ab32315..1e15300c 100644
--- a/JsonGeneratorTests/JsonObjectBase.h
+++ b/JsonGeneratorTests/JsonObjectBase.h
@@ -19,7 +19,7 @@ public:
 
 protected:
 
-    enum ObjectType
+    enum JsonValueType
     {
         JSON_STRING,
         JSON_NUMBER,
@@ -27,7 +27,7 @@ protected:
         JSON_OBJECT,
     };
 
-    union ObjectValue
+    union JsonValueContent
     {
         const char*     string;
         double          number;
@@ -35,13 +35,13 @@ protected:
         JsonObjectBase* object;
     };
 
-    struct ObjectContainer
+    struct JsonValue
     {
-        ObjectType type;
-        ObjectValue value;
+        JsonValueType    type;
+        JsonValueContent content;
     };
 
-    void writeObjectTo(ObjectContainer& obj, StringBuilder& sb);
+    void writeValueTo(JsonValue& obj, StringBuilder& sb);
 
     virtual void writeTo(StringBuilder& sb) = 0;
 };