diff --git a/eeschema/dialogs/dialog_bom_editor.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp
similarity index 100%
rename from eeschema/dialogs/dialog_bom_editor.cpp
rename to eeschema/dialogs/dialog_fields_editor_global.cpp
diff --git a/eeschema/dialogs/dialog_bom_editor.h b/eeschema/dialogs/dialog_fields_editor_global.h
similarity index 100%
rename from eeschema/dialogs/dialog_bom_editor.h
rename to eeschema/dialogs/dialog_fields_editor_global.h
diff --git a/eeschema/dialogs/dialog_bom_editor_base.cpp b/eeschema/dialogs/dialog_fields_editor_global_base.cpp
similarity index 100%
rename from eeschema/dialogs/dialog_bom_editor_base.cpp
rename to eeschema/dialogs/dialog_fields_editor_global_base.cpp
diff --git a/eeschema/dialogs/dialog_bom_editor_base.fbp b/eeschema/dialogs/dialog_fields_editor_global_base.fbp
similarity index 100%
rename from eeschema/dialogs/dialog_bom_editor_base.fbp
rename to eeschema/dialogs/dialog_fields_editor_global_base.fbp
diff --git a/eeschema/dialogs/dialog_bom_editor_base.h b/eeschema/dialogs/dialog_fields_editor_global_base.h
similarity index 100%
rename from eeschema/dialogs/dialog_bom_editor_base.h
rename to eeschema/dialogs/dialog_fields_editor_global_base.h
diff --git a/eeschema/bom_table_column.cpp b/eeschema/fields_editor_table_column.cpp
similarity index 100%
rename from eeschema/bom_table_column.cpp
rename to eeschema/fields_editor_table_column.cpp
diff --git a/eeschema/bom_table_column.h b/eeschema/fields_editor_table_column.h
similarity index 100%
rename from eeschema/bom_table_column.h
rename to eeschema/fields_editor_table_column.h
diff --git a/eeschema/bom_table_model.cpp b/eeschema/fields_editor_table_model.cpp
similarity index 100%
rename from eeschema/bom_table_model.cpp
rename to eeschema/fields_editor_table_model.cpp
diff --git a/eeschema/bom_table_model.h b/eeschema/fields_editor_table_model.h
similarity index 100%
rename from eeschema/bom_table_model.h
rename to eeschema/fields_editor_table_model.h