diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index 92b70b2c17..e37d5d61c5 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -142,9 +142,9 @@ void SCH_BITMAP::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_BITMAP::Rotate( wxPoint aPosition )
+void SCH_BITMAP::Rotate( wxPoint aCenter )
 {
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
     m_image->Rotate( false );
 }
 
diff --git a/eeschema/sch_bitmap.h b/eeschema/sch_bitmap.h
index 5dd1f54bbe..b32334a83f 100644
--- a/eeschema/sch_bitmap.h
+++ b/eeschema/sch_bitmap.h
@@ -126,7 +126,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     wxString GetSelectMenuText( EDA_UNITS aUnits ) const override
     {
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 4efeb2c000..8aa33c9107 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -268,9 +268,9 @@ void SCH_BUS_ENTRY_BASE::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_BUS_ENTRY_BASE::Rotate( wxPoint aPosition )
+void SCH_BUS_ENTRY_BASE::Rotate( wxPoint aCenter )
 {
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
     RotatePoint( &m_size.x, &m_size.y, 900 );
 }
 
diff --git a/eeschema/sch_bus_entry.h b/eeschema/sch_bus_entry.h
index 0bdd44cfb0..dd9e17f8a9 100644
--- a/eeschema/sch_bus_entry.h
+++ b/eeschema/sch_bus_entry.h
@@ -90,7 +90,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     bool IsDangling() const override;
 
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index 84ef4c76a0..c2449be316 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -135,9 +135,9 @@ void SCH_JUNCTION::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_JUNCTION::Rotate( wxPoint aPosition )
+void SCH_JUNCTION::Rotate( wxPoint aCenter )
 {
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
 }
 
 
diff --git a/eeschema/sch_junction.h b/eeschema/sch_junction.h
index 862d98848e..e6857b61ac 100644
--- a/eeschema/sch_junction.h
+++ b/eeschema/sch_junction.h
@@ -71,7 +71,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override;
 
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index 26aa3c6297..f7ababb77f 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -392,22 +392,22 @@ void SCH_LINE::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_LINE::Rotate( wxPoint aPosition )
+void SCH_LINE::Rotate( wxPoint aCenter )
 {
-    RotatePoint( &m_start, aPosition, 900 );
-    RotatePoint( &m_end, aPosition, 900 );
+    RotatePoint( &m_start, aCenter, 900 );
+    RotatePoint( &m_end, aCenter, 900 );
 }
 
 
-void SCH_LINE::RotateStart( wxPoint aPosition )
+void SCH_LINE::RotateStart( wxPoint aCenter )
 {
-    RotatePoint( &m_start, aPosition, 900 );
+    RotatePoint( &m_start, aCenter, 900 );
 }
 
 
-void SCH_LINE::RotateEnd( wxPoint aPosition )
+void SCH_LINE::RotateEnd( wxPoint aCenter )
 {
-    RotatePoint( &m_end, aPosition, 900 );
+    RotatePoint( &m_end, aCenter, 900 );
 }
 
 
diff --git a/eeschema/sch_line.h b/eeschema/sch_line.h
index 97a131b5bc..352e54e69e 100644
--- a/eeschema/sch_line.h
+++ b/eeschema/sch_line.h
@@ -177,9 +177,9 @@ public:
 
     void MirrorVertically( int aCenter ) override;
     void MirrorHorizontally( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
-    void RotateStart( wxPoint aPosition );
-    void RotateEnd( wxPoint aPosition );
+    void Rotate( wxPoint aCenter ) override;
+    void RotateStart( wxPoint aCenter );
+    void RotateEnd( wxPoint aCenter );
 
     /**
      * Check line against \a aLine to see if it overlaps and merge if it does.
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index 6281357ea8..34b2a704ef 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -173,7 +173,7 @@ BITMAPS SCH_MARKER::GetMenuImage() const
 }
 
 
-void SCH_MARKER::Rotate( wxPoint aPosition )
+void SCH_MARKER::Rotate( wxPoint aCenter )
 {
     // Marker geometry isn't user-editable
 }
diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h
index b9fb7c2bed..1f1a7ff6d5 100644
--- a/eeschema/sch_marker.h
+++ b/eeschema/sch_marker.h
@@ -78,7 +78,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     /**
      * Compare DRC marker main and auxiliary text against search string.
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index 5329fb0592..f0e5ae0ac7 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -127,9 +127,9 @@ void SCH_NO_CONNECT::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_NO_CONNECT::Rotate( wxPoint aPosition )
+void SCH_NO_CONNECT::Rotate( wxPoint aCenter )
 {
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
 }
 
 
diff --git a/eeschema/sch_no_connect.h b/eeschema/sch_no_connect.h
index cc370e47b2..a641cec95b 100644
--- a/eeschema/sch_no_connect.h
+++ b/eeschema/sch_no_connect.h
@@ -84,7 +84,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     bool IsConnectable() const override { return true; }
 
diff --git a/eeschema/sch_pin.h b/eeschema/sch_pin.h
index a4e30813b8..d35ca96413 100644
--- a/eeschema/sch_pin.h
+++ b/eeschema/sch_pin.h
@@ -83,8 +83,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override {}
     void MirrorVertically( int aCenter ) override {}
-
-    void Rotate( wxPoint aPosition ) override {}
+    void Rotate( wxPoint aCenter ) override {}
 
     wxPoint GetPosition() const override { return GetTransformedPosition(); }
     const wxPoint GetLocalPosition() const { return m_position; }
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index f7799f3bfc..7bec766b19 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -717,11 +717,11 @@ void SCH_SHEET::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList
 }
 
 
-void SCH_SHEET::Rotate( wxPoint aPosition )
+void SCH_SHEET::Rotate( wxPoint aCenter )
 {
     wxPoint prev = m_pos;
 
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
     RotatePoint( &m_size.x, &m_size.y, 900 );
 
     if( m_size.x < 0 )
@@ -739,7 +739,7 @@ void SCH_SHEET::Rotate( wxPoint aPosition )
     // Pins must be rotated first as that's how we determine vertical vs horizontal
     // orientation for auto-placement
     for( SCH_SHEET_PIN* sheetPin : m_pins )
-        sheetPin->Rotate( aPosition );
+        sheetPin->Rotate( aCenter );
 
     if( m_fieldsAutoplaced == FIELDS_AUTOPLACED_AUTO )
     {
diff --git a/eeschema/sch_sheet.h b/eeschema/sch_sheet.h
index 0977ebf1fc..831d987f34 100644
--- a/eeschema/sch_sheet.h
+++ b/eeschema/sch_sheet.h
@@ -181,7 +181,7 @@ public:
 
     void MirrorVertically( int aCenter ) override;
     void MirrorHorizontally( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override
     {
@@ -522,9 +522,9 @@ public:
             field.Move( aMoveVector );
     }
 
-    void MirrorHorizontally( int aYaxis_position ) override;
-    void MirrorVertically( int aXaxis_position ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void MirrorHorizontally( int aCenter ) override;
+    void MirrorVertically( int aCenter ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override;
 
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index 8ef0e11035..226dd22e99 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -77,7 +77,7 @@ public:
     void Move( const wxPoint& aMoveVector ) override {}
     void MirrorHorizontally( int aCenter ) override {}
     void MirrorVertically( int aCenter ) override {}
-    void Rotate( wxPoint aPosition ) override {}
+    void Rotate( wxPoint aCenter ) override {}
 
 #if defined(DEBUG)
     void Show( int , std::ostream&  ) const override {}
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 80de5e3be5..ff06a0ab37 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -243,10 +243,10 @@ void SCH_SHEET_PIN::MirrorHorizontally( int aCenter )
 }
 
 
-void SCH_SHEET_PIN::Rotate( wxPoint aPosition )
+void SCH_SHEET_PIN::Rotate( wxPoint aCenter )
 {
     wxPoint pt = GetTextPos();
-    RotatePoint( &pt, aPosition, 900 );
+    RotatePoint( &pt, aCenter, 900 );
     ConstrainOnEdge( pt );
 }
 
diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index d87bbfb970..81126f6525 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -1483,11 +1483,11 @@ void SCH_COMPONENT::MirrorVertically( int aCenter )
 }
 
 
-void SCH_COMPONENT::Rotate( wxPoint aPosition )
+void SCH_COMPONENT::Rotate( wxPoint aCenter )
 {
     wxPoint prev = m_pos;
 
-    RotatePoint( &m_pos, aPosition, 900 );
+    RotatePoint( &m_pos, aCenter, 900 );
 
     SetOrientation( CMP_ROTATE_COUNTERCLOCKWISE );
 
diff --git a/eeschema/sch_symbol.h b/eeschema/sch_symbol.h
index 226893dcf2..d92af47ed8 100644
--- a/eeschema/sch_symbol.h
+++ b/eeschema/sch_symbol.h
@@ -608,7 +608,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override;
 
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 77bb2a2e2f..38c1c64f9e 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -215,10 +215,10 @@ void SCH_TEXT::MirrorVertically( int aCenter )
 }
 
 
-void SCH_TEXT::Rotate( wxPoint aPosition )
+void SCH_TEXT::Rotate( wxPoint aCenter )
 {
     wxPoint pt = GetTextPos();
-    RotatePoint( &pt, aPosition, 900 );
+    RotatePoint( &pt, aCenter, 900 );
     wxPoint offset = pt - GetTextPos();
 
     Rotate90( false );
@@ -979,10 +979,10 @@ void SCH_GLOBALLABEL::SetLabelSpinStyle( LABEL_SPIN_STYLE aSpinStyle )
 }
 
 
-void SCH_GLOBALLABEL::Rotate( wxPoint aPosition )
+void SCH_GLOBALLABEL::Rotate( wxPoint aCenter )
 {
     wxPoint pt = GetTextPos();
-    RotatePoint( &pt, aPosition, 900 );
+    RotatePoint( &pt, aCenter, 900 );
     wxPoint offset = pt - GetTextPos();
 
     Rotate90( false );
diff --git a/eeschema/sch_text.h b/eeschema/sch_text.h
index 3447bc6080..b04b4836b8 100644
--- a/eeschema/sch_text.h
+++ b/eeschema/sch_text.h
@@ -278,7 +278,7 @@ public:
 
     void MirrorHorizontally( int aCenter ) override;
     void MirrorVertically( int aCenter ) override;
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
 
     virtual void Rotate90( bool aClockwise );
     virtual void MirrorSpinStyle( bool aLeftRight );
@@ -402,7 +402,7 @@ public:
 
     void RunOnChildren( const std::function<void( SCH_ITEM* )>& aFunction ) override;
 
-    void Rotate( wxPoint aPosition ) override;
+    void Rotate( wxPoint aCenter ) override;
     void Rotate90( bool aClockwise ) override;
     void MirrorSpinStyle( bool aLeftRight ) override;