diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp
index 3b7a5b98e3..b6c1c4a620 100644
--- a/3d-viewer/3d_canvas.cpp
+++ b/3d-viewer/3d_canvas.cpp
@@ -489,9 +489,9 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
 }
 
 
-/**********************************************/
+/*****************************************************/
 void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event )
-/**********************************************/
+/*****************************************************/
 {
     int w, h;
     // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e4901c6605..ce825a39d9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,18 @@ KiCad ChangeLog 2009
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-apr-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+================================================================================
+++ALL:
+    Code clarification: There were 3 functions to display info:
+    - DisplayInfo (displaying a message info)
+    - class members DisplayInfo and Display_Infos doing the same thing
+      (and sometimes these 2 functions were existing in some classes)
+    This was *very* confusing and created minor bugs
+     (info in eeschema was not always displayed, because the "bad" function was used)
+    Now DisplayInfo is renamed DisplayInfoMessage
+    Ann class member DisplayInfo is used in all classes ( replaces all Display_Infos instances)
+
 2009-apr-12 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
 ================================================================================
 ++eeschema:
diff --git a/common/confirm.cpp b/common/confirm.cpp
index 8e35582b95..e1063d8daf 100644
--- a/common/confirm.cpp
+++ b/common/confirm.cpp
@@ -93,7 +93,7 @@ void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
 
 
 /**************************************************************************/
-void DisplayInfo( wxWindow* parent, const wxString& text, int displaytime )
+void DisplayInfoMessage( wxWindow* parent, const wxString& text, int displaytime )
 /**************************************************************************/
 
 /* Affiche un Message d'information.
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index 86720e08e4..f80ec8cb57 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -541,7 +541,7 @@ wxString& WinEDA_App::GetEditorName()
     }
     if( editorname.IsEmpty() ) // We must get a prefered editor name
     {
-        DisplayInfo( NULL, _( "No default editor found, you must choose it" ) );
+        DisplayInfoMessage( NULL, _( "No default editor found, you must choose it" ) );
         wxString mask( wxT( "*" ) );
 
 #ifdef __WINDOWS__
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 06f8fe2129..ecb208a7b4 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -332,7 +332,7 @@ void DisplayHotkeyList( WinEDA_DrawFrame* frame, struct Ki_HotkeyInfoSectionDesc
         }
     }
 
-    DisplayInfo( frame, msg );
+    DisplayInfoMessage( frame, msg );
 }
 
 
diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp
index 246715df44..1554163693 100644
--- a/cvpcb/displayframe.cpp
+++ b/cvpcb/displayframe.cpp
@@ -317,7 +317,7 @@ void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
-        DisplayInfo( this, _( "3D Frame already opened" ) );
+        DisplayInfoMessage( this, _( "3D Frame already opened" ) );
         return;
     }
 
diff --git a/cvpcb/setvisu.cpp b/cvpcb/setvisu.cpp
index ecef1e1ed3..415a5f7d59 100644
--- a/cvpcb/setvisu.cpp
+++ b/cvpcb/setvisu.cpp
@@ -95,7 +95,7 @@ void WinEDA_DisplayFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
 
     MODULE* Module = GetBoard()->m_Modules;
     if ( Module )
-        Module->Display_Infos( this );
+        Module->DisplayInfo( this );
     UpdateStatusBar();
     DrawPanel->Trace_Curseur( DC );
 }
diff --git a/eeschema/class_drawsheet.cpp b/eeschema/class_drawsheet.cpp
index 7302f3621e..aab12e4877 100644
--- a/eeschema/class_drawsheet.cpp
+++ b/eeschema/class_drawsheet.cpp
@@ -611,7 +611,7 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame* aFrame,
                        aFileName.GetData() );
             if( !IsOK( NULL, msg ) )
             {
-                DisplayInfo( NULL, _( "Sheet Filename Renaming Aborted" ) );
+                DisplayInfoMessage( (wxWindow*)NULL, _( "Sheet Filename Renaming Aborted" ) );
                 return false;
             }
         }
@@ -687,7 +687,7 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame* aFrame,
 
 
 /***********************************************************/
-void DrawSheetStruct::Display_Infos( WinEDA_DrawFrame* frame )
+void DrawSheetStruct::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     frame->MsgPanel->EraseMsgBox();
     Affiche_1_Parametre( frame, 1, _( "Name" ), m_SheetName, CYAN );
diff --git a/eeschema/class_drawsheet.h b/eeschema/class_drawsheet.h
index 16b45fb8d8..7e7d4a9b7a 100644
--- a/eeschema/class_drawsheet.h
+++ b/eeschema/class_drawsheet.h
@@ -105,7 +105,7 @@ public:
 
     void             Place( WinEDA_SchematicFrame* frame, wxDC* DC );
     DrawSheetStruct* GenCopy();
-    void             Display_Infos( WinEDA_DrawFrame* frame );
+    void             DisplayInfo( WinEDA_DrawFrame* frame );
 
     /** Function CleanupSheet
      * Delete pinsheets which are not corresponding to a hierarchal label
diff --git a/eeschema/class_pin.cpp b/eeschema/class_pin.cpp
index 2df86c6fe0..28cf63da65 100644
--- a/eeschema/class_pin.cpp
+++ b/eeschema/class_pin.cpp
@@ -1037,7 +1037,6 @@ void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame )
     }
 
     frame->MsgPanel->Affiche_1_Parametre( 62, _( "Orient" ), Text, MAGENTA );
-wxMessageBox(wxT("Pin!"));
 }
 
 
diff --git a/eeschema/component_class.cpp b/eeschema/component_class.cpp
index 2013050a5a..14cf141b17 100644
--- a/eeschema/component_class.cpp
+++ b/eeschema/component_class.cpp
@@ -836,7 +836,7 @@ int SCH_COMPONENT::GetRotationMiroir()
     int  type_rotate = CMP_ORIENT_0;
     int  ComponentMatOrient[2][2];
     int  ii;
-    
+
     #define ROTATE_VALUES_COUNT 12
     int rotate_value[ROTATE_VALUES_COUNT] =    // list of all possibilities, but only the first 8 are actually used
     {
@@ -1046,7 +1046,7 @@ EDA_Rect SCH_COMPONENT::GetBoundingBox()
 }
 
 
-void SCH_COMPONENT::Display_Infos( WinEDA_DrawFrame* frame )
+void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     EDA_LibComponentStruct* Entry = FindLibPart( m_ChipName.GetData(),
                                                  wxEmptyString, FIND_ROOT );
diff --git a/eeschema/component_class.h b/eeschema/component_class.h
index b41d20e1c7..cb5b4df479 100644
--- a/eeschema/component_class.h
+++ b/eeschema/component_class.h
@@ -184,7 +184,7 @@ public:
     int             GetRotationMiroir();
 
     wxPoint         GetScreenCoord( const wxPoint& coord );
-    void            Display_Infos( WinEDA_DrawFrame* frame );
+    void            DisplayInfo( WinEDA_DrawFrame* frame );
 
     /**
      * Suppress annotation ( i.i IC23 changed to IC? and part reset to 1)
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index cf64be5ebd..c8173b0a5f 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -77,9 +77,8 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( bool Include
 
     if( Pin )
     {
-
         /* Force display pin infos (the previous display could be a component info) */
-        Pin->Display_Infos( this );
+        Pin->DisplayInfo( this );
         if( LibItem )
             Affiche_1_Parametre( this, 1,
                                  LibItem->GetRef( GetSheet() ),
@@ -156,7 +155,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
         Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem );
         if( Pin )
         {
-            Pin->Display_Infos( this );
+            Pin->DisplayInfo( this );
             if( LibItem )
                 Affiche_1_Parametre( this, 1,
                                      LibItem->GetRef( GetSheet() ),
@@ -173,7 +172,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
     {
         SCH_CMP_FIELD* Field = (SCH_CMP_FIELD*) DrawStruct;
         LibItem = (SCH_COMPONENT*) Field->GetParent();
-        LibItem->Display_Infos( this );
+        LibItem->DisplayInfo( this );
 
         return DrawStruct;
     }
@@ -182,7 +181,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
     Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem );
     if( Pin )
     {
-        Pin->Display_Infos( this );
+        Pin->DisplayInfo( this );
         if( LibItem )
             Affiche_1_Parametre( this, 1,
                                  LibItem->GetRef( GetSheet() ),
@@ -197,14 +196,14 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
     {
         DrawStruct = LocateSmallestComponent( (SCH_SCREEN*) GetScreen() );
         LibItem    = (SCH_COMPONENT*) DrawStruct;
-        LibItem->Display_Infos( this );
+        LibItem->DisplayInfo( this );
         return DrawStruct;
     }
 
     DrawStruct = (SCH_ITEM*) PickStruct( refpoint, GetScreen(), SHEETITEM );
     if( DrawStruct )
     {
-        ( (DrawSheetStruct*) DrawStruct )->Display_Infos( this );
+        ( (DrawSheetStruct*) DrawStruct )->DisplayInfo( this );
         return DrawStruct;
     }
 
diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp
index 62ada9c33a..e5341ec535 100644
--- a/eeschema/edit_component_in_schematic.cpp
+++ b/eeschema/edit_component_in_schematic.cpp
@@ -108,7 +108,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_CMP_FIELD* Field, wxDC* DC )
         Entry = FindLibPart( Cmp->m_ChipName.GetData(), wxEmptyString, FIND_ROOT );
         if( Entry && (Entry->m_Options == ENTRY_POWER) )
         {
-            DisplayInfo( this,
+            DisplayInfoMessage( this,
                         _(
                             "Part is a POWER, value cannot be modified!\nYou must create a new power" )
                          );
@@ -170,7 +170,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_CMP_FIELD* Field, wxDC* DC )
     }
 
     Field->Draw( DrawPanel, DC, wxPoint(0,0), g_XorMode );
-    Cmp->Display_Infos( this );
+    Cmp->DisplayInfo( this );
     GetScreen()->SetModify();
 }
 
@@ -322,7 +322,7 @@ void WinEDA_SchematicFrame::EditComponentReference( SCH_COMPONENT* Cmp, wxDC* DC
                        Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
         GetScreen()->SetModify();
     }
-    Cmp->Display_Infos( this );
+    Cmp->DisplayInfo( this );
 }
 
 
@@ -360,7 +360,7 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
         GetScreen()->SetModify();
     }
 
