diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index 17aedecdf6..3e3066b648 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -493,7 +493,7 @@ void PCB_EDIT_FRAME::ExchangeFootprint( FOOTPRINT* aExisting, FOOTPRINT* aNew,
 
     PlaceFootprint( aNew, false );
 
-    // PlaceModule will move the footprint to the cursor position, which we don't want.  Copy
+    // PlaceFootprint will move the footprint to the cursor position, which we don't want.  Copy
     // the original position across.
     aNew->SetPosition( aExisting->GetPosition() );
 
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index 6291c1f92b..aa0b8a7fff 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -849,7 +849,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveFootprintToBoard( bool aAddNew )
         commit.Push( wxT( "Insert footprint" ) );
 
         pcbframe->Raise();
-        pcbframe->GetToolManager()->RunAction( PCB_ACTIONS::placeModule, true, newFootprint );
+        pcbframe->GetToolManager()->RunAction( PCB_ACTIONS::placeFootprint, true, newFootprint );
     }
 
     newFootprint->ClearFlags();
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index 8252dac01e..8d078d43bc 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -766,7 +766,7 @@ void FOOTPRINT_VIEWER_FRAME::AddFootprintToPCB( wxCommandEvent& aEvent )
         commit.Push( wxT( "Insert footprint" ) );
 
         pcbframe->Raise();
-        pcbframe->GetToolManager()->RunAction( PCB_ACTIONS::placeModule, true, newFootprint );
+        pcbframe->GetToolManager()->RunAction( PCB_ACTIONS::placeFootprint, true, newFootprint );
 
         newFootprint->ClearFlags();
     }
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 0d59b567cc..03dee6702f 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -299,7 +299,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     //
     ACTION_MENU* placeMenu = new ACTION_MENU( false, selTool );
 
-    placeMenu->Add( PCB_ACTIONS::placeModule );
+    placeMenu->Add( PCB_ACTIONS::placeFootprint );
     placeMenu->Add( PCB_ACTIONS::drawVia );
     placeMenu->Add( PCB_ACTIONS::drawZone );
     placeMenu->Add( PCB_ACTIONS::drawRuleArea );
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 33854bc162..6fd6fffa97 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -699,7 +699,7 @@ void PCB_EDIT_FRAME::setupUIConditions()
 
     // These tools edit the board, so they must be disabled during some operations
     CURRENT_EDIT_TOOL( ACTIONS::deleteTool );
-    CURRENT_EDIT_TOOL( PCB_ACTIONS::placeModule );
+    CURRENT_EDIT_TOOL( PCB_ACTIONS::placeFootprint );
     CURRENT_EDIT_TOOL( PCB_ACTIONS::routeSingleTrack);
     CURRENT_EDIT_TOOL( PCB_ACTIONS::routeDiffPair);
     CURRENT_EDIT_TOOL( PCB_ACTIONS::drawVia );
diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp
index 87a7f99d1b..5fe0c0391b 100644
--- a/pcbnew/toolbars_pcb_editor.cpp
+++ b/pcbnew/toolbars_pcb_editor.cpp
@@ -417,7 +417,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
     m_drawToolBar->Add( PCB_ACTIONS::localRatsnestTool,    ACTION_TOOLBAR::TOGGLE );
 
     m_drawToolBar->AddScaledSeparator( this );
-    m_drawToolBar->Add( PCB_ACTIONS::placeModule,          ACTION_TOOLBAR::TOGGLE );
+    m_drawToolBar->Add( PCB_ACTIONS::placeFootprint,       ACTION_TOOLBAR::TOGGLE );
     m_drawToolBar->AddGroup( routingGroup,                 ACTION_TOOLBAR::TOGGLE );
     m_drawToolBar->Add( PCB_ACTIONS::drawVia,              ACTION_TOOLBAR::TOGGLE );
     m_drawToolBar->AddGroup( microwaveGroup,               ACTION_TOOLBAR::TOGGLE );
