diff --git a/pcbnew/dialogs/dialog_multichannel_repeat_layout.fbp b/pcbnew/dialogs/dialog_multichannel_repeat_layout.fbp
index 6a21876435..22db66d610 100644
--- a/pcbnew/dialogs/dialog_multichannel_repeat_layout.fbp
+++ b/pcbnew/dialogs/dialog_multichannel_repeat_layout.fbp
@@ -606,7 +606,7 @@
                     <property name="gripper">0</property>
                     <property name="hidden">0</property>
                     <property name="id">wxID_ANY</property>
-                    <property name="label">Group components with their placement rule areas</property>
+                    <property name="label">Group items with their placement rule areas</property>
                     <property name="max_size"></property>
                     <property name="maximize_button">0</property>
                     <property name="maximum_size"></property>
@@ -671,7 +671,7 @@
                     <property name="gripper">0</property>
                     <property name="hidden">0</property>
                     <property name="id">wxID_ANY</property>
-                    <property name="label">Include locked components</property>
+                    <property name="label">Remove locked items from target rule areas</property>
                     <property name="max_size"></property>
                     <property name="maximize_button">0</property>
                     <property name="maximum_size"></property>
@@ -734,7 +734,7 @@
                     <property name="floatable">1</property>
                     <property name="font"></property>
                     <property name="gripper">0</property>
-                    <property name="hidden">0</property>
+                    <property name="hidden">1</property>
                     <property name="id">wxID_ANY</property>
                     <property name="label">Include components outside the target area</property>
                     <property name="max_size"></property>
diff --git a/pcbnew/dialogs/dialog_multichannel_repeat_layout_base.cpp b/pcbnew/dialogs/dialog_multichannel_repeat_layout_base.cpp
index 3b504526e9..e201f594a8 100644
--- a/pcbnew/dialogs/dialog_multichannel_repeat_layout_base.cpp
+++ b/pcbnew/dialogs/dialog_multichannel_repeat_layout_base.cpp
@@ -85,13 +85,15 @@ DIALOG_MULTICHANNEL_REPEAT_LAYOUT_BASE::DIALOG_MULTICHANNEL_REPEAT_LAYOUT_BASE(
 
 	bSizer13->Add( m_cbCopyOtherItems, 0, wxALL, 5 );
 
-	m_cbGroupItems = new wxCheckBox( this, wxID_ANY, _("Group components with their placement rule areas"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbGroupItems = new wxCheckBox( this, wxID_ANY, _("Group items with their placement rule areas"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer13->Add( m_cbGroupItems, 0, wxALL, 5 );
 
-	m_cbIncludeLockedComponents = new wxCheckBox( this, wxID_ANY, _("Include locked components"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbIncludeLockedComponents = new wxCheckBox( this, wxID_ANY, _("Remove locked items from target rule areas"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer13->Add( m_cbIncludeLockedComponents, 0, wxALL, 5 );
 
 	m_cbIncludeOffRAComponents = new wxCheckBox( this, wxID_ANY, _("Include components outside the target area"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cbIncludeOffRAComponents->Hide();
+
 	bSizer13->Add( m_cbIncludeOffRAComponents, 0, wxALL, 5 );
 
 
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index da1d768b2b..b35e4a019a 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -2225,7 +2225,7 @@ TOOL_ACTION PCB_ACTIONS::autoplaceOffboardComponents( TOOL_ACTION_ARGS()
 TOOL_ACTION PCB_ACTIONS::generatePlacementRuleAreas( TOOL_ACTION_ARGS()
         .Name( "pcbnew.Multichannel.generatePlacementRuleAreas" )
         .Scope( AS_GLOBAL )
-        .FriendlyName( _( "Generate Placement Rule Areas" ) )
+        .FriendlyName( _( "Generate Placement Rule Areas..." ) )
         .Tooltip( "Generates Placement Areas in easy way" )
         .Icon( BITMAPS::add_keepout_area )
         .Flags( AF_ACTIVATE ) );
@@ -2233,7 +2233,7 @@ TOOL_ACTION PCB_ACTIONS::generatePlacementRuleAreas( TOOL_ACTION_ARGS()
 TOOL_ACTION PCB_ACTIONS::repeatLayout( TOOL_ACTION_ARGS()
         .Name( "pcbnew.Multichannel.repeatLayout" )
         .Scope( AS_GLOBAL )
-        .FriendlyName( _( "Repeat Layout" ) )
+        .FriendlyName( _( "Repeat Layout..." ) )
         .Tooltip(  "Clones placement & routing across multiple identical channels" )
         .Icon( BITMAPS::copy )
         );