-    Cmp->Display_Infos( this );
+    Cmp->DisplayInfo( this );
 }
 
 
@@ -415,6 +415,6 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
                    Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
     GetScreen()->SetModify();
 
-    Cmp->Display_Infos( this );
+    Cmp->DisplayInfo( this );
 }
 
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 8488ac63dc..58003aac91 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -197,7 +197,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
         Zoom_Automatique( FALSE );
         msg.Printf( _( "File <%s> not found." ),
             g_RootSheet->m_AssociatedScreen->m_FileName.GetData() );
-        DisplayInfo( this, msg, 0 );
+        DisplayInfoMessage( this, msg, 0 );
         return -1;
     }
 
diff --git a/eeschema/find.cpp b/eeschema/find.cpp
index 67eb708789..90a4fa4948 100644
--- a/eeschema/find.cpp
+++ b/eeschema/find.cpp
@@ -695,13 +695,13 @@ void WinEDA_FindFrame::LocatePartInLibs( wxCommandEvent& event )
             FindList.Empty();
             ExploreAllLibraries( Text, FindList );
             if( FindList.IsEmpty() )
-                DisplayInfo( this, _( "Nothing found" ) );
+                DisplayInfoMessage( this, _( "Nothing found" ) );
             else
-                DisplayInfo( this, FindList );
+                DisplayInfoMessage( this, FindList );
         }
     }
     else
-        DisplayInfo( this, FindList );
+        DisplayInfoMessage( this, FindList );
 
     Close();
 }
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index fa3cdb2fe2..05e045b614 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -234,7 +234,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC*           DC,
     DrawStructsInGhost( DrawPanel, DC, Component, 0, 0 );
 
     MsgPanel->EraseMsgBox();
-    Component->Display_Infos( this );
+    Component->DisplayInfo( this );
 
     return Component;
 }
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index 0d29815377..0d5090fae2 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -144,7 +144,7 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event )
     if( createLib && success )
     {
         msg = fn.GetFullPath() + _( " - OK" );
-        DisplayInfo( this, _( "Note: this new library will be available " \
+        DisplayInfoMessage( this, _( "Note: this new library will be available " \
                               "only if it is loaded by eeschema.\nModify "
                               "eeschema config if you want use it." ) );
     }
diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp
index 2c74751a58..7f4b2a6cf9 100644
--- a/eeschema/libframe.cpp
+++ b/eeschema/libframe.cpp
@@ -461,7 +461,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_LIBEDIT_CHECK_PART:
         if( CurrentLibEntry )
             if( TestPins( CurrentLibEntry ) == false )
-                DisplayInfo( this, _( " Pins Test OK!" ) );
+                DisplayInfoMessage( this, _( " Pins Test OK!" ) );
         break;
 
     case ID_DE_MORGAN_NORMAL_BUTT:
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 8745c25fe9..5878133ae4 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -93,7 +93,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen,
         MsgDiag = FullFileName + _( " was created by a more recent " \
                                     "version of EESchema and may not load " \
                                     "correctly. Please consider updating!" );
-        DisplayInfo( this, MsgDiag );
+        DisplayInfoMessage( this, MsgDiag );
     }
 
 #if 0
@@ -104,7 +104,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen,
                                     "EESchema. It will be stored in the new " \
                                     "file format when you save this file " \
                                     "again." );
-        DisplayInfo( this, MsgDiag );
+        DisplayInfoMessage( this, MsgDiag );
     }
 #endif
 
diff --git a/eeschema/netlist_control.cpp b/eeschema/netlist_control.cpp
index 25b836c12b..792c0bdcca 100644
--- a/eeschema/netlist_control.cpp
+++ b/eeschema/netlist_control.cpp
@@ -375,7 +375,7 @@ void WinEDA_NetlistFrame::SetupPluginData( wxCommandEvent& event )
     /* Get a title for this page */
     wxString title = CurrPage->m_TitleStringCtrl->GetValue();
     if( title.IsEmpty() )
-        DisplayInfo( this,
+        DisplayInfoMessage( this,
                     _( "Do not forget to choose a title for this netlist control page" ) );
 }
 
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index ccaa2a91d3..f73e7f8251 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -168,7 +168,7 @@ void SwapData( EDA_BaseStruct* Item )
 
         // not directly used in schematic:
     default:
-        DisplayInfo( NULL, wxT( "SwapData() error: unexpected type" ) );
+        DisplayInfoMessage( NULL, wxT( "SwapData() error: unexpected type" ) );
         break;
     }
 }
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 259f126ae0..80170854ac 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -41,7 +41,7 @@ void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
 
     if( no_used_layers )
     {
-        DisplayInfo( this, _( "None of the Gerber layers contain any data" ) );
+        DisplayInfoMessage( this, _( "None of the Gerber layers contain any data" ) );
         return;
     }
 
