From 1786ae8773aee0144c3ad0f1ffbda8147bcfa4ee Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Wed, 24 Feb 2021 08:48:02 -0500
Subject: [PATCH] Eeschema: use symbol nomenclature for object file naming.

---
 eeschema/CMakeLists.txt                              |  4 ++--
 eeschema/autoplace_fields.cpp                        |  4 ++--
 eeschema/bus-wire-junction.cpp                       |  2 +-
 eeschema/component_references_lister.cpp             |  4 ++--
 eeschema/connection_graph.cpp                        |  4 +++-
 eeschema/cross-probing.cpp                           |  2 +-
 eeschema/dialogs/dialog_change_symbols.cpp           |  4 ++--
 eeschema/dialogs/dialog_edit_components_libid.cpp    |  4 ++--
 eeschema/dialogs/dialog_edit_label.cpp               |  6 +++---
 eeschema/dialogs/dialog_edit_one_field.cpp           |  4 ++--
 .../dialogs/dialog_global_edit_text_and_graphics.cpp |  4 ++--
 eeschema/dialogs/dialog_lib_symbol_properties.cpp    |  4 ++--
 eeschema/dialogs/dialog_rescue_each.cpp              |  4 ++--
 eeschema/dialogs/dialog_spice_model.h                |  2 +-
 eeschema/dialogs/dialog_symbol_remap.cpp             |  6 +++---
 eeschema/dialogs/dialog_update_symbol_fields.cpp     |  2 +-
 eeschema/ee_collectors.cpp                           |  4 ++--
 eeschema/ee_collectors.h                             |  6 +++---
 eeschema/fields_grid_table.h                         |  4 ++--
 eeschema/generate_alias_info.cpp                     |  4 ++--
 eeschema/getpart.cpp                                 |  4 ++--
 eeschema/lib_field.cpp                               |  4 ++--
 eeschema/lib_pin.h                                   |  4 ++--
 eeschema/{lib_part.cpp => lib_symbol.cpp}            |  0
 eeschema/{lib_part.h => lib_symbol.h}                |  0
 eeschema/libarch.cpp                                 |  4 ++--
 eeschema/netlist_exporters/netlist_exporter_base.h   |  4 ++--
 eeschema/project_rescue.cpp                          |  4 ++--
 eeschema/project_rescue.h                            |  2 +-
 eeschema/sch_connection.cpp                          |  4 +++-
 eeschema/sch_field.cpp                               |  4 ++--
 eeschema/sch_item.cpp                                |  4 ++--
 eeschema/sch_painter.cpp                             |  4 ++--
 eeschema/sch_painter.h                               |  4 +++-
 eeschema/sch_pin.cpp                                 |  4 ++--
 eeschema/sch_plugins/altium/sch_altium_plugin.cpp    |  5 +++--
 eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp      |  2 +-
 eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp      |  2 +-
 eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp      |  3 ++-
 eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp    |  4 ++--
 eeschema/sch_reference_list.h                        |  6 +++---
 eeschema/sch_screen.cpp                              |  2 +-
 eeschema/sch_screen.h                                |  2 +-
 eeschema/sch_sheet.cpp                               |  4 ++--
 eeschema/sch_sheet_path.cpp                          |  4 ++--
 eeschema/{sch_component.cpp => sch_symbol.cpp}       |  4 ++--
 eeschema/{sch_component.h => sch_symbol.h}           |  0
 eeschema/sch_text.cpp                                |  4 ++--
 eeschema/schematic_settings.cpp                      |  2 +-
 eeschema/symbol_lib_table.cpp                        |  2 +-
 eeschema/symbol_tree_model_adapter.cpp               |  4 ++--
 eeschema/tools/assign_footprints.cpp                 |  4 ++--
 eeschema/tools/ee_inspection_tool.cpp                |  4 ++--
 eeschema/tools/ee_selection.cpp                      |  4 ++--
 eeschema/tools/ee_selection_tool.cpp                 |  4 ++--
 eeschema/tools/ee_selection_tool.h                   |  2 +-
 eeschema/tools/sch_drawing_tools.cpp                 |  2 +-
 eeschema/tools/sch_edit_tool.cpp                     |  4 ++--
 eeschema/tools/sch_move_tool.cpp                     |  4 ++--
 eeschema/widgets/tuner_slider.cpp                    |  4 +++-
 qa/eeschema/test_sch_pin.cpp                         | 12 ++++++------
 qa/eeschema/test_sch_symbol.cpp                      |  4 ++--
 62 files changed, 118 insertions(+), 108 deletions(-)
 rename eeschema/{lib_part.cpp => lib_symbol.cpp} (100%)
 rename eeschema/{lib_part.h => lib_symbol.h} (100%)
 rename eeschema/{sch_component.cpp => sch_symbol.cpp} (99%)
 rename eeschema/{sch_component.h => sch_symbol.h} (100%)

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index d31d9a8765..d15ce25d66 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -164,7 +164,6 @@ set( EESCHEMA_SRCS
     autoplace_fields.cpp
     bus_alias.cpp
     bus-wire-junction.cpp
-    lib_part.cpp
     class_library.cpp
     cmp_library_lexer.cpp
     component_references_lister.cpp
@@ -188,6 +187,7 @@ set( EESCHEMA_SRCS
     lib_pin.cpp
     lib_polyline.cpp
     lib_rectangle.cpp
+    lib_symbol.cpp
     lib_text.cpp
     symbol_viewer_frame.cpp
     libarch.cpp
@@ -205,7 +205,6 @@ set( EESCHEMA_SRCS
     sch_bitmap.cpp
     sch_bus_entry.cpp
     ee_collectors.cpp
-    sch_component.cpp
     sch_connection.cpp
     sch_plugins/eagle/sch_eagle_plugin.cpp
     sch_field.cpp
@@ -225,6 +224,7 @@ set( EESCHEMA_SRCS
     sch_sheet.cpp
     sch_sheet_path.cpp
     sch_sheet_pin.cpp
+    sch_symbol.cpp
     sch_text.cpp
     sch_validators.cpp
     schematic.cpp
diff --git a/eeschema/autoplace_fields.cpp b/eeschema/autoplace_fields.cpp
index 70c7c92831..f64b6b2323 100644
--- a/eeschema/autoplace_fields.cpp
+++ b/eeschema/autoplace_fields.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Chris Pavlina <pavlina.chris@gmail.com>
- * Copyright (C) 2015, 2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2015, 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -54,7 +54,7 @@
 
 #include <sch_edit_frame.h>
 #include <hotkeys_basic.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_line.h>
 #include <lib_pin.h>
 #include <sch_draw_panel.h>
diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index a1d458ba1d..886ba6be83 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -27,7 +27,7 @@
 #include <general.h>
 #include <lib_item.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <sch_junction.h>
 #include <sch_line.h>
diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp
index d8276b5381..bec31f87ee 100644
--- a/eeschema/component_references_lister.cpp
+++ b/eeschema/component_references_lister.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2018 jean-pierre Charras <jp.charras at wanadoo.fr>
- * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@gmail.com>
  * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@
 
 #include <refdes_utils.h>
 #include <erc_settings.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 
 
diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index b73ba40c7c..2e7b6f05cf 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -2,6 +2,8 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ *
  * @author Jon Evans <jon@craftyjon.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -29,7 +31,7 @@
 #include <erc.h>
 #include <pin_type.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <sch_line.h>
 #include <sch_marker.h>
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index ee7b2a6039..0ee1d7e3d4 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -27,7 +27,7 @@
 #include <kiway_express.h>
 #include <eda_dde.h>
 #include <connection_graph.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <schematic.h>
 #include <reporter.h>
 #include <kicad_string.h>
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 1f4cc01565..168395f866 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2020 CERN
+ * Copyright (C) 2020-2021 CERN
  *
  * @author Wayne Stambaugh <stambaughw@gmail.com>
  *
@@ -28,7 +28,7 @@
 
 #include <core/kicad_algo.h>
 #include <dialog_change_symbols.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <sch_screen.h>
 #include <sch_sheet_path.h>
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index ef3cf5e1bb..f63afbdd94 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright 2017 Jean-Pierre Charras, jp.charras@wanadoo.fr
- * Copyright 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 #include <confirm.h>
 #include <sch_edit_frame.h>
 #include <sch_draw_panel.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_reference_list.h>
 #include <schematic.h>
 #include <pgm_base.h>
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index d75a6e04d9..4492a89e19 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -2,8 +2,8 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2013 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #include <general.h>
 #include <gr_text.h>
 #include <confirm.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_reference_list.h>
 #include <schematic.h>
 #include <dialogs/html_messagebox.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 5fb889ae39..56e3c0673c 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.com
  * Copyright (C) 2016 Wayne Stambaugh, stambaughw@gmail.com
- * Copyright (C) 2004-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see change_log.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <sch_base_frame.h>
 #include <sch_edit_frame.h>
 #include <ee_collectors.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
 #include <class_library.h>
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
index cf81168fcf..566e188338 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@
 #include <connection_graph.h>
 #include <dialog_global_edit_text_and_graphics_base.h>
 #include <kicad_string.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_connection.h>
 #include <sch_edit_frame.h>
 #include <sch_line.h>
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index a2e117e073..c342a96c7b 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <symbol_library_manager.h>
 #include <math/util.h> // for KiROUND
 #include <pgm_base.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <widgets/wx_grid.h>
 
diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp
index 7b3aeebe1b..5aae2c3a84 100644
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/eeschema/dialogs/dialog_rescue_each.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2015-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2015-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
 #include <invoke_sch_dialog.h>
 #include <kiface_i.h>
 #include <project_rescue.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <set>
 #include <symbol_preview_widget.h>
diff --git a/eeschema/dialogs/dialog_spice_model.h b/eeschema/dialogs/dialog_spice_model.h
index 158d068635..d5051720cd 100644
--- a/eeschema/dialogs/dialog_spice_model.h
+++ b/eeschema/dialogs/dialog_spice_model.h
@@ -31,7 +31,7 @@
 #include "netlist_exporter_pspice.h"
 
 #include <sim/spice_value.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_field.h>
 #include <lib_field.h>
 
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index 0ca990671b..e51c626a24 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap.cpp
@@ -5,8 +5,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2017 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017 Wayne Stambaugh <stambaughw@gmail.com>
+ * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -36,7 +36,7 @@
 #include <symbol_viewer_frame.h>
 #include <project_rescue.h>
 #include <sch_io_mgr.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_screen.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
diff --git a/eeschema/dialogs/dialog_update_symbol_fields.cpp b/eeschema/dialogs/dialog_update_symbol_fields.cpp
index 73703b3eee..b8fd83d6df 100644
--- a/eeschema/dialogs/dialog_update_symbol_fields.cpp
+++ b/eeschema/dialogs/dialog_update_symbol_fields.cpp
@@ -22,7 +22,7 @@
 
 #include <core/kicad_algo.h>
 #include <dialog_update_symbol_fields.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <symbol_edit_frame.h>
 #include <template_fieldnames.h>
 
diff --git a/eeschema/ee_collectors.cpp b/eeschema/ee_collectors.cpp
index 497d63e8cb..80a8e96c97 100644
--- a/eeschema/ee_collectors.cpp
+++ b/eeschema/ee_collectors.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2019 CERN
  *
  * This program is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@
 #include <ee_collectors.h>
 #include <lib_item.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_line.h>
 #include <sch_screen.h>
 #include <sch_sheet_path.h>
diff --git a/eeschema/ee_collectors.h b/eeschema/ee_collectors.h
index f7c30d6f68..ea5587dc1e 100644
--- a/eeschema/ee_collectors.h
+++ b/eeschema/ee_collectors.h
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2011-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
+ * Copyright (C) 2011-2021 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2019 CERN
  *
  * This program is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
 #ifndef EE_COLLECTORS_H
 #define EE_COLLECTORS_H
 
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <collector.h>
 #include <dialogs/dialog_schematic_find.h>
 #include <sch_item.h>
diff --git a/eeschema/fields_grid_table.h b/eeschema/fields_grid_table.h
index 86b3a3d6ae..e5543401e4 100644
--- a/eeschema/fields_grid_table.h
+++ b/eeschema/fields_grid_table.h
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2018-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
 #include <base_units.h>
 #include <sch_validators.h>
 #include <wx/grid.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <grid_tricks.h>
 #include <validators.h>
 
diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp
index 0aa12d4ae1..ec296951c5 100644
--- a/eeschema/generate_alias_info.cpp
+++ b/eeschema/generate_alias_info.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
- * Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -21,7 +21,7 @@
 #include <generate_alias_info.h>
 #include <kicad_string.h>
 #include <template_fieldnames.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <symbol_lib_table.h>
 
 
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 0467e7b35d..98f8c77619 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 #include <kiway.h>
 #include <symbol_viewer_frame.h>
 #include <pgm_base.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <symbol_lib_table.h>
 #include <tool/tool_manager.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 929b17e8db..f80d11dc7d 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -34,7 +34,7 @@
 #include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <general.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <transform.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index e306a06e31..1382b8fec5 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras at wanadoo.fr
  * Copyright (C) 2015 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see change_log.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@ class SCH_COMPONENT;
 #include <eda_rect.h>
 #include <lib_item.h>
 #include <pin_type.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 
 // Circle diameter drawn at the active end of pins:
 #define TARGET_PIN_RADIUS   Mils2iu( 15 )
diff --git a/eeschema/lib_part.cpp b/eeschema/lib_symbol.cpp
similarity index 100%
rename from eeschema/lib_part.cpp
rename to eeschema/lib_symbol.cpp
diff --git a/eeschema/lib_part.h b/eeschema/lib_symbol.h
similarity index 100%
rename from eeschema/lib_part.h
rename to eeschema/lib_symbol.h
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 24bfc4f83a..4fcb7b8572 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004 Jean-Pierre Charras, jp.charras ar wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -34,7 +34,7 @@
 #include <sch_edit_frame.h>
 #include <symbol_lib_table.h>
 #include <class_library.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <schematic.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_base.h b/eeschema/netlist_exporters/netlist_exporter_base.h
index 3d95ec9382..ca8f24f863 100644
--- a/eeschema/netlist_exporters/netlist_exporter_base.h
+++ b/eeschema/netlist_exporters/netlist_exporter_base.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1992-2013 jp.charras at wanadoo.fr
  * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2019 KiCad Developers
+ * Copyright (C) 1992-2021 KiCad Developers
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -27,7 +27,7 @@
 #define NETLIST_EXPORTER_H
 
 #include <lib_pin.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_text.h>
 #include <sch_sheet.h>
 #include <schematic.h>
diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp
index 96a522142f..5cd74389da 100644
--- a/eeschema/project_rescue.cpp
+++ b/eeschema/project_rescue.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Chris Pavlina <pavlina.chris@gmail.com>
- * Copyright (C) 2015-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2015-2021 KiCad Developers, see change_log.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #include <kiway.h>
 #include <symbol_viewer_frame.h>
 #include <project_rescue.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
diff --git a/eeschema/project_rescue.h b/eeschema/project_rescue.h
index ae8896f985..34d31d5729 100644
--- a/eeschema/project_rescue.h
+++ b/eeschema/project_rescue.h
@@ -42,7 +42,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include <properties.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <class_draw_panel_gal.h>
 
diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp
index 7f6df46ea6..29e130e94a 100644
--- a/eeschema/sch_connection.cpp
+++ b/eeschema/sch_connection.cpp
@@ -2,6 +2,8 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ *
  * @author Jon Evans <jon@craftyjon.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -22,7 +24,7 @@
 #include <wx/tokenzr.h>
 
 #include <connection_graph.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_pin.h>
 #include <sch_screen.h>
 #include <project/net_settings.h>
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index abd162d8a0..601352e619 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@
 #include <kiway.h>
 #include <general.h>
 #include <class_library.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_field.h>
 #include <schematic.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/sch_item.cpp b/eeschema/sch_item.cpp
index 43df9eeaaf..1d23d94d29 100644
--- a/eeschema/sch_item.cpp
+++ b/eeschema/sch_item.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2006 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <sch_sheet_path.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <sch_pin.h>
 #include <schematic.h>
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 745ac31534..5f3f4b109d 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2014 CERN
- * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
@@ -47,7 +47,7 @@
 #include <plotter.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <sch_field.h>
 #include <sch_junction.h>
diff --git a/eeschema/sch_painter.h b/eeschema/sch_painter.h
index f3a3e7129b..10bfbcc65f 100644
--- a/eeschema/sch_painter.h
+++ b/eeschema/sch_painter.h
@@ -2,6 +2,8 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019-2020 CERN
+ * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ *
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
@@ -25,7 +27,7 @@
 #ifndef __SCH_PAINTER_H
 #define __SCH_PAINTER_H
 
-#include <sch_component.h>
+#include <sch_symbol.h>
 
 #include <painter.h>
 
diff --git a/eeschema/sch_pin.cpp b/eeschema/sch_pin.cpp
index 6422455ccb..8562fb7be2 100644
--- a/eeschema/sch_pin.cpp
+++ b/eeschema/sch_pin.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 CERN
- * Copyright (C) 2019 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see change_log.txt for contributors.
  * @author Jon Evans <jon@craftyjon.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
  */
 
 #include <lib_pin.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_pin.h>
 #include <sch_sheet_path.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
index e091eae854..8e408105e7 100644
--- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
+++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
@@ -2,6 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -43,7 +44,7 @@
 #include <bus_alias.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_junction.h>
 #include <sch_line.h>
 #include <sch_no_connect.h>
@@ -2108,4 +2109,4 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
             break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index 87f10fc358..325c45dbec 100644
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -44,7 +44,7 @@
 #include <lib_text.h>
 #include <project.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <project/net_settings.h>
 #include <sch_edit_frame.h>
 #include <sch_junction.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
index a000f406f1..e7b227843a 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
@@ -42,7 +42,7 @@
 #include <lib_text.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>          // CMP_ORIENT_XXX
 #include <sch_field.h>
 #include <sch_line.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index f9d91982b3..28784b90e7 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -2,6 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2020 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * @author Wayne Stambaugh <stambaughw@gmail.com>
  *
@@ -32,7 +33,7 @@
 #include <locale_io.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>       // COMPONENT_ORIENTATION_T
 #include <sch_junction.h>
 #include <sch_line.h>
diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index 3fe183a8fb..9216327ca4 100644
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2016 CERN
- * Copyright (C) 2016-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2016-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * @author Wayne Stambaugh <stambaughw@gmail.com>
  *
@@ -42,7 +42,7 @@
 #include <general.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_junction.h>
 #include <sch_line.h>
 #include <sch_marker.h>
diff --git a/eeschema/sch_reference_list.h b/eeschema/sch_reference_list.h
index 593b8f9d22..109d8b86e6 100644
--- a/eeschema/sch_reference_list.h
+++ b/eeschema/sch_reference_list.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
- * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@gmail.com>
  * Copyright (C) 1992-2021 KiCad Developers, see authors.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
@@ -28,9 +28,9 @@
 
 #include <map>
 
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <sch_sheet_path.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_text.h>
 #include <erc_settings.h>
 
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index aae8234024..87854e477a 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -44,7 +44,7 @@
 #include <class_library.h>
 #include <connection_graph.h>
 #include <lib_pin.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_junction.h>
 #include <sch_line.h>
 #include <sch_marker.h>
diff --git a/eeschema/sch_screen.h b/eeschema/sch_screen.h
index 175b752dbd..bd2ed673f0 100644
--- a/eeschema/sch_screen.h
+++ b/eeschema/sch_screen.h
@@ -45,7 +45,7 @@
 #include <title_block.h>
 
 #include <lib_id.h>
-#include <sch_component.h>         // COMPONENT_INSTANCE_REFERENCE
+#include <sch_symbol.h>         // COMPONENT_INSTANCE_REFERENCE
 #include <sch_reference_list.h>
 #include <sch_rtree.h>
 #include <sch_sheet.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 3083c7125a..d6434be70e 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2020 Kicad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 Kicad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,7 +33,7 @@
 #include <math/util.h>      // for KiROUND
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_painter.h>
 #include <schematic.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index 9fbc1bf143..b2fe320046 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <sch_reference_list.h>
 #include <class_library.h>
 #include <sch_sheet_path.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <schematic.h>
 #include <template_fieldnames.h>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_symbol.cpp
similarity index 99%
rename from eeschema/sch_component.cpp
rename to eeschema/sch_symbol.cpp
index 4818b23567..c716a1db79 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <lib_rectangle.h>
 #include <lib_pin.h>
 #include <lib_text.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
 #include <trace_helpers.h>
diff --git a/eeschema/sch_component.h b/eeschema/sch_symbol.h
similarity index 100%
rename from eeschema/sch_component.h
rename to eeschema/sch_symbol.h
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 586a08e2eb..2e9ec4a466 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2015 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
  * @brief Code for handling schematic texts (texts, labels, hlabels and global labels).
  */
 
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
 #include <widgets/msgpanel.h>
diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp
index 17db4083b0..e153642786 100644
--- a/eeschema/schematic_settings.cpp
+++ b/eeschema/schematic_settings.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <base_screen.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <convert_to_biu.h>
 #include <default_values.h>
 #include <eda_text.h>
diff --git a/eeschema/symbol_lib_table.cpp b/eeschema/symbol_lib_table.cpp
index 7d0ab47979..2025217ae6 100644
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@@ -30,7 +30,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <symbol_lib_table.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 
 #define OPT_SEP     '|'         ///< options separator character
 
diff --git a/eeschema/symbol_tree_model_adapter.cpp b/eeschema/symbol_tree_model_adapter.cpp
index d324263cf5..3bd0a749c6 100644
--- a/eeschema/symbol_tree_model_adapter.cpp
+++ b/eeschema/symbol_tree_model_adapter.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -25,7 +25,7 @@
 
 #include <eda_pattern_match.h>
 #include <symbol_lib_table.h>
-#include <lib_part.h>
+#include <lib_symbol.h>
 #include <generate_alias_info.h>
 #include <symbol_tree_model_adapter.h>
 
diff --git a/eeschema/tools/assign_footprints.cpp b/eeschema/tools/assign_footprints.cpp
index 7b828640b9..20816686a4 100644
--- a/eeschema/tools/assign_footprints.cpp
+++ b/eeschema/tools/assign_footprints.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <sch_edit_frame.h>
 #include <wildcards_and_files_ext.h>
 #include <sch_sheet_path.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_reference_list.h>
 #include <schematic.h>
 #include <dsnlexer.h>
diff --git a/eeschema/tools/ee_inspection_tool.cpp b/eeschema/tools/ee_inspection_tool.cpp
index d5f9c8bc09..4049042ad9 100644
--- a/eeschema/tools/ee_inspection_tool.cpp
+++ b/eeschema/tools/ee_inspection_tool.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 CERN
- * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <id.h>
 #include <kiway.h>
 #include <confirm.h>
diff --git a/eeschema/tools/ee_selection.cpp b/eeschema/tools/ee_selection.cpp
index a77d8e325a..2803264511 100644
--- a/eeschema/tools/ee_selection.cpp
+++ b/eeschema/tools/ee_selection.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 CERN
- * Copyright (C) 2019-2020 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see CHANGELOG.TXT for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@
 
 #include <tools/ee_selection.h>
 #include <sch_item.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 
 
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 0fab8e6d42..ce31694638 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 CERN
- * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 #include <painter.h>
 #include <preview_items/selection_area.h>
 #include <sch_base_frame.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_field.h>
 #include <sch_edit_frame.h>
 #include <sch_item.h>
diff --git a/eeschema/tools/ee_selection_tool.h b/eeschema/tools/ee_selection_tool.h
index deb32fc940..3ab4f3169b 100644
--- a/eeschema/tools/ee_selection_tool.h
+++ b/eeschema/tools/ee_selection_tool.h
@@ -30,7 +30,7 @@
 #include <tool/tool_menu.h>
 #include <tools/ee_selection.h>
 #include <ee_collectors.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <cursors.h>
 
 class SCH_BASE_FRAME;
diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index a6cbe512f7..155e803108 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -34,7 +34,7 @@
 #include <widgets/infobar.h>
 #include <view/view_controls.h>
 #include <view/view.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_no_connect.h>
 #include <sch_line.h>
 #include <sch_junction.h>
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 538ef324ea..c1d7d8a69f 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 CERN
- * Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 #include <reporter.h>
 #include <kicad_string.h>
 #include <sch_item.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <sch_text.h>
 #include <sch_bitmap.h>
diff --git a/eeschema/tools/sch_move_tool.cpp b/eeschema/tools/sch_move_tool.cpp
index 67f99ba8e8..00beb2b0b9 100644
--- a/eeschema/tools/sch_move_tool.cpp
+++ b/eeschema/tools/sch_move_tool.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 CERN
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #include <bitmaps.h>
 #include <eda_item.h>
 #include <sch_item.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <sch_line.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/widgets/tuner_slider.cpp b/eeschema/widgets/tuner_slider.cpp
index 7ee34e3f00..c61803b47e 100644
--- a/eeschema/widgets/tuner_slider.cpp
+++ b/eeschema/widgets/tuner_slider.cpp
@@ -2,6 +2,8 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2016 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ *
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
@@ -25,7 +27,7 @@
 #include "tuner_slider.h"
 
 #include <sim/sim_plot_frame.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <template_fieldnames.h>
 #include <sim/netlist_exporter_pspice_sim.h>
 
diff --git a/qa/eeschema/test_sch_pin.cpp b/qa/eeschema/test_sch_pin.cpp
index 7d9f32743d..2efa7a44e8 100644
--- a/qa/eeschema/test_sch_pin.cpp
+++ b/qa/eeschema/test_sch_pin.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2019-2020 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 
 // Code under test
 #include <sch_pin.h>
-#include <sch_component.h>
+#include <sch_symbol.h>
 #include <eda_rect.h>
 
 
@@ -36,10 +36,10 @@ public:
     TEST_SCH_PIN_FIXTURE()
     {
         m_parent_part = new LIB_PART( "parent_part", nullptr );
-        
+
         m_lib_pin = new LIB_PIN( m_parent_part );
         m_parent_part->AddDrawItem( m_lib_pin );
-        
+
         // give the pin some kind of data we can use to test
         m_lib_pin->SetNumber( "42" );
         m_lib_pin->SetName( "pinname" );
@@ -51,7 +51,7 @@ public:
                                              &path, 0, 0, wxPoint( 1, 2 ) );
         m_parent_symbol->SetRef( &path, "U2" );
         m_parent_symbol->UpdatePins();
-        
+
         m_sch_pin = m_parent_symbol->GetPins( &path )[0];
     }
 
@@ -173,4 +173,4 @@ BOOST_AUTO_TEST_CASE( PinNumberingPower )
     BOOST_CHECK_EQUAL( pwr_name, "pinname" );
 }
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/qa/eeschema/test_sch_symbol.cpp b/qa/eeschema/test_sch_symbol.cpp
index ffbd399aec..b27b728d2e 100644
--- a/qa/eeschema/test_sch_symbol.cpp
+++ b/qa/eeschema/test_sch_symbol.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2020 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,7 +29,7 @@
 #include <unit_test_utils/unit_test_utils.h>
 
 // Code under test
-#include <sch_component.h>
+#include <sch_symbol.h>
 
 #include <sch_edit_frame.h>