diff --git a/common/jobs/job.cpp b/common/jobs/job.cpp
index 8689716696..8fe0b66830 100644
--- a/common/jobs/job.cpp
+++ b/common/jobs/job.cpp
@@ -74,9 +74,9 @@ wxString JOB::GetDefaultDescription() const
 }
 
 
-wxString JOB::GetOptionsDialogTitle() const
+wxString JOB::GetSettingsDialogTitle() const
 {
-    return _( "Job Options" );
+    return _( "Job Settings" );
 }
 
 
diff --git a/common/jobs/job.h b/common/jobs/job.h
index e7cac9f58c..c7360f9753 100644
--- a/common/jobs/job.h
+++ b/common/jobs/job.h
@@ -141,7 +141,7 @@ public:
     virtual void ToJson( nlohmann::json& j ) const;
 
     virtual wxString GetDefaultDescription() const;
-    virtual wxString GetOptionsDialogTitle() const;
+    virtual wxString GetSettingsDialogTitle() const;
 
     const std::vector<JOB_PARAM_BASE*>& GetParams() { return m_params; }
 
diff --git a/common/jobs/job_export_pcb_3d.cpp b/common/jobs/job_export_pcb_3d.cpp
index 30c08cb51c..d78ac569ca 100644
--- a/common/jobs/job_export_pcb_3d.cpp
+++ b/common/jobs/job_export_pcb_3d.cpp
@@ -145,9 +145,9 @@ wxString JOB_EXPORT_PCB_3D::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_3D::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_3D::GetSettingsDialogTitle() const
 {
-    return _( "Export 3D Model Job Options" );
+    return _( "Export 3D Model Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_3d.h b/common/jobs/job_export_pcb_3d.h
index f65e281283..1ddc2385f6 100644
--- a/common/jobs/job_export_pcb_3d.h
+++ b/common/jobs/job_export_pcb_3d.h
@@ -107,7 +107,7 @@ class KICOMMON_API JOB_EXPORT_PCB_3D : public JOB
 public:
     JOB_EXPORT_PCB_3D();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     void SetStepFormat( EXPORTER_STEP_PARAMS::FORMAT aFormat );
 
diff --git a/common/jobs/job_export_pcb_drill.cpp b/common/jobs/job_export_pcb_drill.cpp
index 797e3dc151..201d10c3a4 100644
--- a/common/jobs/job_export_pcb_drill.cpp
+++ b/common/jobs/job_export_pcb_drill.cpp
@@ -124,9 +124,9 @@ wxString JOB_EXPORT_PCB_DRILL::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_DRILL::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_DRILL::GetSettingsDialogTitle() const
 {
-    return _( "Export Drill Data Job Options" );
+    return _( "Export Drill Data Job Settings" );
 }
 
 REGISTER_JOB( pcb_export_drill, _HKI( "PCB: Export drill data" ), KIWAY::FACE_PCB,
diff --git a/common/jobs/job_export_pcb_drill.h b/common/jobs/job_export_pcb_drill.h
index d83d56c1bd..a38569ec65 100644
--- a/common/jobs/job_export_pcb_drill.h
+++ b/common/jobs/job_export_pcb_drill.h
@@ -32,7 +32,7 @@ public:
     JOB_EXPORT_PCB_DRILL();
 
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     wxString m_filename;
 
diff --git a/common/jobs/job_export_pcb_dxf.cpp b/common/jobs/job_export_pcb_dxf.cpp
index d853bc813c..536ec2bb72 100644
--- a/common/jobs/job_export_pcb_dxf.cpp
+++ b/common/jobs/job_export_pcb_dxf.cpp
@@ -59,9 +59,9 @@ wxString JOB_EXPORT_PCB_DXF::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_DXF::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_DXF::GetSettingsDialogTitle() const
 {
-    return _( "Export DXF Job Options" );
+    return _( "Export DXF Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_dxf.h b/common/jobs/job_export_pcb_dxf.h
index 5a11c39598..e1d075e456 100644
--- a/common/jobs/job_export_pcb_dxf.h
+++ b/common/jobs/job_export_pcb_dxf.h
@@ -33,7 +33,7 @@ class KICOMMON_API JOB_EXPORT_PCB_DXF : public JOB_EXPORT_PCB_PLOT
 public:
     JOB_EXPORT_PCB_DXF();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     enum class DXF_UNITS
     {
diff --git a/common/jobs/job_export_pcb_gencad.cpp b/common/jobs/job_export_pcb_gencad.cpp
index 05861139b8..41e09f9946 100644
--- a/common/jobs/job_export_pcb_gencad.cpp
+++ b/common/jobs/job_export_pcb_gencad.cpp
@@ -33,7 +33,7 @@ JOB_EXPORT_PCB_GENCAD::JOB_EXPORT_PCB_GENCAD() :
 }
 
 
-wxString JOB_EXPORT_PCB_GENCAD::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_GENCAD::GetSettingsDialogTitle() const
 {
-    return _( "Export GenCAD Job Options" );
+    return _( "Export GenCAD Job Settings" );
 }
\ No newline at end of file
diff --git a/common/jobs/job_export_pcb_gencad.h b/common/jobs/job_export_pcb_gencad.h
index 6dd10d930d..cb2b2702b6 100644
--- a/common/jobs/job_export_pcb_gencad.h
+++ b/common/jobs/job_export_pcb_gencad.h
@@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_GENCAD : public JOB
 {
 public:
     JOB_EXPORT_PCB_GENCAD();
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     wxString m_filename;
 
diff --git a/common/jobs/job_export_pcb_gerber.cpp b/common/jobs/job_export_pcb_gerber.cpp
index b2a99d8b89..7369b6978f 100644
--- a/common/jobs/job_export_pcb_gerber.cpp
+++ b/common/jobs/job_export_pcb_gerber.cpp
@@ -72,7 +72,7 @@ wxString JOB_EXPORT_PCB_GERBER::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_GERBER::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_GERBER::GetSettingsDialogTitle() const
 {
-    return _( "Export Single Gerber Job Options" );
+    return _( "Export Single Gerber Job Settings" );
 }
\ No newline at end of file
diff --git a/common/jobs/job_export_pcb_gerber.h b/common/jobs/job_export_pcb_gerber.h
index 7e85fd5c94..81cfa961cc 100644
--- a/common/jobs/job_export_pcb_gerber.h
+++ b/common/jobs/job_export_pcb_gerber.h
@@ -33,7 +33,7 @@ public:
     JOB_EXPORT_PCB_GERBER( const std::string& aType );
     JOB_EXPORT_PCB_GERBER();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     bool m_subtractSolderMaskFromSilk;
     bool m_includeNetlistAttributes;
diff --git a/common/jobs/job_export_pcb_gerbers.cpp b/common/jobs/job_export_pcb_gerbers.cpp
index 417b6b604b..32966eb67d 100644
--- a/common/jobs/job_export_pcb_gerbers.cpp
+++ b/common/jobs/job_export_pcb_gerbers.cpp
@@ -44,9 +44,9 @@ wxString JOB_EXPORT_PCB_GERBERS::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_GERBERS::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_GERBERS::GetSettingsDialogTitle() const
 {
-    return _( "Export Gerbers Job Options" );
+    return _( "Export Gerbers Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_gerbers.h b/common/jobs/job_export_pcb_gerbers.h
index 70158506dc..18d8ac083b 100644
--- a/common/jobs/job_export_pcb_gerbers.h
+++ b/common/jobs/job_export_pcb_gerbers.h
@@ -33,7 +33,7 @@ class KICOMMON_API JOB_EXPORT_PCB_GERBERS : public JOB_EXPORT_PCB_GERBER
 public:
     JOB_EXPORT_PCB_GERBERS();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     LSET m_layersIncludeOnAll;
 
diff --git a/common/jobs/job_export_pcb_ipc2581.cpp b/common/jobs/job_export_pcb_ipc2581.cpp
index 2e55c8b372..27bc0ecc11 100644
--- a/common/jobs/job_export_pcb_ipc2581.cpp
+++ b/common/jobs/job_export_pcb_ipc2581.cpp
@@ -73,9 +73,9 @@ wxString JOB_EXPORT_PCB_IPC2581::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_IPC2581::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_IPC2581::GetSettingsDialogTitle() const
 {
-    return _( "Export IPC2581 Job Options" );
+    return _( "Export IPC2581 Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_ipc2581.h b/common/jobs/job_export_pcb_ipc2581.h
index e99e20d9c1..d3ffba4b2c 100644
--- a/common/jobs/job_export_pcb_ipc2581.h
+++ b/common/jobs/job_export_pcb_ipc2581.h
@@ -30,7 +30,7 @@ class KICOMMON_API JOB_EXPORT_PCB_IPC2581 : public JOB
 public:
     JOB_EXPORT_PCB_IPC2581();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     void SetDefaultOutputPath( const wxString& aReferenceName );
 
diff --git a/common/jobs/job_export_pcb_odb.cpp b/common/jobs/job_export_pcb_odb.cpp
index 9c94c14399..dd366c4d08 100644
--- a/common/jobs/job_export_pcb_odb.cpp
+++ b/common/jobs/job_export_pcb_odb.cpp
@@ -58,9 +58,9 @@ wxString JOB_EXPORT_PCB_ODB::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_ODB::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_ODB::GetSettingsDialogTitle() const
 {
-    return _( "Export ODB++ Job Options" );
+    return _( "Export ODB++ Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_odb.h b/common/jobs/job_export_pcb_odb.h
index 477233ae90..0153b37571 100644
--- a/common/jobs/job_export_pcb_odb.h
+++ b/common/jobs/job_export_pcb_odb.h
@@ -29,7 +29,7 @@ class KICOMMON_API JOB_EXPORT_PCB_ODB : public JOB
 public:
     JOB_EXPORT_PCB_ODB();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     void SetDefaultOutputPath( const wxString& aReferenceName );
 
diff --git a/common/jobs/job_export_pcb_pdf.cpp b/common/jobs/job_export_pcb_pdf.cpp
index 8b0e40672a..d1e2ef5c3f 100644
--- a/common/jobs/job_export_pcb_pdf.cpp
+++ b/common/jobs/job_export_pcb_pdf.cpp
@@ -75,9 +75,9 @@ wxString JOB_EXPORT_PCB_PDF::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_PDF::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_PDF::GetSettingsDialogTitle() const
 {
-    return wxString::Format( _( "Export PDF Job Options" ) );
+    return wxString::Format( _( "Export PDF Job Settings" ) );
 }
 
 
diff --git a/common/jobs/job_export_pcb_pdf.h b/common/jobs/job_export_pcb_pdf.h
index b50aa4e8b2..d2402ffe3e 100644
--- a/common/jobs/job_export_pcb_pdf.h
+++ b/common/jobs/job_export_pcb_pdf.h
@@ -34,7 +34,7 @@ class KICOMMON_API JOB_EXPORT_PCB_PDF : public JOB_EXPORT_PCB_PLOT
 public:
     JOB_EXPORT_PCB_PDF();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     bool m_pdfFrontFPPropertyPopups;
     bool m_pdfBackFPPropertyPopups;
diff --git a/common/jobs/job_export_pcb_pos.cpp b/common/jobs/job_export_pcb_pos.cpp
index 91ddd46fd2..e4ce0cafa4 100644
--- a/common/jobs/job_export_pcb_pos.cpp
+++ b/common/jobs/job_export_pcb_pos.cpp
@@ -92,9 +92,9 @@ wxString JOB_EXPORT_PCB_POS::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_POS::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_POS::GetSettingsDialogTitle() const
 {
-    return _( "Export Position Data Job Options" );
+    return _( "Export Position Data Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_pos.h b/common/jobs/job_export_pcb_pos.h
index f9d584ca69..010c72bb37 100644
--- a/common/jobs/job_export_pcb_pos.h
+++ b/common/jobs/job_export_pcb_pos.h
@@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_PCB_POS : public JOB
 public:
     JOB_EXPORT_PCB_POS();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     void SetDefaultOutputPath( const wxString& aReferenceName );
 
diff --git a/common/jobs/job_export_pcb_svg.cpp b/common/jobs/job_export_pcb_svg.cpp
index 4a6a465b04..8452209dd3 100644
--- a/common/jobs/job_export_pcb_svg.cpp
+++ b/common/jobs/job_export_pcb_svg.cpp
@@ -59,9 +59,9 @@ wxString JOB_EXPORT_PCB_SVG::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_PCB_SVG::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_PCB_SVG::GetSettingsDialogTitle() const
 {
-    return _( "Export SVG Job Options" );
+    return _( "Export SVG Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_pcb_svg.h b/common/jobs/job_export_pcb_svg.h
index 03696e3c4f..80d1b6f965 100644
--- a/common/jobs/job_export_pcb_svg.h
+++ b/common/jobs/job_export_pcb_svg.h
@@ -33,7 +33,7 @@ class KICOMMON_API JOB_EXPORT_PCB_SVG : public JOB_EXPORT_PCB_PLOT
 public:
     JOB_EXPORT_PCB_SVG();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     int m_pageSizeMode;
     unsigned int m_precision;
diff --git a/common/jobs/job_export_sch_bom.cpp b/common/jobs/job_export_sch_bom.cpp
index 11a5cee79b..bbe31cd88c 100644
--- a/common/jobs/job_export_sch_bom.cpp
+++ b/common/jobs/job_export_sch_bom.cpp
@@ -87,9 +87,9 @@ wxString JOB_EXPORT_SCH_BOM::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_BOM::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_BOM::GetSettingsDialogTitle() const
 {
-    return wxString::Format( _( "Generate Bill of Materials Job Options" ) );
+    return wxString::Format( _( "Generate Bill of Materials Job Settings" ) );
 }
 
 
diff --git a/common/jobs/job_export_sch_bom.h b/common/jobs/job_export_sch_bom.h
index 159226113b..00dc305bb0 100644
--- a/common/jobs/job_export_sch_bom.h
+++ b/common/jobs/job_export_sch_bom.h
@@ -31,7 +31,7 @@ class KICOMMON_API JOB_EXPORT_SCH_BOM : public JOB
 public:
     JOB_EXPORT_SCH_BOM();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     // Basic options
     wxString m_filename;
diff --git a/common/jobs/job_export_sch_netlist.cpp b/common/jobs/job_export_sch_netlist.cpp
index 8e5f2819fe..d3ac4c93ea 100644
--- a/common/jobs/job_export_sch_netlist.cpp
+++ b/common/jobs/job_export_sch_netlist.cpp
@@ -81,9 +81,9 @@ wxString JOB_EXPORT_SCH_NETLIST::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_NETLIST::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_NETLIST::GetSettingsDialogTitle() const
 {
-    return wxString::Format( _( "Export Netlist Job Options" ) );
+    return wxString::Format( _( "Export Netlist Job Settings" ) );
 }
 
 
diff --git a/common/jobs/job_export_sch_netlist.h b/common/jobs/job_export_sch_netlist.h
index 1c8a271ea4..49b394456e 100644
--- a/common/jobs/job_export_sch_netlist.h
+++ b/common/jobs/job_export_sch_netlist.h
@@ -45,7 +45,7 @@ public:
 public:
     JOB_EXPORT_SCH_NETLIST();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     wxString m_filename;
 
diff --git a/common/jobs/job_export_sch_plot.cpp b/common/jobs/job_export_sch_plot.cpp
index 7068f4f555..183bf07ab7 100644
--- a/common/jobs/job_export_sch_plot.cpp
+++ b/common/jobs/job_export_sch_plot.cpp
@@ -123,9 +123,9 @@ wxString JOB_EXPORT_SCH_PLOT_PDF::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_PLOT_PDF::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_PLOT_PDF::GetSettingsDialogTitle() const
 {
-    return _( "Export PDF Job Options" );
+    return _( "Export PDF Job Settings" );
 }
 
 
@@ -142,9 +142,9 @@ wxString JOB_EXPORT_SCH_PLOT_DXF::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_PLOT_DXF::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_PLOT_DXF::GetSettingsDialogTitle() const
 {
-    return _( "Export DXF Job Options" );
+    return _( "Export DXF Job Settings" );
 }
 
 
@@ -161,9 +161,9 @@ wxString JOB_EXPORT_SCH_PLOT_SVG::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_PLOT_SVG::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_PLOT_SVG::GetSettingsDialogTitle() const
 {
-    return _( "Export SVG Job Options" );
+    return _( "Export SVG Job Settings" );
 }
 
 
@@ -180,9 +180,9 @@ wxString JOB_EXPORT_SCH_PLOT_PS::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_PLOT_PS::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_PLOT_PS::GetSettingsDialogTitle() const
 {
-    return _( "Export Postscript Job Options" );
+    return _( "Export Postscript Job Settings" );
 }
 
 
@@ -199,9 +199,9 @@ wxString JOB_EXPORT_SCH_PLOT_HPGL::GetDefaultDescription() const
 }
 
 
-wxString JOB_EXPORT_SCH_PLOT_HPGL::GetOptionsDialogTitle() const
+wxString JOB_EXPORT_SCH_PLOT_HPGL::GetSettingsDialogTitle() const
 {
-    return _( "Export HPGL Job Options" );
+    return _( "Export HPGL Job Settings" );
 }
 
 
diff --git a/common/jobs/job_export_sch_plot.h b/common/jobs/job_export_sch_plot.h
index 72c64583fe..fd31ec730f 100644
--- a/common/jobs/job_export_sch_plot.h
+++ b/common/jobs/job_export_sch_plot.h
@@ -104,7 +104,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PLOT_PDF : public JOB_EXPORT_SCH_PLOT
 public:
     JOB_EXPORT_SCH_PLOT_PDF();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
 
 
@@ -113,7 +113,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PLOT_DXF : public JOB_EXPORT_SCH_PLOT
 public:
     JOB_EXPORT_SCH_PLOT_DXF();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
 
 
@@ -122,7 +122,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PLOT_SVG : public JOB_EXPORT_SCH_PLOT
 public:
     JOB_EXPORT_SCH_PLOT_SVG();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
 
 
@@ -131,7 +131,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PLOT_PS : public JOB_EXPORT_SCH_PLOT
 public:
     JOB_EXPORT_SCH_PLOT_PS();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
 
 
@@ -140,7 +140,7 @@ class KICOMMON_API JOB_EXPORT_SCH_PLOT_HPGL : public JOB_EXPORT_SCH_PLOT
 public:
     JOB_EXPORT_SCH_PLOT_HPGL();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
 
 #endif
\ No newline at end of file
diff --git a/common/jobs/job_pcb_drc.cpp b/common/jobs/job_pcb_drc.cpp
index ee8f10863d..9d1622d114 100644
--- a/common/jobs/job_pcb_drc.cpp
+++ b/common/jobs/job_pcb_drc.cpp
@@ -38,9 +38,9 @@ wxString JOB_PCB_DRC::GetDefaultDescription() const
 }
 
 
-wxString JOB_PCB_DRC::GetOptionsDialogTitle() const
+wxString JOB_PCB_DRC::GetSettingsDialogTitle() const
 {
-    return _( "DRC Job Options" );
+    return _( "DRC Job Settings" );
 }
 
 
diff --git a/common/jobs/job_pcb_drc.h b/common/jobs/job_pcb_drc.h
index c2e350e5ba..bf989c181e 100644
--- a/common/jobs/job_pcb_drc.h
+++ b/common/jobs/job_pcb_drc.h
@@ -27,7 +27,7 @@ class KICOMMON_API JOB_PCB_DRC : public JOB_RC
 public:
     JOB_PCB_DRC();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     bool m_reportAllTrackErrors;
     bool m_parity;
diff --git a/common/jobs/job_pcb_render.cpp b/common/jobs/job_pcb_render.cpp
index 73aad2a22c..e0ce4237bf 100644
--- a/common/jobs/job_pcb_render.cpp
+++ b/common/jobs/job_pcb_render.cpp
@@ -90,9 +90,9 @@ wxString JOB_PCB_RENDER::GetDefaultDescription() const
 }
 
 
-wxString JOB_PCB_RENDER::GetOptionsDialogTitle() const
+wxString JOB_PCB_RENDER::GetSettingsDialogTitle() const
 {
-    return _( "Render PCB Job Options" );
+    return _( "Render PCB Job Settings" );
 }
 
 
diff --git a/common/jobs/job_pcb_render.h b/common/jobs/job_pcb_render.h
index a2b5a2db12..6359a1a171 100644
--- a/common/jobs/job_pcb_render.h
+++ b/common/jobs/job_pcb_render.h
@@ -51,7 +51,7 @@ public:
 public:
     JOB_PCB_RENDER();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 
     wxString m_filename;
 
diff --git a/common/jobs/job_sch_erc.cpp b/common/jobs/job_sch_erc.cpp
index 53ebc60910..7511960558 100644
--- a/common/jobs/job_sch_erc.cpp
+++ b/common/jobs/job_sch_erc.cpp
@@ -34,9 +34,9 @@ wxString JOB_SCH_ERC::GetDefaultDescription() const
 }
 
 
-wxString JOB_SCH_ERC::GetOptionsDialogTitle() const
+wxString JOB_SCH_ERC::GetSettingsDialogTitle() const
 {
-    return _( "Schematic ERC Job Options" );
+    return _( "Schematic ERC Job Settings" );
 }
 
 
diff --git a/common/jobs/job_sch_erc.h b/common/jobs/job_sch_erc.h
index 7f51609434..8804a483fd 100644
--- a/common/jobs/job_sch_erc.h
+++ b/common/jobs/job_sch_erc.h
@@ -27,5 +27,5 @@ class KICOMMON_API JOB_SCH_ERC : public JOB_RC
 public:
     JOB_SCH_ERC();
     wxString GetDefaultDescription() const override;
-    wxString GetOptionsDialogTitle() const override;
+    wxString GetSettingsDialogTitle() const override;
 };
\ No newline at end of file
diff --git a/eeschema/dialogs/dialog_erc_job_config.cpp b/eeschema/dialogs/dialog_erc_job_config.cpp
index 8a8f5be5ea..7eb671ef6e 100644
--- a/eeschema/dialogs/dialog_erc_job_config.cpp
+++ b/eeschema/dialogs/dialog_erc_job_config.cpp
@@ -23,7 +23,7 @@ DIALOG_ERC_JOB_CONFIG::DIALOG_ERC_JOB_CONFIG( wxWindow* parent, JOB_SCH_ERC* aJo
         DIALOG_RC_JOB( parent, aJob, _( "ERC Job Settings" ) ),
         m_ercJob( aJob )
 {
-    SetTitle( m_ercJob->GetOptionsDialogTitle() );
+    SetTitle( m_ercJob->GetSettingsDialogTitle() );
 
     m_cbAllTrackViolations->Hide();
     m_cbSchParity->Hide();
diff --git a/eeschema/dialogs/dialog_export_netlist.cpp b/eeschema/dialogs/dialog_export_netlist.cpp
index 539d34cd5e..0fd8f30299 100644
--- a/eeschema/dialogs/dialog_export_netlist.cpp
+++ b/eeschema/dialogs/dialog_export_netlist.cpp
@@ -260,7 +260,7 @@ DIALOG_EXPORT_NETLIST::DIALOG_EXPORT_NETLIST( SCH_EDIT_FRAME* aEditFrame, wxWind
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_MessagesBox->Hide();
         m_outputPath->SetValue( m_job->GetOutputPath() );
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 64b10977fd..04f80600bf 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -88,7 +88,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* aEditFrame, wxWind
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_browseButton->Hide();
         m_MessagesBox->Hide();
diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp
index 17e9dd9f9d..40d49f8d85 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table.cpp
+++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp
@@ -275,7 +275,7 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
 
     if( m_job )
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         preset.name = m_job->m_bomPresetName;
         preset.excludeDNP = m_job->m_excludeDNP;
diff --git a/pcbnew/dialogs/dialog_drc_job_config.cpp b/pcbnew/dialogs/dialog_drc_job_config.cpp
index 5ad3aec8e0..bdba0f2740 100644
--- a/pcbnew/dialogs/dialog_drc_job_config.cpp
+++ b/pcbnew/dialogs/dialog_drc_job_config.cpp
@@ -24,7 +24,7 @@ DIALOG_DRC_JOB_CONFIG::DIALOG_DRC_JOB_CONFIG( wxWindow* parent, JOB_PCB_DRC* aJo
         DIALOG_RC_JOB( parent, aJob, _( "DRC Job Settings" ) ),
         m_drcJob( aJob )
 {
-    SetTitle( aJob->GetOptionsDialogTitle() );
+    SetTitle( aJob->GetSettingsDialogTitle() );
 }
 
 
diff --git a/pcbnew/dialogs/dialog_export_2581.cpp b/pcbnew/dialogs/dialog_export_2581.cpp
index 34054f176c..66edf31df4 100644
--- a/pcbnew/dialogs/dialog_export_2581.cpp
+++ b/pcbnew/dialogs/dialog_export_2581.cpp
@@ -265,7 +265,7 @@ bool DIALOG_EXPORT_2581::Init()
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_choiceUnits->SetSelection( static_cast<int>( m_job->m_units ) );
         m_precision->SetValue( static_cast<int>( m_job->m_precision ) );
diff --git a/pcbnew/dialogs/dialog_export_odbpp.cpp b/pcbnew/dialogs/dialog_export_odbpp.cpp
index 62aa78dc0a..5b2cd640ac 100644
--- a/pcbnew/dialogs/dialog_export_odbpp.cpp
+++ b/pcbnew/dialogs/dialog_export_odbpp.cpp
@@ -244,7 +244,7 @@ bool DIALOG_EXPORT_ODBPP::Init()
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_choiceUnits->SetSelection( static_cast<int>( m_job->m_units ) );
         m_precision->SetValue( m_job->m_precision );
diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp
index be3252be95..6c9cc95a6c 100644
--- a/pcbnew/dialogs/dialog_export_step.cpp
+++ b/pcbnew/dialogs/dialog_export_step.cpp
@@ -111,7 +111,7 @@ DIALOG_EXPORT_STEP::DIALOG_EXPORT_STEP( PCB_EDIT_FRAME* aEditFrame, wxWindow* aP
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_browseButton->Hide();
         SetupStandardButtons();
diff --git a/pcbnew/dialogs/dialog_gen_footprint_position.cpp b/pcbnew/dialogs/dialog_gen_footprint_position.cpp
index e84f422467..b3b606843c 100644
--- a/pcbnew/dialogs/dialog_gen_footprint_position.cpp
+++ b/pcbnew/dialogs/dialog_gen_footprint_position.cpp
@@ -110,7 +110,7 @@ void DIALOG_GEN_FOOTPRINT_POSITION::initDialog()
     }
     else
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
 
         m_browseButton->Hide();
 
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 7ae249c286..66d5f67aa1 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -162,7 +162,7 @@ void DIALOG_GENDRILL::initDialog()
 {
     if( m_job )
     {
-        SetTitle( m_job->GetOptionsDialogTitle() );
+        SetTitle( m_job->GetSettingsDialogTitle() );
     }
     else
     {
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index fc8e81fd6e..905ffb5e5f 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -111,7 +111,7 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aEditFrame, wxWindow* aParent,
 
     if( m_job )
     {
-        SetTitle( aJob->GetOptionsDialogTitle() );
+        SetTitle( aJob->GetSettingsDialogTitle() );
 
         PCB_PLOTTER::PlotJobToPlotOpts( m_plotOpts, m_job );
         m_messagesPanel->Hide();
diff --git a/pcbnew/dialogs/dialog_render_job.cpp b/pcbnew/dialogs/dialog_render_job.cpp
index a089e51f89..83ba868c25 100644
--- a/pcbnew/dialogs/dialog_render_job.cpp
+++ b/pcbnew/dialogs/dialog_render_job.cpp
@@ -47,7 +47,7 @@ static std::map<JOB_PCB_RENDER::SIDE, wxString> sideMap = {
 DIALOG_RENDER_JOB::DIALOG_RENDER_JOB( wxWindow* aParent, JOB_PCB_RENDER* aJob  ) :
         DIALOG_RENDER_JOB_BASE( aParent ), m_job( aJob )
 {
-    SetTitle( aJob->GetOptionsDialogTitle() );
+    SetTitle( aJob->GetSettingsDialogTitle() );
 
     for( const auto& [k, name] : JOB_PCB_RENDER::GetFormatNameMap() )
         m_choiceFormat->Append( wxGetTranslation( name ) );