diff --git a/gerbview/locate.cpp b/gerbview/locate.cpp
index d838d53715..c7e5a0ed8a 100644
--- a/gerbview/locate.cpp
+++ b/gerbview/locate.cpp
@@ -63,7 +63,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
             TrackLocate = TrackLocate->Next();
         }
 
-        Track->Display_Infos( this );
+        Track->DisplayInfo( this );
         return Track;
     }
 
@@ -71,7 +71,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
     pt_texte_pcb = Locate_Texte_Pcb( (TEXTE_PCB*) GetBoard()->m_Drawings.GetFirst(), typeloc );
     if( pt_texte_pcb ) // texte type PCB localise
     {
-        pt_texte_pcb->Display_Infos( this );
+        pt_texte_pcb->DisplayInfo( this );
         return pt_texte_pcb;
     }
 
@@ -83,7 +83,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
     if( ( TrackLocate = Locate_Zone( GetBoard()->m_Zone,
                                     GetScreen()->m_Active_Layer, typeloc ) ) != NULL )
     {
-        TrackLocate->Display_Infos( this );
+        TrackLocate->DisplayInfo( this );
         return TrackLocate;
     }
 
diff --git a/include/base_struct.h b/include/base_struct.h
index 31745e9f42..c3cdd04347 100644
--- a/include/base_struct.h
+++ b/include/base_struct.h
@@ -324,12 +324,12 @@ public:
 
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    virtual void    Display_Infos( WinEDA_DrawFrame* frame )
+    virtual void    DisplayInfo( WinEDA_DrawFrame* frame )
     {
         // derived classes may implement this
     }
diff --git a/include/confirm.h b/include/confirm.h
index 1dd1bf5b05..40f729ccca 100644
--- a/include/confirm.h
+++ b/include/confirm.h
@@ -10,7 +10,7 @@
 
 
 void    DisplayError( wxWindow* parent, const wxString& msg, int displaytime = 0 );
-void    DisplayInfo( wxWindow* parent, const wxString& msg, int displaytime = 0 );
+void    DisplayInfoMessage( wxWindow* parent, const wxString& msg, int displaytime = 0 );
 
 /* Routines d'affichage messages ( disparait au bout de displaytime 0.1 secondes) */
 
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index 88a7dfed8d..e81d72b282 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -33,7 +33,7 @@ void WinEDA_MainFrame::CreateNewProject( const wxString PrjFullFileName )
 
     if( !wxFileName::FileExists( tmp ) )
     {
-        DisplayInfo( NULL, _( "Project template file <kicad.pro> not found " ) );
+        DisplayInfoMessage( NULL, _( "Project template file <kicad.pro> not found " ) );
         return;
     }
     else
diff --git a/pcbnew/attribut.cpp b/pcbnew/attribut.cpp
index eb6dba3437..2f57482aa3 100644
--- a/pcbnew/attribut.cpp
+++ b/pcbnew/attribut.cpp
@@ -29,7 +29,7 @@ void WinEDA_PcbFrame::Attribut_Segment( TRACK* track, wxDC* DC, bool Flag_On )
     track->SetState( SEGM_FIXE, Flag_On );
     track->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
     DrawPanel->CursorOn( DC );    // Display cursor shape
-    track->Display_Infos( this );
+    track->DisplayInfo( this );
 }
 
 
diff --git a/pcbnew/automove.cpp b/pcbnew/automove.cpp
index a855ec370b..e79b9aaef9 100644
--- a/pcbnew/automove.cpp
+++ b/pcbnew/automove.cpp
@@ -311,7 +311,7 @@ void WinEDA_PcbFrame::FixeModule( MODULE* Module, bool Fixe )
     {
         Module->SetLocked( Fixe );
 
-        Module->Display_Infos( this );
+        Module->DisplayInfo( this );
         GetScreen()->SetModify();
     }
     else
diff --git a/pcbnew/autoplac.cpp b/pcbnew/autoplac.cpp
index 115dba7100..b299f4b310 100644
--- a/pcbnew/autoplac.cpp
+++ b/pcbnew/autoplac.cpp
@@ -586,7 +586,7 @@ int WinEDA_PcbFrame::RecherchePlacementModule( MODULE* Module, wxDC* DC )
     int     Penalite;
     bool    TstOtherSide;
 
-    Module->Display_Infos( this );
+    Module->DisplayInfo( this );
 
     Build_PlacedPads_List( GetBoard() );
 
@@ -1125,7 +1125,7 @@ static MODULE* PickModule( WinEDA_PcbFrame* pcbframe, wxDC* DC )
             continue;
         pcbframe->GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK;
         adr_lowmem = buf_work;
-        (*pt_Dmod)->Display_Infos( pcbframe );
+        (*pt_Dmod)->DisplayInfo( pcbframe );
         pcbframe->build_ratsnest_module( DC, *pt_Dmod );
 
         /* calcul du nombre de chevelus externes */
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 39b6b1e452..73e1329827 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -260,7 +260,7 @@ void WinEDA_BasePcbFrame::SetCurItem( BOARD_ITEM* aItem )
 
     if( aItem )
     {
-        aItem->Display_Infos( this );
+        aItem->DisplayInfo( this );
 
 #if 0 && defined(DEBUG)
     aItem->Show( 0, std::cout );
@@ -272,7 +272,7 @@ void WinEDA_BasePcbFrame::SetCurItem( BOARD_ITEM* aItem )
         // we can use either of these two:
 
         //MsgPanel->EraseMsgBox();
-        m_Pcb->Display_Infos( this );       // show the BOARD stuff
+        m_Pcb->DisplayInfo( this );       // show the BOARD stuff
 
 #if 0 && defined(DEBUG)
         std::cout << "SetCurItem(NULL)\n";
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 4dad69875e..6fef91d871 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -500,7 +500,7 @@ bool BOARD::ComputeBoundaryBox()
 
 
 // virtual, see pcbstruct.h
-void BOARD::Display_Infos( WinEDA_DrawFrame* frame )
+void BOARD::DisplayInfo( WinEDA_DrawFrame* frame )
 {
 /* Affiche l'etat du PCB : nb de pads, nets , connexions.. */
 #define POS_AFF_NBPADS      1
diff --git a/pcbnew/class_board.h b/pcbnew/class_board.h
index 81b14633c6..8bf483b9d5 100644
--- a/pcbnew/class_board.h
+++ b/pcbnew/class_board.h
@@ -252,13 +252,13 @@ public:
 
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
     void Draw( WinEDA_DrawPanel* panel, wxDC* DC,
                       int aDrawMode, const wxPoint& offset = ZeroOffset );
diff --git a/pcbnew/class_cotation.cpp b/pcbnew/class_cotation.cpp
index b1d219ff75..2fd6c90f74 100644
--- a/pcbnew/class_cotation.cpp
+++ b/pcbnew/class_cotation.cpp
@@ -461,10 +461,10 @@ void COTATION::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
 
 // see class_cotation.h
-void COTATION::Display_Infos( WinEDA_DrawFrame* frame )
+void COTATION::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     // for now, display only the text within the COTATION using class TEXTE_PCB.
-    m_Text->Display_Infos( frame );
+    m_Text->DisplayInfo( frame );
 }
 
 
diff --git a/pcbnew/class_cotation.h b/pcbnew/class_cotation.h
index 6a1ee023df..3620a4120e 100644
--- a/pcbnew/class_cotation.h
+++ b/pcbnew/class_cotation.h
@@ -79,13 +79,13 @@ public:
     void    Mirror(const wxPoint& axis_pos);
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
     /**
      * Function HitTest
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index d4c16b872e..332473f8e7 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -255,7 +255,7 @@ void DRAWSEGMENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
 
 // see pcbstruct.h
-void DRAWSEGMENT::Display_Infos( WinEDA_DrawFrame* frame )
+void DRAWSEGMENT::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     int      itype;
     wxString msg;
diff --git a/pcbnew/class_drawsegment.h b/pcbnew/class_drawsegment.h
index c520cb8bcd..ee96c51d6e 100644
--- a/pcbnew/class_drawsegment.h
+++ b/pcbnew/class_drawsegment.h
@@ -64,13 +64,13 @@ public:
                       int aDrawMode, const wxPoint& offset = ZeroOffset );
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_BasePcbFrame in which to print status information.
      */
-    virtual void    Display_Infos( WinEDA_DrawFrame* frame );
+    virtual void    DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index ee2f5ef4af..6197f069a3 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -217,7 +217,7 @@ void EDGE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
 
 // see class_edge_mod.h
-void EDGE_MODULE::Display_Infos( WinEDA_DrawFrame* frame )
+void EDGE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString bufcar;
 
diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h
index 5eb9d7c0ba..9e21c091f9 100644
--- a/pcbnew/class_edge_mod.h
+++ b/pcbnew/class_edge_mod.h
@@ -64,13 +64,13 @@ public:
     void    Draw3D( Pcb3D_GLCanvas* glcanvas );
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_marker.cpp b/pcbnew/class_marker.cpp
index 7c4cb31fee..f466787110 100644
--- a/pcbnew/class_marker.cpp
+++ b/pcbnew/class_marker.cpp
@@ -122,7 +122,7 @@ void MARKER::UnLink()
 }
 
 
