diff --git a/cvpcb/dialogs/dialog_config_equfiles.cpp b/cvpcb/dialogs/dialog_config_equfiles.cpp
index 2f9c78127d..755b31cf0a 100644
--- a/cvpcb/dialogs/dialog_config_equfiles.cpp
+++ b/cvpcb/dialogs/dialog_config_equfiles.cpp
@@ -96,7 +96,7 @@ void DIALOG_CONFIG_EQUFILES::OnEditEquFile( wxCommandEvent& event )
 
     if( editorname.IsEmpty() )
     {
-        wxMessageBox( _( "No editor defined in Kicad. Please choose it." ) );
+        wxMessageBox( _( "No editor defined in KiCad. Please choose it." ) );
         return;
     }
 
diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp
index 6d8c673988..38cbb7b631 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -124,7 +124,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
 
     // About CvPcb
     AddMenuItem( helpMenu, wxID_ABOUT,
-                 _( "&About Kicad" ),
+                 _( "&About KiCad" ),
                  _( "About KiCad" ),
                  KiBitmap( about_xpm ) );
 
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index a3ac0ab0e8..62f64f30d4 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -288,7 +288,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
 
     // About Kicad
     AddMenuItem( helpMenu, wxID_ABOUT,
-                 _( "&About Kicad" ), _( "About KiCad" ),
+                 _( "&About KiCad" ), _( "About KiCad" ),
                  KiBitmap( about_xpm ) );
 
     // Append menus to the menubar
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index d54d3545c7..ec251c5dc1 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -234,7 +234,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
     // About Kicad
     AddMenuItem( helpMenu,
                  wxID_ABOUT,
-                 _( "&About Kicad" ),
+                 _( "&About KiCad" ),
                  _( "About KiCad" ),
                  KiBitmap( about_xpm ) );
 
diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp
index a5680c4ef9..a6e5b40d28 100644
--- a/pcbnew/kicad_clipboard.cpp
+++ b/pcbnew/kicad_clipboard.cpp
@@ -298,7 +298,7 @@ BOARD* CLIPBOARD_IO::Load( const wxString& aFileName,
     if( item->Type() != PCB_T )
     {
         // The parser loaded something that was valid, but wasn't a board.
-        THROW_PARSE_ERROR( _( "Clipboard content is not Kicad compatible" ),
+        THROW_PARSE_ERROR( _( "Clipboard content is not KiCad compatible" ),
                 m_parser->CurSource(), m_parser->CurLine(),
                 m_parser->CurLineNumber(), m_parser->CurOffset() );
     }
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 8e079a290a..d201ea900a 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -868,7 +868,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
                      KiBitmap( add_board_xpm ) );
 
         AddMenuItem( aParentMenu, ID_IMPORT_NON_KICAD_BOARD,
-                _( "Import Non-Kicad Board File..." ),
+                _( "Import Non-KiCad Board File..." ),
                 _( "Import board file from other applications" ),
                 KiBitmap( import_brd_file_xpm ) );
     }