diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index fa2f27173d..656589cbf1 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -675,13 +675,13 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     // client area at the current zoom level.
 
     // visible viewport in device units ~ pixels
-    wxSize clientSizeDU = m_canvas->GetClientSize();
+    wxSize  clientSizeDU = m_canvas->GetClientSize();
 
     // Size of the client window in IU
-    DSIZE clientSizeIU( clientSizeDU.x / scale, clientSizeDU.y / scale );
+    DSIZE   clientSizeIU( clientSizeDU.x / scale, clientSizeDU.y / scale );
 
     // Full drawing or "page" rectangle in internal units
-    DRECT pageRectIU( 0, 0, GetPageSizeIU().x, GetPageSizeIU().y );
+    DBOX    pageRectIU( 0, 0, GetPageSizeIU().x, GetPageSizeIU().y );
 
     // The upper left corner of the client rectangle in internal units.
     double xIU = aCenterPositionIU.x - clientSizeIU.x / 2.0;
@@ -695,8 +695,8 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
         yIU += pageRectIU.height / 2.0;
     }
 
-    DRECT clientRectIU( xIU, yIU, clientSizeIU.x, clientSizeIU.y );
-    DSIZE virtualSizeIU;
+    DBOX    clientRectIU( xIU, yIU, clientSizeIU.x, clientSizeIU.y );
+    DSIZE   virtualSizeIU;
 
     if( pageRectIU.GetLeft() < clientRectIU.GetLeft() && pageRectIU.GetRight() > clientRectIU.GetRight() )
     {
diff --git a/include/vector2d.h b/include/vector2d.h
index 6248b43a0d..71e37699c5 100644
--- a/include/vector2d.h
+++ b/include/vector2d.h
@@ -327,21 +327,21 @@ template<class T> bool const VECTOR2<T>::operator!=( VECTOR2<T> const& aVector )
 
 
 /**
- * Class RECT
- * is a description of a rectangle in cartesion coordinate system.
+ * Class BOX2
+ * is a description of a rectangle in a cartesion coordinate system.
  */
-template<class T> class RECT
+template<class T> class BOX2
 {
 public:
-    RECT() : x(0), y(0), width(0), height(0) {}
+    BOX2() : x(0), y(0), width(0), height(0) {}
 
-    RECT( T aX, T aY, T aWidth, T aHeight ):
+    BOX2( T aX, T aY, T aWidth, T aHeight ):
         x( aX ), y( aY ), width( aWidth ), height( aHeight )
     {}
 
 
     /// Copy constructor
-    RECT( const RECT<T>& aRect ) :
+    BOX2( const BOX2<T>& aRect ) :
         x( aRect.x ), y( aRect.y ), width( aRect.width ), height( aRect.height )
     {}
 
@@ -393,7 +393,7 @@ public:
 typedef VECTOR2<double>     DPOINT;
 typedef DPOINT              DSIZE;
 
-typedef RECT<double>        DRECT;
+typedef BOX2<double>        DBOX;
 
 
 #endif // VECTOR2D_H_