-void MARKER::Display_Infos( WinEDA_DrawFrame* frame )
+void MARKER::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     int      text_pos;
 
diff --git a/pcbnew/class_marker.h b/pcbnew/class_marker.h
index 990a48b7e4..7e3237002f 100644
--- a/pcbnew/class_marker.h
+++ b/pcbnew/class_marker.h
@@ -113,12 +113,12 @@ public:
 
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index ac834421c3..f8cb481a60 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -896,7 +896,7 @@ EDA_Rect MODULE::GetBoundingBox()
 
 
 /*******************************************************/
-void MODULE::Display_Infos( WinEDA_DrawFrame* frame )
+void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
 /*******************************************************/
 /* Virtual function, from EDA_BaseStruct.
  * display module info on MsgPanel
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index 9cbfd729c9..f44f7c363a 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -190,12 +190,12 @@ public:
                        const wxPoint& offset, int dim_ancre, int draw_mode );
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 3f06691b6a..c99e704b8b 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -430,7 +430,7 @@ out:
 
 
 /******************************************************/
-void D_PAD::Display_Infos( WinEDA_DrawFrame* frame )
+void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
 /******************************************************/
 /* Affiche en bas d'ecran les caract de la pastille demandee */
 {
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index 7900c6c86b..d1f6064236 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -150,13 +150,13 @@ public:
 
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void Display_Infos( WinEDA_DrawFrame* frame );
+    void DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index aa3e815403..7e97fbc31f 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -157,7 +157,7 @@ void TEXTE_PCB::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
 
 // see class_pcb_text.h
-void TEXTE_PCB::Display_Infos( WinEDA_DrawFrame* frame )
+void TEXTE_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString msg;
 
diff --git a/pcbnew/class_pcb_text.h b/pcbnew/class_pcb_text.h
index 2cf92f9622..df4e9806b2 100644
--- a/pcbnew/class_pcb_text.h
+++ b/pcbnew/class_pcb_text.h
@@ -41,13 +41,13 @@ public:
     bool Save( FILE* aFile ) const;
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void    Display_Infos( WinEDA_DrawFrame* frame );
+    void    DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 000a8e5864..19ca86c939 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -444,7 +444,7 @@ int TEXTE_MODULE::GetDrawRotation()
 
 
 // see class_text_mod.h
-void TEXTE_MODULE::Display_Infos( WinEDA_DrawFrame* frame )
+void TEXTE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString msg, Line;
     int      ii;
diff --git a/pcbnew/class_text_mod.h b/pcbnew/class_text_mod.h
index a5b0cd4d96..08e2f5b8ca 100644
--- a/pcbnew/class_text_mod.h
+++ b/pcbnew/class_text_mod.h
@@ -92,13 +92,13 @@ public:
 
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void Display_Infos( WinEDA_DrawFrame* frame );
+    void DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index a1595507d5..0a15510954 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -842,7 +842,7 @@ void SEGVIA::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoi
 
 
 // see class_track.h
-void TRACK::Display_Infos( WinEDA_DrawFrame* frame )
+void TRACK::DisplayInfo( WinEDA_DrawFrame* frame )
 {
     wxString msg;
     int      text_pos;
diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h
index 5dd731077b..82cd84d2ba 100644
--- a/pcbnew/class_track.h
+++ b/pcbnew/class_track.h
@@ -164,13 +164,13 @@ public:
     bool            IsNull();
 
     /**
-     * Function Display_Infos
+     * Function DisplayInfo
      * has knowledge about the frame and how and where to put status information
      * about this object into the frame's message panel.
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void            Display_Infos( WinEDA_DrawFrame* frame );
+    void            DisplayInfo( WinEDA_DrawFrame* frame );
 
 
     /**
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index d2fa1a4496..7842cc3615 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -856,7 +856,7 @@ bool ZONE_CONTAINER::HitTestFilledArea( const wxPoint& aRefPos )
 
 
 /************************************************************/
-void ZONE_CONTAINER::Display_Infos( WinEDA_DrawFrame* frame )
+void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
 /************************************************************/
 {
     wxString msg;
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index 826c6e2d7f..cb61028f22 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -65,7 +65,7 @@ public:
      */
     void Copy( ZONE_CONTAINER* src );
 
-    void Display_Infos( WinEDA_DrawFrame* frame );
+    void DisplayInfo( WinEDA_DrawFrame* frame );
 
     /**
      * Function Draw
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index 11e1f33815..623599cc06 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -203,7 +203,7 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
          */
 
         // this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection()
-        // and it calls SetCurItem() which in turn calls Display_Infos() on the item.
+        // and it calls SetCurItem() which in turn calls DisplayInfo() on the item.
         DrawPanel->m_AbortRequest = true;   // changed in false if an item
         PopupMenu( &itemMenu ); // m_AbortRequest = false if an item is selected
 
diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp
index 0924600d88..2aa29af4df 100644
--- a/pcbnew/deltrack.cpp
+++ b/pcbnew/deltrack.cpp
@@ -11,10 +11,6 @@
 #include "pcbnew.h"
 #include "protos.h"
 
-/* Routines Locales */
-
-/* Variables locales */
-
 
 /***************************************************************/
 TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack )
@@ -116,7 +112,7 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack )
     GetScreen()->SetModify();
 
     test_1_net_connexion( DC, current_net_code );
-    GetBoard()->Display_Infos( this );
+    GetBoard()->DisplayInfo( this );
     return NULL;
 }
 
@@ -163,7 +159,7 @@ void WinEDA_PcbFrame::Delete_net( wxDC* DC, TRACK* aTrack )
         SaveItemEfface( trackList, ii );
         GetScreen()->SetModify();
         test_1_net_connexion( DC, net_code_delete );
-        GetBoard()->Display_Infos( this );
+        GetBoard()->DisplayInfo( this );
     }
 }
 
diff --git a/pcbnew/dialog_graphic_item_properties.cpp b/pcbnew/dialog_graphic_item_properties.cpp
index de114908fa..18debc8efa 100644
--- a/pcbnew/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialog_graphic_item_properties.cpp
@@ -213,7 +213,7 @@ void DialogGraphicItemProperties::OnOkClick( wxCommandEvent& event )
     m_Parent->GetScreen()->SetModify();
     if ( m_DC )
         m_Item->Draw( m_Parent->DrawPanel, m_DC, GR_OR );
