diff --git a/common/widgets/infobar.cpp b/common/widgets/infobar.cpp
index 87638cc38b..d00e866f72 100644
--- a/common/widgets/infobar.cpp
+++ b/common/widgets/infobar.cpp
@@ -32,11 +32,11 @@ wxDEFINE_EVENT( KIEVT_SHOW_INFOBAR,    wxCommandEvent );
 wxDEFINE_EVENT( KIEVT_DISMISS_INFOBAR, wxCommandEvent );
 
 BEGIN_EVENT_TABLE( WX_INFOBAR, wxInfoBarGeneric )
-    EVT_COMMAND( wxID_ANY, KIEVT_SHOW_INFOBAR,    WX_INFOBAR::OnShowInfoBar )
-    EVT_COMMAND( wxID_ANY, KIEVT_DISMISS_INFOBAR, WX_INFOBAR::OnDismissInfoBar )
+    EVT_COMMAND( wxID_ANY, KIEVT_SHOW_INFOBAR,    WX_INFOBAR::onShowInfoBar )
+    EVT_COMMAND( wxID_ANY, KIEVT_DISMISS_INFOBAR, WX_INFOBAR::onDismissInfoBar )
 
-    EVT_BUTTON( ID_CLOSE_INFOBAR, WX_INFOBAR::OnCloseButton )
-    EVT_TIMER(  ID_CLOSE_INFOBAR, WX_INFOBAR::OnTimer )
+    EVT_BUTTON( ID_CLOSE_INFOBAR, WX_INFOBAR::onCloseButton )
+    EVT_TIMER(  ID_CLOSE_INFOBAR, WX_INFOBAR::onTimer )
 END_EVENT_TABLE()
 
 
@@ -233,7 +233,7 @@ void WX_INFOBAR::RemoveAllButtons()
 }
 
 
-void WX_INFOBAR::OnShowInfoBar( wxCommandEvent& aEvent )
+void WX_INFOBAR::onShowInfoBar( wxCommandEvent& aEvent )
 {
     RemoveAllButtons();
     AddCloseButton();
@@ -241,19 +241,19 @@ void WX_INFOBAR::OnShowInfoBar( wxCommandEvent& aEvent )
 }
 
 
-void WX_INFOBAR::OnDismissInfoBar( wxCommandEvent& aEvent )
+void WX_INFOBAR::onDismissInfoBar( wxCommandEvent& aEvent )
 {
     Dismiss();
 }
 
 
-void WX_INFOBAR::OnCloseButton( wxCommandEvent& aEvent )
+void WX_INFOBAR::onCloseButton( wxCommandEvent& aEvent )
 {
     Dismiss();
 }
 
 
-void WX_INFOBAR::OnTimer( wxTimerEvent& aEvent )
+void WX_INFOBAR::onTimer( wxTimerEvent& aEvent )
 {
     // Reset and clear the timer
     m_showTimer->Stop();
diff --git a/include/widgets/infobar.h b/include/widgets/infobar.h
index 2f2567096b..69d6e9958f 100644
--- a/include/widgets/infobar.h
+++ b/include/widgets/infobar.h
@@ -179,24 +179,24 @@ protected:
      * KIEVT_SHOW_INFOBAR. The message is stored inside the string field, and the
      * icon flag is stored inside the int field.
      */
-    void OnShowInfoBar( wxCommandEvent& aEvent );
+    void onShowInfoBar( wxCommandEvent& aEvent );
 
     /**
      * Event handler for dismissing the infobar using a wxCommandEvent of the type
      * KIEVT_DISMISS_INFOBAR.
      */
-    void OnDismissInfoBar( wxCommandEvent& aEvent );
+    void onDismissInfoBar( wxCommandEvent& aEvent );
 
     /**
      * Event handler for the close button.
      * This is bound to ID_CLOSE_INFOBAR on the infobar.
      */
-    void OnCloseButton( wxCommandEvent& aEvent );
+    void onCloseButton( wxCommandEvent& aEvent );
 
     /**
      * Event handler for the automatic closing timer.
      */
-    void OnTimer( wxTimerEvent& aEvent );
+    void onTimer( wxTimerEvent& aEvent );
 
     void onSize( wxSizeEvent& aEvent );