diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7315018..2650bdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,12 +166,12 @@ install(FILES ${C_LIBSTL_HEADERS} DESTINATION include/gmio_stl)
 install(FILES src/gmio_support/support_global.h DESTINATION include/gmio_support)
 
 # Qt support
-install(FILES src/gmio_support/qt_stream.h   DESTINATION include/gmio_support)
-install(FILES src/gmio_support/qt_stream.cpp DESTINATION src/gmio_support)
+install(FILES src/gmio_support/stream_qt.h   DESTINATION include/gmio_support)
+install(FILES src/gmio_support/stream_qt.cpp DESTINATION src/gmio_support)
 
 # OpenCASCADE support
-install(FILES src/gmio_support/occ_libstl.h   DESTINATION include/gmio_support)
-install(FILES src/gmio_support/occ_libstl.cpp DESTINATION src/gmio_support)
+install(FILES src/gmio_support/stl_occ.h   DESTINATION include/gmio_support)
+install(FILES src/gmio_support/stl_occ.cpp DESTINATION src/gmio_support)
 
 # Installs for target
 add_library(gmio ${ALL_SRC_FILES})
diff --git a/benchs/bench_occ/main.cpp b/benchs/bench_occ/main.cpp
index 3ec1b1d..14e9cba 100644
--- a/benchs/bench_occ/main.cpp
+++ b/benchs/bench_occ/main.cpp
@@ -4,7 +4,7 @@
 
 #include <gmio_core/error.h>
 #include <gmio_stl/stl_io.h>
-#include <gmio_support/occ_libstl.h>
+#include <gmio_support/stl_occ.h>
 
 #include "../commons/bench_tools.h"
 
diff --git a/src/gmio_support/occ_libstl.cpp b/src/gmio_support/stl_occ.cpp
similarity index 99%
rename from src/gmio_support/occ_libstl.cpp
rename to src/gmio_support/stl_occ.cpp
index af1b4aa..bd95287 100644
--- a/src/gmio_support/occ_libstl.cpp
+++ b/src/gmio_support/stl_occ.cpp
@@ -13,7 +13,7 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-#include <gmio_support/occ_libstl.h>
+#include <gmio_support/stl_occ.h>
 
 #include <cstring>
 #include <StlMesh_Mesh.hxx>
diff --git a/src/gmio_support/occ_libstl.h b/src/gmio_support/stl_occ.h
similarity index 95%
rename from src/gmio_support/occ_libstl.h
rename to src/gmio_support/stl_occ.h
index 9d7d57c..664aa44 100644
--- a/src/gmio_support/occ_libstl.h
+++ b/src/gmio_support/stl_occ.h
@@ -13,12 +13,12 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-/*! \file occ_libstl.h
+/*! \file stl_occ.h
  *  Support of OpenCascade's StlMesh_Mesh
  */
 
-#ifndef GMIO_SUPPORT_OCC_LIBSTL_H
-#define GMIO_SUPPORT_OCC_LIBSTL_H
+#ifndef GMIO_SUPPORT_STL_OCC_H
+#define GMIO_SUPPORT_STL_OCC_H
 
 #include "support_global.h"
 #include "../gmio_stl/stl_mesh.h"
@@ -81,4 +81,4 @@ void gmio_stl_set_occmesh_creator(
 GMIO_LIBSUPPORT_EXPORT
 gmio_stl_mesh_creator gmio_stl_occmesh_creator(const Handle_StlMesh_Mesh& mesh);
 
-#endif /* GMIO_SUPPORT_OCC_LIBSTL_H */
+#endif /* GMIO_SUPPORT_STL_OCC_H */
diff --git a/src/gmio_support/qt_stream.cpp b/src/gmio_support/stream_qt.cpp
similarity index 98%
rename from src/gmio_support/qt_stream.cpp
rename to src/gmio_support/stream_qt.cpp
index 4b77fae..e995fbe 100644
--- a/src/gmio_support/qt_stream.cpp
+++ b/src/gmio_support/stream_qt.cpp
@@ -13,7 +13,7 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-#include <gmio_support/qt_stream.h>
+#include <gmio_support/stream_qt.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QIODevice>
diff --git a/src/gmio_support/qt_stream.h b/src/gmio_support/stream_qt.h
similarity index 89%
rename from src/gmio_support/qt_stream.h
rename to src/gmio_support/stream_qt.h
index de2b50d..5a0848f 100644
--- a/src/gmio_support/qt_stream.h
+++ b/src/gmio_support/stream_qt.h
@@ -13,12 +13,12 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-/*! \file qt_stream.h
+/*! \file stream_qt.h
  *  Support of Qt's QIODevice (requires at least Qt4)
  */
 
-#ifndef GMIO_SUPPORT_QT_STREAM_H
-#define GMIO_SUPPORT_QT_STREAM_H
+#ifndef GMIO_SUPPORT_STREAM_QT_H
+#define GMIO_SUPPORT_STREAM_QT_H
 
 #include "support_global.h"
 #include "../gmio_core/stream.h"
@@ -32,4 +32,4 @@ QT_END_NAMESPACE
 GMIO_LIBSUPPORT_EXPORT
 gmio_stream_t gmio_stream_qiodevice(QT_PREPEND_NAMESPACE(QIODevice)* device);
 
-#endif /* GMIO_SUPPORT_QT_STREAM_H */
+#endif /* GMIO_SUPPORT_STREAM_QT_H */