diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8d848818eb8a7cd1b5ac8ba2a675407833e7a7e..aee06ad13e03e88af448ebee60915acea2cd5396 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,7 +84,7 @@ SET(VITE_HDRS
   trace/Trace.hpp
   trace/IntervalOfContainer.hpp
   # Render headers
-  render/Render.hpp
+  render/GanttDiagram.hpp
   render/Geometry.hpp
   render/Hook_event.hpp
   render/Minimap.hpp
@@ -178,10 +178,10 @@ SET(VITE_SRCS
   trace/Variable.cpp
   trace/VariableType.cpp
   # Render code files
+  render/GanttDiagram.hpp
   render/Geometry.cpp
   render/Hook_event.cpp
   render/Minimap.cpp
-  render/Render.hpp
   render/Render_opengl.cpp
   render/Render_svg.cpp
   render/Ruler.cpp
diff --git a/src/core/Core.cpp b/src/core/Core.cpp
index 356913b954517b6e6e44cfbb4d6b38692c6f2940..1781587eb42081acb783e34e3ea2790fbfdcb5e5 100644
--- a/src/core/Core.cpp
+++ b/src/core/Core.cpp
@@ -92,7 +92,7 @@
 #include "render/Geometry.hpp"
 #include "render/Hook_event.hpp"
 #include "render/Ruler.hpp"
-#include "render/Render.hpp"
+#include "render/GanttDiagram.hpp"
 #include "render/Render_template.hpp"
 #include "render/Render_svg.hpp"
 /* -- */
@@ -751,7 +751,8 @@ bool Core::draw_trace(const string & filename, const int format) {
 
         if (_DRAW_OPENGL == format) {
 
-            drawing_ogl.build(&_render_opengl, _trace);
+            GanttDiagram<Render_opengl> render(_render_opengl);
+            drawing_ogl.build(&render, _trace);
             _render_opengl->build();
             // _render_opengl->updateGL();
             _render_opengl->refresh_scroll_bars();
@@ -783,7 +784,7 @@ bool Core::draw_trace(const string & filename, const int format) {
                 Info::Entity::x_max = _time_end;
             }
             cout << "Exporting trace to " << _path_to_export<<" ... Please Wait " << endl ;
-            Render<Render_svg> render(_render_svg);
+            GanttDiagram<Render_svg> render(_render_svg);
             drawing_ogl.build(&render, _trace);
 
             delete _render_svg;/* Release the svg render */
diff --git a/src/core/Core.hpp b/src/core/Core.hpp
index f827186d1083df4de3c602df11f9717ea05fbcad..0ec392ad94c776c5da005801845ee3e979128db1 100644
--- a/src/core/Core.hpp
+++ b/src/core/Core.hpp
@@ -74,7 +74,7 @@ class QWaitCondition ;
 #include <boost/mpi/environment.hpp>
 #include <boost/mpi/communicator.hpp>
 #endif
-//#include "render/Render.hpp"
+//#include "render/GanttDiagram.hpp"
 //#include "interface/Interface.hpp"
 
 /*!
diff --git a/src/render/Render_alternate.cpp b/src/render/Render_alternate.cpp
index c71c989a09ca77c071a95058ebd15bc32420f910..f57db2cdcd33fd9976d9541101be3651dc0659e6 100644
--- a/src/render/Render_alternate.cpp
+++ b/src/render/Render_alternate.cpp
@@ -48,7 +48,7 @@
 #include "common/common.hpp"
 #include "common/Info.hpp"
 /* -- */
-//#include "render/render.hpp"
+//#include "render/GanttDiagram.hpp"
 
 #include <GL/glew.h>
 #include "render/Hook_event.hpp"
@@ -58,7 +58,7 @@
 
 #include "interface/resource.hpp"
 //#include "interface/interface.hpp"
-#include "render/Render.hpp"
+#include "render/GanttDiagram.hpp"
 #include "core/Core.hpp"
 /* -- */
 
diff --git a/src/render/Render_opengl.cpp b/src/render/Render_opengl.cpp
index b00307f5b9260c980f11e2ccdd27d3c64061bfa2..c8899c8db3bb7318126e2c684a0f47b14d7c09cd 100644
--- a/src/render/Render_opengl.cpp
+++ b/src/render/Render_opengl.cpp
@@ -65,7 +65,7 @@
 /* -- */
 #include "render/Ruler.hpp"
 #include "render/Render_opengl.hpp"
-#include "render/Render.hpp"
+#include "render/GanttDiagram.hpp"
 /* -- */
 #include "core/Core.hpp"
 
diff --git a/src/render/Render_opengl.hpp b/src/render/Render_opengl.hpp
index acce74575ee252dba616be1e831b264b549d612b..b9f9129c33d3a3463fc9fc22457a4948eaaf320b 100644
--- a/src/render/Render_opengl.hpp
+++ b/src/render/Render_opengl.hpp
@@ -65,7 +65,7 @@
 #include "render/Render_template.hpp"
 #include "render/Minimap.hpp"
 #include "render/Ruler.hpp"
-#include "render/Render.hpp"
+#include "render/GanttDiagram.hpp"
 
 struct Container_text_;
 /*template<typename T>