diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
similarity index 100%
rename from pcbnew/dialogs/dialog_edit_footprint_for_Modedit.cpp
rename to pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_Modedit.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h
similarity index 100%
rename from pcbnew/dialogs/dialog_edit_footprint_for_Modedit.h
rename to pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
similarity index 100%
rename from pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.cpp
rename to pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
similarity index 100%
rename from pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.fbp
rename to pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
similarity index 100%
rename from pcbnew/dialogs/dialog_edit_footprint_for_Modedit_base.h
rename to pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h
diff --git a/pcbnew/hotkeys_module_editor.cpp b/pcbnew/hotkeys_footprint_editor.cpp
similarity index 100%
rename from pcbnew/hotkeys_module_editor.cpp
rename to pcbnew/hotkeys_footprint_editor.cpp
diff --git a/pcbnew/tools/module_editor_tools.cpp b/pcbnew/tools/footprint_editor_tools.cpp
similarity index 100%
rename from pcbnew/tools/module_editor_tools.cpp
rename to pcbnew/tools/footprint_editor_tools.cpp
diff --git a/pcbnew/tools/module_editor_tools.h b/pcbnew/tools/footprint_editor_tools.h
similarity index 100%
rename from pcbnew/tools/module_editor_tools.h
rename to pcbnew/tools/footprint_editor_tools.h