-    m_Item->Display_Infos( m_Parent );
+    m_Item->DisplayInfo( m_Parent );
 
     Close( TRUE );
 }
diff --git a/pcbnew/dialog_pad_properties.cpp b/pcbnew/dialog_pad_properties.cpp
index 2c6b07849e..b40ec373e5 100644
--- a/pcbnew/dialog_pad_properties.cpp
+++ b/pcbnew/dialog_pad_properties.cpp
@@ -576,7 +576,7 @@ void DialogPadProperties::PadPropertiesAccept( wxCommandEvent& event )
         m_CurrentPad->ComputeRayon();
 
         Module->Set_Rectangle_Encadrement();
-        m_CurrentPad->Display_Infos( m_Parent );
+        m_CurrentPad->DisplayInfo( m_Parent );
         if( m_DC )  // redraw the area where the pad was
             m_Parent->DrawPanel->PostDirtyRect( m_CurrentPad->GetBoundingBox() );
         m_Parent->GetScreen()->SetModify();
diff --git a/pcbnew/dialog_print_using_printer.cpp b/pcbnew/dialog_print_using_printer.cpp
index 9457a78c37..8114e15556 100644
--- a/pcbnew/dialog_print_using_printer.cpp
+++ b/pcbnew/dialog_print_using_printer.cpp
@@ -643,11 +643,11 @@ void EDA_Printout::DrawPage()
     scale  = wxMax( scaleX, scaleY ) / userscale; // Use x or y scaling factor, whichever fits on the DC
 
     if( m_PrintFrame->m_XScaleAdjust > MAX_SCALE || m_PrintFrame->m_YScaleAdjust > MAX_SCALE )
-        DisplayInfo( NULL, _( "Warning: Scale option set to a very large value" ) );
+        DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very large value" ) );
 
     // Test for a reasonnable scale value
     if( m_PrintFrame->m_XScaleAdjust < MIN_SCALE || m_PrintFrame->m_YScaleAdjust < MIN_SCALE )
-        DisplayInfo( NULL, _( "Warning: Scale option set to a very small value" ) );
+        DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very small value" ) );
 
     // ajust the real draw scale
     double accurate_Xscale, accurate_Yscale;
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 9eee93fbc7..942b713d3c 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -151,7 +151,7 @@ int DRC::Drc( TRACK* aRefSegm, TRACK* aList )
     {
         wxASSERT( m_currentMarker );
 
-        m_currentMarker->Display_Infos( m_mainWindow );
+        m_currentMarker->DisplayInfo( m_mainWindow );
         return BAD_DRC;
     }
 
@@ -179,7 +179,7 @@ int DRC::Drc( ZONE_CONTAINER* aArea, int CornerIndex )
     if( !doEdgeZoneDrc( aArea, CornerIndex ) )
     {
         wxASSERT( m_currentMarker );
-        m_currentMarker->Display_Infos( m_mainWindow );
+        m_currentMarker->DisplayInfo( m_mainWindow );
         return BAD_DRC;
     }
 
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index b1a6798109..d28884df1d 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -270,7 +270,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_PCB_ZONES_BUTT:
         SetToolID( id, wxCURSOR_PENCIL, _( "Add Zones" ) );
         if( DisplayOpt.DisplayZonesMode != 0 )
-            DisplayInfo( this, _( "Warning: Display Zone is OFF!!!" ) );
+            DisplayInfoMessage( this, _( "Warning: Display Zone is OFF!!!" ) );
         if( !g_HightLigt_Status && (g_HightLigth_NetCode > 0 ) )
             Hight_Light( &dc );
         break;
@@ -1128,7 +1128,7 @@ void WinEDA_PcbFrame::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
         Remove_Zone_Corner( DC, (ZONE_CONTAINER*) Item );
         SetCurItem( NULL );
         break;
-    
+
     case TYPE_ZONE_CONTAINER:
         {
         SetCurItem( NULL );
@@ -1136,7 +1136,7 @@ void WinEDA_PcbFrame::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
         Delete_Zone_Contour( DC, (ZONE_CONTAINER*) Item );
         test_1_net_connexion( NULL, netcode );
         }
-        break;   
+        break;
 
     case TYPE_MARKER:
         if( Item == GetCurItem() )
diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp
index 0429db072b..ab456162dd 100644
--- a/pcbnew/edit_pcb_text.cpp
+++ b/pcbnew/edit_pcb_text.cpp
@@ -77,7 +77,7 @@ void WinEDA_PcbFrame::StartMoveTextePcb( TEXTE_PCB* TextePcb, wxDC* DC )
     old_pos = TextePcb->m_Pos;
     TextePcb->Draw( DrawPanel, DC, GR_XOR );
     TextePcb->m_Flags |= IS_MOVED;
-    TextePcb->Display_Infos( this );
+    TextePcb->DisplayInfo( this );
     DrawPanel->ManageCurseur = Move_Texte_Pcb;
     DrawPanel->ForceCloseManageCurseur = Abort_Edit_Pcb_Text;
     SetCurItem( TextePcb );
@@ -181,7 +181,7 @@ void WinEDA_PcbFrame::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC )
 
     /* Redessin du Texte */
     TextePcb->Draw( DrawPanel, DC, drawmode );
-    TextePcb->Display_Infos( this );
+    TextePcb->DisplayInfo( this );
 
     GetScreen()->SetModify();
 }
diff --git a/pcbnew/editedge.cpp b/pcbnew/editedge.cpp
index 4f9845235e..3913be71bc 100644
--- a/pcbnew/editedge.cpp
+++ b/pcbnew/editedge.cpp
@@ -34,7 +34,7 @@ void WinEDA_PcbFrame::Start_Move_DrawItem( DRAWSEGMENT* drawitem, wxDC* DC )
     drawitem->Draw( DrawPanel, DC, GR_XOR );
     drawitem->m_Flags |= IS_MOVED;
     cursor_pos = cursor_pos0 = GetScreen()->m_Curseur;
-    drawitem->Display_Infos( this );
+    drawitem->DisplayInfo( this );
     DrawPanel->ManageCurseur = Move_Segment;
     DrawPanel->ForceCloseManageCurseur = Exit_EditEdge;
     SetCurItem( drawitem );
diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp
index 2d3b9a50e3..e8aaaf4dfc 100644
--- a/pcbnew/editrack-part2.cpp
+++ b/pcbnew/editrack-part2.cpp
@@ -149,7 +149,7 @@ void WinEDA_PcbFrame::ExChange_Track_Layer( TRACK* pt_segm, wxDC* DC )
     }
 
     test_1_net_connexion( DC, pt_track->GetNet() );
-    pt_track->Display_Infos( this );
+    pt_track->DisplayInfo( this );
     GetScreen()->SetModify();
 }
 
@@ -264,7 +264,7 @@ bool WinEDA_PcbFrame::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
 
         // use the form of SetCurItem() which does not write to the msg panel,
         // SCREEN::SetCurItem(), so the DRC error remains on screen.
-        // WinEDA_PcbFrame::SetCurItem() calls Display_Infos().
+        // WinEDA_PcbFrame::SetCurItem() calls DisplayInfo().
         GetScreen()->SetCurItem( g_CurrentTrackSegment );
 
         return false;
@@ -305,7 +305,7 @@ bool WinEDA_PcbFrame::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
     }
 
     DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
-    via->Display_Infos( this );
+    via->DisplayInfo( this );
 
     UpdateStatusBar();
 
