diff --git a/eo/src/serial/CMakeLists.txt b/eo/src/serial/CMakeLists.txt
index 43d1ce451..efc9f42e2 100644
--- a/eo/src/serial/CMakeLists.txt
+++ b/eo/src/serial/CMakeLists.txt
@@ -13,10 +13,10 @@ set(EOSERIAL_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib)
 set(LIBRARY_OUTPUT_PATH ${EOSERIAL_LIB_OUTPUT_PATH})
 
 set(EOSERIAL_SOURCES
-    Array.cpp
-    Object.cpp
+    SerialArray.cpp
+    SerialObject.cpp
     Parser.cpp
-    String.cpp
+    SerialString.cpp
   )
 
 add_library(eoserial STATIC ${EOSERIAL_SOURCES})
diff --git a/eo/src/serial/Parser.cpp b/eo/src/serial/Parser.cpp
index 57b52a0dd..e78b35392 100644
--- a/eo/src/serial/Parser.cpp
+++ b/eo/src/serial/Parser.cpp
@@ -23,9 +23,9 @@ Authors:
 
 # include "Parser.h"
 
-# include "Array.h"
-# include "Object.h"
-# include "String.h"
+# include "SerialArray.h"
+# include "SerialObject.h"
+# include "SerialString.h"
 
 // in debug mode only
 // # define DEBUG(x) std::cout << x << std::endl;
diff --git a/eo/src/serial/Parser.h b/eo/src/serial/Parser.h
index 20f6a1bb2..392f25ffa 100644
--- a/eo/src/serial/Parser.h
+++ b/eo/src/serial/Parser.h
@@ -23,8 +23,8 @@ Authors:
 # define __EOSERIAL_PARSER_H__
 
 # include "Entity.h"
-# include "String.h"
-# include "Object.h"
+# include "SerialString.h"
+# include "SerialObject.h"
 
 /**
  * @file Parser.h
diff --git a/eo/src/serial/Array.cpp b/eo/src/serial/SerialArray.cpp
similarity index 98%
rename from eo/src/serial/Array.cpp
rename to eo/src/serial/SerialArray.cpp
index 180aad16b..5282370f5 100644
--- a/eo/src/serial/Array.cpp
+++ b/eo/src/serial/SerialArray.cpp
@@ -19,7 +19,7 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# include "Array.h"
+# include "SerialArray.h"
 
 namespace eoserial
 {
diff --git a/eo/src/serial/Array.h b/eo/src/serial/SerialArray.h
similarity index 99%
rename from eo/src/serial/Array.h
rename to eo/src/serial/SerialArray.h
index d453add99..b349953aa 100644
--- a/eo/src/serial/Array.h
+++ b/eo/src/serial/SerialArray.h
@@ -26,7 +26,7 @@ Authors:
 
 # include "Entity.h"
 # include "Serializable.h"
-# include "Object.h"
+# include "SerialObject.h"
 
 namespace eoserial
 {
diff --git a/eo/src/serial/Object.cpp b/eo/src/serial/SerialObject.cpp
similarity index 98%
rename from eo/src/serial/Object.cpp
rename to eo/src/serial/SerialObject.cpp
index dd859052e..e926e448f 100644
--- a/eo/src/serial/Object.cpp
+++ b/eo/src/serial/SerialObject.cpp
@@ -19,7 +19,7 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# include "Object.h"
+# include "SerialObject.h"
 
 using namespace eoserial;
 
diff --git a/eo/src/serial/Object.h b/eo/src/serial/SerialObject.h
similarity index 100%
rename from eo/src/serial/Object.h
rename to eo/src/serial/SerialObject.h
diff --git a/eo/src/serial/String.cpp b/eo/src/serial/SerialString.cpp
similarity index 97%
rename from eo/src/serial/String.cpp
rename to eo/src/serial/SerialString.cpp
index c50882786..6d49106cc 100644
--- a/eo/src/serial/String.cpp
+++ b/eo/src/serial/SerialString.cpp
@@ -19,7 +19,7 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# include "String.h"
+# include "SerialString.h"
 
 namespace eoserial
 {
diff --git a/eo/src/serial/String.h b/eo/src/serial/SerialString.h
similarity index 100%
rename from eo/src/serial/String.h
rename to eo/src/serial/SerialString.h
diff --git a/eo/src/serial/Utils.h b/eo/src/serial/Utils.h
index 33172a747..13b6877b1 100644
--- a/eo/src/serial/Utils.h
+++ b/eo/src/serial/Utils.h
@@ -22,9 +22,9 @@ Authors:
 # ifndef __EOSERIAL_UTILS_H__
 # define __EOSERIAL_UTILS_H__
 
-# include "Array.h"
-# include "Object.h"
-# include "String.h"
+# include "SerialArray.h"
+# include "SerialObject.h"
+# include "SerialString.h"
 
 namespace eoserial
 {
diff --git a/eo/src/serial/eoSerial.h b/eo/src/serial/eoSerial.h
index 55a116f0c..8ea3a9764 100644
--- a/eo/src/serial/eoSerial.h
+++ b/eo/src/serial/eoSerial.h
@@ -22,10 +22,10 @@ Authors:
 # ifndef __EOSERIAL_HEADERS__
 # define __EOSERIAL_HEADERS__
 
-# include "Object.h"
+# include "SerialObject.h"
 # include "Serializable.h"
-# include "Array.h"
-# include "Object.h"
+# include "SerialArray.h"
+# include "SerialObject.h"
 # include "String.h"
 # include "Parser.h"
 # include "Utils.h"