diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84769a2b207ef71141b67c2b44f607beab944310..ef46f67ebf408bd62e05e6947e8e1bd6306319d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,12 +228,12 @@ IF(OTB_USE_VISU_GUI)
 	#-------------------------------
         # Display images using textures using video card acceleration
         #-------------------------------
-	OPTION(GL_USE_ACCEL "Use video card acceleration." ON)
-	MARK_AS_ADVANCED(GL_USE_ACCEL)
-	IF(GL_USE_ACCEL)
+	OPTION(OTB_GL_USE_ACCEL "Use video card acceleration." ON)
+	MARK_AS_ADVANCED(OTB_GL_USE_ACCEL)
+	IF(OTB_GL_USE_ACCEL)
           # Add compiler option 
-          ADD_DEFINITIONS(-DGL_USE_ACCEL)
-	ENDIF(GL_USE_ACCEL)
+          ADD_DEFINITIONS(-DOTB_GL_USE_ACCEL)
+	ENDIF(OTB_GL_USE_ACCEL)
 
 
 	
diff --git a/Code/Visu/otbImageWidgetBase.txx b/Code/Visu/otbImageWidgetBase.txx
index 2ba2db43ade313649b9c53d80d82e8669dda24eb..397740ec398582ef99b4d8ab25460c21d5a6961c 100644
--- a/Code/Visu/otbImageWidgetBase.txx
+++ b/Code/Visu/otbImageWidgetBase.txx
@@ -332,7 +332,7 @@ ImageWidgetBase<TPixel>
 
   glRasterPos2i(0,this->h());
 
-#ifndef GL_USE_ACCEL
+#ifndef OTB_GL_USE_ACCEL
   std::cout << "No accel" << std::endl;
   
   glPixelZoom(m_OpenGlIsotropicZoom ,-m_OpenGlIsotropicZoom);
@@ -345,6 +345,7 @@ ImageWidgetBase<TPixel>
 	       m_OpenGlBuffer);
 #else
   std::cout << "Accel" << std::endl;
+  
   glEnable(GL_TEXTURE_2D);
   glColor4f(1.0,1.0,1.0,0.0);
   GLuint texture;
@@ -371,7 +372,7 @@ ImageWidgetBase<TPixel>
  // if image overlay is activated, display image overlay
   if(m_ImageOverlayVisible)
     {
-#ifndef GL_USE_ACCEL
+#ifndef OTB_GL_USE_ACCEL
     glEnable(GL_BLEND);
     glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
     glDrawPixels(m_BufferedRegion.GetSize()[0],