@@ -329,7 +329,7 @@ void WinEDA_PcbFrame::Affiche_Status_Net( wxDC* DC )
 
     pt_segm = Locate_Pistes( GetBoard()->m_Track, masquelayer, CURSEUR_OFF_GRILLE );
     if( pt_segm == NULL )
-        GetBoard()->Display_Infos( this );
+        GetBoard()->DisplayInfo( this );
     else
         test_1_net_connexion( DC, pt_segm->GetNet() );
 }
@@ -368,7 +368,7 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
 
         if( pt_pad ) /* Affichage du chevelu du net correspondant */
         {
-            pt_pad->Display_Infos( this );
+            pt_pad->DisplayInfo( this );
             pt_chevelu = (CHEVELU*) GetBoard()->m_Ratsnest;
             for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
             {
@@ -404,7 +404,7 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
 
             if( Module )
             {
-                Module->Display_Infos( this );
+                Module->DisplayInfo( this );
                 pt_pad = Module->m_Pads;
                 for( ; pt_pad != NULL; pt_pad = (D_PAD*) pt_pad->Next() )
                 {
diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp
index e940849bbe..1d85479efc 100644
--- a/pcbnew/editrack.cpp
+++ b/pcbnew/editrack.cpp
@@ -186,7 +186,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
 
         D( g_CurrentTrackList.VerifyListIntegrity(); );
 
-        g_CurrentTrackSegment->Display_Infos( this );
+        g_CurrentTrackSegment->DisplayInfo( this );
         SetCurItem( g_CurrentTrackSegment );
         DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
 
@@ -271,7 +271,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
             /* Show the new position */
             ShowNewTrackWhenMovingCursor( DrawPanel, DC, FALSE );
         }
-        g_CurrentTrackSegment->Display_Infos( this );
+        g_CurrentTrackSegment->DisplayInfo( this );
     }
 
     SetCurItem( g_CurrentTrackSegment );
@@ -518,7 +518,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
         test_1_net_connexion( DC, netcode );
 
         GetScreen()->SetModify();
-        GetBoard()->Display_Infos( this );
+        GetBoard()->DisplayInfo( this );
     }
 
     wxASSERT( g_FirstTrackSegment==NULL );
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index 9c523defb2..1994910e2a 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -54,7 +54,7 @@ TEXTE_MODULE* WinEDA_BasePcbFrame::CreateTextModule( MODULE* Module, wxDC* DC )
     Text->m_Flags = 0;
     Text->Draw( DrawPanel, DC, GR_OR );
 
-    Text->Display_Infos( this );
+    Text->DisplayInfo( this );
 
     return Text;
 }
@@ -80,7 +80,7 @@ void WinEDA_BasePcbFrame::RotateTextModule( TEXTE_MODULE* Text, wxDC* DC )
     /* Redessin du Texte */
     Text->Draw( DrawPanel, DC, GR_XOR, MoveVector );
 
-    Text->Display_Infos( this );
+    Text->DisplayInfo( this );
 
     module->m_LastEdit_Time = time( NULL );
     GetScreen()->SetModify();
@@ -173,7 +173,7 @@ void WinEDA_BasePcbFrame::StartMoveTexteModule( TEXTE_MODULE* Text, wxDC* DC )
 
     CursorInitialPosition = Text->m_Pos;
 
-    Text->Display_Infos( this );
+    Text->DisplayInfo( this );
 
     SetCurItem( Text );
     DrawPanel->ManageCurseur = Show_MoveTexte_Module;
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 2f06d84395..594ced7977 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -83,7 +83,7 @@ void WinEDA_PcbFrame::Files_io( wxCommandEvent& event )
         if( !fn.FileExists() )
         {
             msg = _( "Recovery file " ) + fn.GetFullPath() + _( " not found" );
-            DisplayInfo( this, msg );
+            DisplayInfoMessage( this, msg );
             break;
         }
         else
@@ -215,11 +215,11 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
     sscanf(cbuf, "PCBNEW-BOARD Version %d date", &ver );
     if ( ver > g_CurrentVersionPCB )
     {
-        DisplayInfo( this, _( "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"));
+        DisplayInfoMessage( this, _( "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"));
     }
     else if ( ver < g_CurrentVersionPCB )
     {
-        DisplayInfo( this, _( "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."));
+        DisplayInfoMessage( this, _( "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."));
     }
 
     // Reload the corresponding configuration file:
@@ -264,7 +264,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
     /* Rebuild the new pad list (for drc and ratsnet control ...) */
     build_liste_pads();
 
-    GetBoard()->Display_Infos( this );
+    GetBoard()->DisplayInfo( this );
     DrawPanel->Refresh( true);
 
     /* reset the auto save timer */
diff --git a/pcbnew/gen_drill_report_files.cpp b/pcbnew/gen_drill_report_files.cpp
index 1ac35d506a..8a233da0e8 100644
--- a/pcbnew/gen_drill_report_files.cpp
+++ b/pcbnew/gen_drill_report_files.cpp
@@ -387,7 +387,7 @@ void Gen_Drill_PcbMap( BOARD* aPcb, FILE* aFile,
     /* create the drill list */
     if( aToolListBuffer.size() > 13 )
     {
-        DisplayInfo( NULL,
+        DisplayInfoMessage( NULL,
                      _(
                          " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\nPlot uses circle shape for some drill values" ),
                      10 );
diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp
index 94c00e36f4..a397032928 100644
--- a/pcbnew/gen_modules_placefile.cpp
+++ b/pcbnew/gen_modules_placefile.cpp
@@ -281,7 +281,7 @@ void WinEDA_PcbFrame::GenModulesPosition( wxCommandEvent& event )
         msg += wxT("\n\n") + backLayerName + wxT( " File: " ) +
             fnBack.GetFullPath();
 
-    DisplayInfo( this, msg );
+    DisplayInfoMessage( this, msg );
 
 
 exit:   // the only safe way out of here, no returns please.
diff --git a/pcbnew/globaleditpad.cpp b/pcbnew/globaleditpad.cpp
index 30bc67fd4f..347b8d2218 100644
--- a/pcbnew/globaleditpad.cpp
+++ b/pcbnew/globaleditpad.cpp
@@ -230,7 +230,7 @@ void WinEDA_BasePcbFrame::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw )
 
     wxString ref_name_module = Module->m_LibRef;
 
-    Module->Display_Infos( this );
+    Module->DisplayInfo( this );
 
     WinEDA_PadGlobalEditFrame* frame = new WinEDA_PadGlobalEditFrame( this, aPad );
 
@@ -257,7 +257,7 @@ void WinEDA_BasePcbFrame::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw )
         if( ref_name_module != Module->m_LibRef )
             continue;
 
-        Module->Display_Infos( this );
+        Module->DisplayInfo( this );
 
         /* Effacement du module */
         if ( aDraw )
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index 932e893730..d917945846 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -438,7 +438,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
         {
             SetCurItem( module );
             module->SetLocked( !module->IsLocked() );
-            module->Display_Infos( this );
+            module->DisplayInfo( this );
         }
         break;
 
@@ -471,7 +471,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
                         msg.Printf( _( "Footprint %s found, but locked" ),
                                    module->m_Reference->m_Text.GetData() );
 
-                        DisplayInfo( this, msg );
+                        DisplayInfoMessage( this, msg );
                     }
                     module = NULL;
                 }
@@ -522,7 +522,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
             break;
         }
 
-        module->Display_Infos( this );
+        module->DisplayInfo( this );
         break;
     }
 }
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 2746d0ea5e..c9417dc3e4 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -129,7 +129,7 @@ MODULE* WinEDA_ModuleEditFrame::Import_Module( wxDC* DC )
     GetBoard()->Add( module );
 
     /* Display info : */
