diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
index d6f111dd9..289a1bff6 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl.cpp
@@ -1992,7 +1992,7 @@ void displayGLError(GLenum error)
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl.h b/code/nel/src/3d/driver/opengl3/driver_opengl.h
index 38c3ad534..253f3c629 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl.h
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl.h
@@ -1455,7 +1455,7 @@ private:
 };
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
index 424a1ad36..c355c4d3e 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.cpp
@@ -1234,7 +1234,7 @@ bool registerGlXExtensions(CGlExtensions &ext, Display *dpy, sint screen)
 #endif
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
index ec29c26e1..28d801b7e 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_extension.h
@@ -194,7 +194,7 @@ bool registerGlXExtensions(CGlExtensions &ext, Display *dpy, sint screen);
 void registerGlExtensions(CGlExtensions &ext);
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_inputs.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_inputs.cpp
index c13719758..b867bf534 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_inputs.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_inputs.cpp
@@ -1010,7 +1010,7 @@ bool CDriverGL3::convertBitmapToCursor(const NLMISC::CBitmap &bitmap, nlCursor &
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_light.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_light.cpp
index fbb4037b8..256bf50e8 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_light.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_light.cpp
@@ -208,7 +208,7 @@ void CDriverGL3::disableAllLights()
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_material.cpp
index 3fd6cb11d..0f9e0a135 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_material.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_material.cpp
@@ -1610,7 +1610,7 @@ void CDriverGL3::endWaterMultiPass()
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_matrix.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_matrix.cpp
index 4d6721fdc..bdadd1426 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_matrix.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_matrix.cpp
@@ -128,7 +128,7 @@ void CDriverGL3::setupModelMatrix(const CMatrix& mtx)
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp
index 04d00a677..34521c370 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_states.cpp
@@ -718,7 +718,7 @@ CDriverGLStates3::TCullMode CDriverGLStates3::getCullMode() const
 }
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_states.h b/code/nel/src/3d/driver/opengl3/driver_opengl_states.h
index 3bc29ebc8..2e6d83ee2 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_states.h
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_states.h
@@ -229,7 +229,7 @@ private:
 };
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
index 947582a55..5aa76d97a 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
@@ -1678,7 +1678,7 @@ bool CDriverGL3::getRenderTargetSize (uint32 &width, uint32 &height)
 // ***************************************************************************
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp
index 56ee8fea6..19dc12ef6 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex.cpp
@@ -512,7 +512,7 @@ void CIndexBufferInfo::setupIndexBuffer(CIndexBuffer &ib)
 // ***************************************************************************
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.cpp
index 4f5a12042..6b807c5ed 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.cpp
@@ -427,7 +427,7 @@ void CVertexBufferHard::invalidate()
 #endif
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.h b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.h
index a4bb94154..993ee1621 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.h
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_vertex_buffer_hard.h
@@ -180,7 +180,7 @@ public:
 };
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D
diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_window.cpp
index 704ab6068..17266a8e8 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_window.cpp
@@ -2873,7 +2873,7 @@ bool CDriverGL3::convertBitmapToIcon(const NLMISC::CBitmap &bitmap, std::vector<
 #endif
 
 #ifdef NL_STATIC
-} // NLDRIVERGL/ES
+} // NLDRIVERGL3
 #endif
 
 } // NL3D