diff --git a/gerbview/tools/gerbview_control.cpp b/gerbview/tools/gerbview_control.cpp
index cc512e1acb..6c60abf756 100644
--- a/gerbview/tools/gerbview_control.cpp
+++ b/gerbview/tools/gerbview_control.cpp
@@ -112,7 +112,7 @@ int GERBVIEW_CONTROL::ExportToPcbnew( const TOOL_EVENT& aEvent )
         return 0;
     }
 
-    wxString     fileDialogName( wxT( "noname." ) + KiCadPcbFileExtension );
+    wxString     fileDialogName( NAMELESS_PROJECT + wxT( "." ) + KiCadPcbFileExtension );
     wxString     path = m_frame->GetMruPath();
 
     wxFileDialog filedlg( m_frame, _( "Board File Name" ), path, fileDialogName, PcbFileWildcard(),
diff --git a/include/project.h b/include/project.h
index 2f87130ec3..03b908e5cc 100644
--- a/include/project.h
+++ b/include/project.h
@@ -38,7 +38,7 @@
 #define PROJECT_VAR_NAME            wxT( "KIPRJMOD" )
 
 /// default name for nameless projects
-#define NAMELESS_PROJECT wxT( "noname" )
+#define NAMELESS_PROJECT _( "untitled" )
 
 class wxConfigBase;
 class PARAM_CFG;
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index b03deaaa68..5bb0f6cf54 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -421,7 +421,7 @@ bool PCB_EDIT_FRAME::Files_io_from_id( int id )
         wxFileName::SplitPath( GetBoard()->GetFileName(), nullptr, nullptr, &orig_name, nullptr );
 
         if( orig_name.IsEmpty() )
-            orig_name = _( "noname" );
+            orig_name = NAMELESS_PROJECT;
 
         wxFileName savePath( Prj().GetProjectFullName() );
 
@@ -1147,7 +1147,7 @@ bool PCB_EDIT_FRAME::doAutoSave()
 
     if( GetBoard()->GetFileName().IsEmpty() )
     {
-        tmpFileName = wxFileName( PATHS::GetDefaultUserProjectsPath(), wxT( "noname" ),
+        tmpFileName = wxFileName( PATHS::GetDefaultUserProjectsPath(), NAMELESS_PROJECT,
                                   KiCadPcbFileExtension );
         GetBoard()->SetFileName( tmpFileName.GetFullPath() );
     }