-    module->Display_Infos( this );
+    module->DisplayInfo( this );
     Place_Module( module, DC );
     GetBoard()->m_Status_Pcb = 0;
     build_liste_pads();
@@ -208,7 +208,7 @@ void WinEDA_ModuleEditFrame::Export_Module( MODULE* ptmod, bool createlib )
     fputs( "$EndLIBRARY\n", file );
     fclose( file );
     msg.Printf( _( "Module exported in file <%s>" ), fn.GetFullPath().c_str() );
-    DisplayInfo( this, msg );
+    DisplayInfoMessage( this, msg );
 }
 
 
@@ -406,7 +406,7 @@ void WinEDA_BasePcbFrame::Archive_Modules( const wxString& LibName,
 
     if( GetBoard()->m_Modules == NULL )
     {
-        DisplayInfo( this, _( " No modules to archive!" ) );
+        DisplayInfoMessage( this, _( " No modules to archive!" ) );
         return;
     }
 
@@ -505,7 +505,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
     FILE*      lib_module, * dest;
     bool       added = true;
 
-    aModule->Display_Infos( this );
+    aModule->DisplayInfo( this );
 
     if( !wxFileExists( aLibName ) )
     {
@@ -721,7 +721,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
     {
         if( Get_Message( _( "Module Reference:" ), _( "Module Creation" ), Line, this ) != 0 )
         {
-            DisplayInfo( this, _( "No reference, aborted" ) );
+            DisplayInfoMessage( this, _( "No reference, aborted" ) );
             return NULL;
         }
     }
@@ -755,7 +755,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
 
     Module->SetPosition( wxPoint( 0, 0 ) );
 
-    Module->Display_Infos( this );
+    Module->DisplayInfo( this );
     return Module;
 }
 
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index ff21f2cca9..92d7464f13 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -101,7 +101,7 @@ BOARD_ITEM* WinEDA_ModuleEditFrame::ModeditLocateAndDisplay( int aHotKeyCode )
         }
 
         // this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection()
-        // and it calls SetCurItem() which in turn calls Display_Infos() on the item.
+        // and it calls SetCurItem() which in turn calls DisplayInfo() on the item.
         DrawPanel->m_AbortRequest = true;   // changed in false if an item
         PopupMenu( &itemMenu );             // m_AbortRequest = false if an item is selected
 
@@ -115,7 +115,7 @@ BOARD_ITEM* WinEDA_ModuleEditFrame::ModeditLocateAndDisplay( int aHotKeyCode )
 
     if( item )
     {
-        item->Display_Infos( this );
+        item->DisplayInfo( this );
     }
 
     return item;
@@ -780,7 +780,7 @@ void WinEDA_ModuleEditFrame::Transform( MODULE* module, wxDC* DC, int transform
     case ID_MODEDIT_MODULE_SCALE:
     case ID_MODEDIT_MODULE_SCALEX:
     case ID_MODEDIT_MODULE_SCALEY:
-        DisplayInfo( this, wxT( "Not availlable" ) );
+        DisplayInfoMessage( this, wxT( "Not availlable" ) );
         break;
     }
 
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 789ab56e89..7a04091bcf 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -388,7 +388,7 @@ void WinEDA_ModuleEditFrame::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
-        DisplayInfo( this, _( "3D Frame already opened" ) );
+        DisplayInfoMessage( this, _( "3D Frame already opened" ) );
         return;
     }
 
diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp
index 5ab122ea3f..3cc68f3c0f 100644
--- a/pcbnew/modules.cpp
+++ b/pcbnew/modules.cpp
@@ -252,7 +252,7 @@ MODULE* WinEDA_BasePcbFrame::Copie_Module( MODULE* module )
 
     build_liste_pads();
 
-    newmodule->Display_Infos( this );
+    newmodule->DisplayInfo( this );
     GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK;
     return newmodule;
 }
