diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 84903cffea..d386184980 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -51,7 +51,7 @@
 
 EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId,
                                         const wxPoint& aPosition, const wxSize& aSize,
-                                        GalType aGalType ) :
+                                        GAL_TYPE aGalType ) :
     wxScrolledCanvas( aParentWindow, aWindowId, aPosition, aSize )
 {
     m_parent     = aParentWindow;
@@ -266,7 +266,7 @@ double EDA_DRAW_PANEL_GAL::GetLegacyZoom() const
 }
 
 
-bool EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType )
+bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
 {
     // Do not do anything if the currently used GAL is correct
     if( aGalType == m_backend && m_gal != NULL )
diff --git a/include/class_draw_panel_gal.h b/include/class_draw_panel_gal.h
index 84ca213a83..fc7ad8e35c 100644
--- a/include/class_draw_panel_gal.h
+++ b/include/class_draw_panel_gal.h
@@ -52,14 +52,14 @@ class PAINTER;
 class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas
 {
 public:
-    enum GalType {
+    enum GAL_TYPE {
         GAL_TYPE_NONE,      ///< Not used
         GAL_TYPE_OPENGL,    ///< OpenGL implementation
         GAL_TYPE_CAIRO,     ///< Cairo implementation
     };
 
     EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition,
-                        const wxSize& aSize, GalType aGalType = GAL_TYPE_OPENGL );
+                        const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL );
     ~EDA_DRAW_PANEL_GAL();
 
     /**
@@ -67,13 +67,13 @@ public:
      * Switches method of rendering graphics.
      * @param aGalType is a type of rendering engine that you want to use.
      */
-    bool SwitchBackend( GalType aGalType );
+    bool SwitchBackend( GAL_TYPE aGalType );
 
     /**
      * Function GetBackend
      * Returns the type of backend currently used by GAL canvas.
      */
-    inline GalType GetBackend() const
+    inline GAL_TYPE GetBackend() const
     {
         return m_backend;
     }
@@ -200,7 +200,7 @@ protected:
     KIGFX::WX_VIEW_CONTROLS* m_viewControls;
 
     /// Currently used GAL
-    GalType                  m_backend;
+    GAL_TYPE                 m_backend;
 
     /// Processes and forwards events to tools
     TOOL_DISPATCHER*         m_eventDispatcher;
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index 80a1628936..9038bcf742 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -99,7 +99,7 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
 
 PCB_DRAW_PANEL_GAL::PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId,
                                         const wxPoint& aPosition, const wxSize& aSize,
-                                        GalType aGalType ) :
+                                        GAL_TYPE aGalType ) :
 EDA_DRAW_PANEL_GAL( aParentWindow, aWindowId, aPosition, aSize, aGalType )
 {
     m_worksheet = NULL;
diff --git a/pcbnew/pcb_draw_panel_gal.h b/pcbnew/pcb_draw_panel_gal.h
index 2dabaab2bb..acbef12668 100644
--- a/pcbnew/pcb_draw_panel_gal.h
+++ b/pcbnew/pcb_draw_panel_gal.h
@@ -38,7 +38,7 @@ class PCB_DRAW_PANEL_GAL : public EDA_DRAW_PANEL_GAL
 {
 public:
     PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition,
-                        const wxSize& aSize, GalType aGalType = GAL_TYPE_OPENGL );
+                        const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL );
 
     virtual ~PCB_DRAW_PANEL_GAL();