diff --git a/pcbnew/tools/board_editor_control.cpp b/pcbnew/tools/board_editor_control.cpp
index 6384831ff6..8f0c12f40a 100644
--- a/pcbnew/tools/board_editor_control.cpp
+++ b/pcbnew/tools/board_editor_control.cpp
@@ -164,7 +164,7 @@ bool BOARD_EDITOR_CONTROL::Init()
     auto placeModuleCondition =
             [ this ] ( const SELECTION& aSel )
             {
-                return m_frame->IsCurrentTool( PCB_ACTIONS::placeModule ) && aSel.GetSize() == 0;
+                return m_frame->IsCurrentTool( PCB_ACTIONS::placeFootprint ) && aSel.GetSize() == 0;
             };
 
     auto& ctxMenu = m_menu.GetMenu();
@@ -792,7 +792,7 @@ int BOARD_EDITOR_CONTROL::ViaSizeDec( const TOOL_EVENT& aEvent )
 }
 
 
-int BOARD_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
+int BOARD_EDITOR_CONTROL::PlaceFootprint( const TOOL_EVENT& aEvent )
 {
     FOOTPRINT*            fp = aEvent.Parameter<FOOTPRINT*>();
     KIGFX::VIEW_CONTROLS* controls = getViewControls();
@@ -1398,7 +1398,7 @@ void BOARD_EDITOR_CONTROL::setTransitions()
 
     // Placing tools
     Go( &BOARD_EDITOR_CONTROL::PlaceTarget,            PCB_ACTIONS::placeTarget.MakeEvent() );
-    Go( &BOARD_EDITOR_CONTROL::PlaceModule,            PCB_ACTIONS::placeModule.MakeEvent() );
+    Go( &BOARD_EDITOR_CONTROL::PlaceFootprint, PCB_ACTIONS::placeFootprint.MakeEvent() );
     Go( &BOARD_EDITOR_CONTROL::DrillOrigin,            PCB_ACTIONS::drillOrigin.MakeEvent() );
 
     Go( &BOARD_EDITOR_CONTROL::EditFpInFpEditor,       PCB_ACTIONS::editFpInFpEditor.MakeEvent() );
diff --git a/pcbnew/tools/board_editor_control.h b/pcbnew/tools/board_editor_control.h
index fe7451b74d..92189d4bc8 100644
--- a/pcbnew/tools/board_editor_control.h
+++ b/pcbnew/tools/board_editor_control.h
@@ -95,10 +95,10 @@ public:
     int PlaceTarget( const TOOL_EVENT& aEvent );
 
     /**
-     * Function PlaceModule()
+     * Function PlaceFootprint()
      * Displays a dialog to select a footprint to be added and allows the user to set its position.
      */
-    int PlaceModule( const TOOL_EVENT& aEvent );
+    int PlaceFootprint( const TOOL_EVENT& aEvent );
 
     ///> Toggles 'lock' property for selected items.
     int ToggleLockSelected( const TOOL_EVENT& aEvent );
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 9bb768a03b..b1fe7753fd 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -625,7 +625,7 @@ TOOL_ACTION PCB_ACTIONS::placeTarget( "pcbnew.EditorControl.placeTarget",
         _( "Add Layer Alignment Target" ), _( "Add a layer alignment target" ),
         add_pcb_target_xpm, AF_ACTIVATE );
 
-TOOL_ACTION PCB_ACTIONS::placeModule( "pcbnew.EditorControl.placeModule",
+TOOL_ACTION PCB_ACTIONS::placeFootprint( "pcbnew.EditorControl.placeFootprint",
         AS_GLOBAL,
         'O', LEGACY_HK_NAME( "Add Footprint" ),
         _( "Add Footprint" ), _( "Add a footprint" ),
diff --git a/pcbnew/tools/pcb_actions.h b/pcbnew/tools/pcb_actions.h
index b020cfe85b..81219b93aa 100644
--- a/pcbnew/tools/pcb_actions.h
+++ b/pcbnew/tools/pcb_actions.h
@@ -158,7 +158,7 @@ public:
     static TOOL_ACTION drawZoneCutout;
     static TOOL_ACTION drawSimilarZone;
     static TOOL_ACTION placeTarget;
-    static TOOL_ACTION placeModule;
+    static TOOL_ACTION placeFootprint;
     static TOOL_ACTION placeImportedGraphics;
     static TOOL_ACTION setAnchor;
     static TOOL_ACTION deleteLastPoint;