@@ -304,7 +304,7 @@ bool WinEDA_PcbFrame::Delete_Module( MODULE* module, wxDC* DC, bool aAskBeforeDe
         return FALSE;
 
     /* Confirmation de l'effacement */
-    module->Display_Infos( this );
+    module->DisplayInfo( this );
 
     if( aAskBeforeDeleting )
     {
@@ -521,7 +521,7 @@ void BOARD::Change_Side_Module( MODULE* Module, wxDC* DC )
     Module->Set_Rectangle_Encadrement();
 
     if( m_PcbFrame )
-        Module->Display_Infos( m_PcbFrame );
+        Module->DisplayInfo( m_PcbFrame );
 
     if( !(Module->m_Flags & IS_MOVED) ) /* Inversion simple */
     {
@@ -698,7 +698,7 @@ void WinEDA_BasePcbFrame::Place_Module( MODULE* module, wxDC* DC )
     /* affichage chevelu general si necessaire */
     ReCompile_Ratsnest_After_Changes( DC );
 
-    module->Display_Infos( this );
+    module->DisplayInfo( this );
 
     DrawPanel->ManageCurseur = NULL;
     DrawPanel->ForceCloseManageCurseur = NULL;
@@ -757,7 +757,7 @@ void WinEDA_BasePcbFrame::Rotate_Module( wxDC* DC, MODULE* module,
     else
         module->SetOrientation( angle );
 
-    module->Display_Infos( this );
+    module->DisplayInfo( this );
 
     if( DC )
     {
diff --git a/pcbnew/move-drag_pads.cpp b/pcbnew/move-drag_pads.cpp
index acb4e5fd1c..4e89c8b882 100644
--- a/pcbnew/move-drag_pads.cpp
+++ b/pcbnew/move-drag_pads.cpp
@@ -116,7 +116,7 @@ void WinEDA_BasePcbFrame::Export_Pad_Settings( D_PAD* pt_pad )
 
     Module = (MODULE*) pt_pad->GetParent();
 
-    pt_pad->Display_Infos( this );
+    pt_pad->DisplayInfo( this );
 
     g_Pad_Master.m_PadShape     = pt_pad->m_PadShape;
     g_Pad_Master.m_Attribut     = pt_pad->m_Attribut;
@@ -236,7 +236,7 @@ void WinEDA_BasePcbFrame::AddPad( MODULE* Module, bool draw )
 
     /* Redessin du module */
     Module->Set_Rectangle_Encadrement();
-    Pad->Display_Infos( this );
+    Pad->DisplayInfo( this );
     if ( draw )
         DrawPanel->PostDirtyRect( Module->GetBoundingBox() );
 }
@@ -287,7 +287,7 @@ void WinEDA_BasePcbFrame::StartMovePad( D_PAD* Pad, wxDC* DC )
 
     s_CurrentSelectedPad = Pad;
     Pad_OldPos = Pad->m_Pos;
-    Pad->Display_Infos( this );
+    Pad->DisplayInfo( this );
     DrawPanel->ManageCurseur = Show_Pad_Move;
     DrawPanel->ForceCloseManageCurseur = Exit_Move_Pad;
 
@@ -390,6 +390,6 @@ void WinEDA_BasePcbFrame::RotatePad( D_PAD* Pad, wxDC* DC )
 
     Module->Set_Rectangle_Encadrement();
 
-    Pad->Display_Infos( this );
+    Pad->DisplayInfo( this );
     Module->Draw( DrawPanel, DC, GR_OR );
 }
diff --git a/pcbnew/muonde.cpp b/pcbnew/muonde.cpp
index 79963b9210..e6bf7a7a89 100644
--- a/pcbnew/muonde.cpp
+++ b/pcbnew/muonde.cpp
@@ -481,7 +481,7 @@ MODULE* WinEDA_PcbFrame::Genere_Self( wxDC* DC )
     PtPad->m_Pos0 = PtPad->m_Pos - Module->m_Pos;
 
     /* Modif des positions textes */
-    Module->Display_Infos( this );
+    Module->DisplayInfo( this );
     Module->m_Value->m_Pos.x = Module->m_Reference->m_Pos.x = ( FirstSegm->m_Start.x +
                                                                 LastSegm->m_End.x ) / 2;
     Module->m_Value->m_Pos.y = Module->m_Reference->m_Pos.y = ( FirstSegm->m_Start.y +
diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp
index 65ce44f8bb..b0c835ad30 100644
--- a/pcbnew/netlist.cpp
+++ b/pcbnew/netlist.cpp
@@ -373,7 +373,7 @@ void ReadPcbNetlist( WinEDA_PcbFrame* aFrame,
     }
 
     aFrame->DrawPanel->Refresh();
-    aFrame->GetBoard()->Display_Infos( aFrame );
+    aFrame->GetBoard()->DisplayInfo( aFrame );
 }
 
 
@@ -703,7 +703,7 @@ void TestFor_Duplicate_Missing_And_Extra_Footprints( wxWindow* aFrame,
 
     if( aPcb->m_Modules == NULL )
     {
-        DisplayInfo( aFrame, _( "No modules" ), 10 ); return;
+        DisplayInfoMessage( aFrame, _( "No modules" ), 10 ); return;
     }
 
     /* Construction de la liste des references des modules de la netliste */
diff --git a/pcbnew/onleftclick.cpp b/pcbnew/onleftclick.cpp
index 4d58fb784c..ce0090d1b3 100644
--- a/pcbnew/onleftclick.cpp
+++ b/pcbnew/onleftclick.cpp
@@ -136,7 +136,7 @@ void WinEDA_PcbFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
         {
             int netcode = Select_High_Light( DC );
             if( netcode < 0 )
-                GetBoard()->Display_Infos( this );
+                GetBoard()->DisplayInfo( this );
             else
                 Affiche_Infos_Equipot( netcode, this );
         }
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index c11581d1e3..5e1fed222c 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -591,7 +591,7 @@ void WinEDA_PcbFrame::Show3D_Frame( wxCommandEvent& event )
 {
     if( m_Draw3DFrame )
     {
-        DisplayInfo( this, _( "3D Frame already opened" ) );
+        DisplayInfoMessage( this, _( "3D Frame already opened" ) );
         return;
     }
 
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index 29dad143eb..b9859dd490 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -699,9 +699,9 @@ void WinEDA_PlotFrame::Plot( wxCommandEvent& event )
 
     // Test for a reasonnable scale value
     if ( Scale_X < MIN_SCALE || Scale_Y < MIN_SCALE )
-        DisplayInfo(this, _("Warning: Scale option set to a very small value") );
+        DisplayInfoMessage(this, _("Warning: Scale option set to a very small value") );
     if ( Scale_X > MAX_SCALE || Scale_Y > MAX_SCALE )
-        DisplayInfo(this, _("Warning: Scale option set to a very large value") );
+        DisplayInfoMessage(this, _("Warning: Scale option set to a very large value") );
 
     int mask = 1;
     s_SelectedLayers = 0;
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index 8b1307d7b8..4374fd5cd1 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@@ -122,7 +122,7 @@ void WinEDA_BasePcbFrame::Compile_Ratsnest( wxDC* DC, bool display_status_pcb )
 
     msg.Printf( wxT( " %d" ), m_Pcb->m_Equipots.GetCount() );
     Affiche_1_Parametre( this, 8, wxT( "Nets" ), msg, CYAN );
-    
+
     reattribution_reference_piste( display_status_pcb );
 
     /* Compute the full ratsnest
@@ -147,7 +147,7 @@ void WinEDA_BasePcbFrame::Compile_Ratsnest( wxDC* DC, bool display_status_pcb )
         DrawGeneralRatsnest( DC, 0 );
 
     if( display_status_pcb )
-        m_Pcb->Display_Infos( this );
+        m_Pcb->DisplayInfo( this );
 }
 
 
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index 85295fd036..1c39162867 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -239,7 +239,7 @@ void WinEDA_BasePcbFrame::SelectLayerPair()
         wxString InfoMsg;
         InfoMsg = _( "Less than two copper layers are being used." );
         InfoMsg << wxT( "\n" ) << _( "Hence Layer Pairs cannot be specified." );
-        DisplayInfo( this, InfoMsg );
+        DisplayInfoMessage( this, InfoMsg );
         return;
     }
 
@@ -339,7 +339,7 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event )
     // but could be a mistake. So display an info message
     if( m_LayerId[m_LayerListTOP->GetSelection()]
             == m_LayerId[m_LayerListBOTTOM->GetSelection()] )
-        DisplayInfo( this, _( "Warning: The Top Layer and Bottom Layer are same." ) );
+        DisplayInfoMessage( this, _( "Warning: The Top Layer and Bottom Layer are same." ) );
 
     PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen();
 
diff --git a/pcbnew/swap_layers.cpp b/pcbnew/swap_layers.cpp
index 3a82dc30e4..44ad913e05 100644
--- a/pcbnew/swap_layers.cpp
+++ b/pcbnew/swap_layers.cpp
@@ -269,7 +269,7 @@ void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
     {
         wxString msg;
         msg = _( "Deselect this layer to select the No Change state" );
-        DisplayInfo( this, msg );
+        DisplayInfoMessage( this, msg );
         return;
     }
 
diff --git a/pcbnew/undelete.cpp b/pcbnew/undelete.cpp
index 24d1b5c2a1..00ef5a9092 100644
--- a/pcbnew/undelete.cpp
+++ b/pcbnew/undelete.cpp
@@ -60,7 +60,7 @@ void WinEDA_BasePcbFrame::UnDeleteItem( wxDC* DC )
         test_1_net_connexion( DC, net_code );
 #endif
 
-        m_Pcb->Display_Infos( this );
+        m_Pcb->DisplayInfo( this );
         break;
 
     case TYPE_BOARD_ITEM_LIST:
@@ -80,7 +80,7 @@ void WinEDA_BasePcbFrame::UnDeleteItem( wxDC* DC )
 #if !defined(GERBVIEW)
         test_1_net_connexion( DC, net_code );
 #endif
-        m_Pcb->Display_Infos( this );
+        m_Pcb->DisplayInfo( this );
         break;
 
 #if !defined(GERBVIEW)
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index 4605dd38cc..fa0dd52e74 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -121,7 +121,7 @@ void WinEDA_PcbFrame::Delete_Zone_Fill( wxDC* DC, SEGZONE* aZone, long aTimestam
             zone->DeleteStructure();
         }
     }
-    
+
     // Now delete the outlines of the corresponding copper areas
     for( int ii = 0; ii < GetBoard()->GetAreaCount(); ii++ )
     {
@@ -592,7 +592,7 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
 
             // use the form of SetCurItem() which does not write to the msg panel,
             // SCREEN::SetCurItem(), so the DRC error remains on screen.
-            // WinEDA_PcbFrame::SetCurItem() calls Display_Infos().
+            // WinEDA_PcbFrame::SetCurItem() calls DisplayInfo().
             GetScreen()->SetCurItem( NULL );
             DisplayError( this,
                 _( "DRC error: this start point is inside or too close an other area" ) );
@@ -615,7 +615,7 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
                || !zone->IsOnCopperLayer() ) // Ok, we can add a new corner
             {
                 zone->AppendCorner( GetScreen()->m_Curseur );
-                SetCurItem( zone );     // calls Display_Infos().
+                SetCurItem( zone );     // calls DisplayInfo().
             }
         }
     }