diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp
index af196d7ba0..24f319b1d6 100644
--- a/common/view/wx_view_controls.cpp
+++ b/common/view/wx_view_controls.cpp
@@ -449,7 +449,7 @@ void WX_VIEW_CONTROLS::SetCursorPosition( const VECTOR2D& aPosition, bool aWarpV
 }
 
 
-void WX_VIEW_CONTROLS::SetCrossAirCursorPosition( const VECTOR2D& aPosition, bool aWarpView = true )
+void WX_VIEW_CONTROLS::SetCrossHairCursorPosition( const VECTOR2D& aPosition, bool aWarpView = true )
 {
     m_updateCursor = false;
 
diff --git a/include/view/view_controls.h b/include/view/view_controls.h
index ca2502525e..de60839ca5 100644
--- a/include/view/view_controls.h
+++ b/include/view/view_controls.h
@@ -237,11 +237,11 @@ public:
 
 
     /**
-     * Moves the graphic crossair cursor to the requested position expressed in world coordinates.
+     * Moves the graphic crosshair cursor to the requested position expressed in world coordinates.
      * @param aPosition is the requested cursor position in the world coordinates.
      * @param aWarpView enables/disables view warp if the cursor is outside the current viewport.
      */
-    virtual void SetCrossAirCursorPosition( const VECTOR2D& aPosition, bool aWarpView = true ) = 0;
+    virtual void SetCrossHairCursorPosition( const VECTOR2D& aPosition, bool aWarpView = true ) = 0;
 
 
     /**
diff --git a/include/view/wx_view_controls.h b/include/view/wx_view_controls.h
index e9069d13bd..588ac4ae43 100644
--- a/include/view/wx_view_controls.h
+++ b/include/view/wx_view_controls.h
@@ -83,8 +83,8 @@ public:
 
     void SetCursorPosition( const VECTOR2D& aPosition, bool warpView ) override;
 
-    /// @copydoc VIEW_CONTROLS::SetCrossAirCursorPosition()
-    void SetCrossAirCursorPosition( const VECTOR2D& aPosition, bool aWarpView ) override;
+    /// @copydoc VIEW_CONTROLS::SetCrossHairCursorPosition()
+    void SetCrossHairCursorPosition( const VECTOR2D& aPosition, bool aWarpView ) override;
 
     /// @copydoc VIEW_CONTROLS::CursorWarp()
     void WarpCursor( const VECTOR2D& aPosition, bool aWorldCoordinates = false,
diff --git a/include/wxBasePcbFrame.h b/include/wxBasePcbFrame.h
index 3b45165765..57d63cbe58 100644
--- a/include/wxBasePcbFrame.h
+++ b/include/wxBasePcbFrame.h
@@ -272,8 +272,8 @@ public:
 
     /**
      * Useful to focus on a particular location, in find functions
-     * Move the graphic cursor at a given coordinate and reframes the drawing if the
-     * requested point is out of view or if center on location is requested.
+     * Move the graphic cursor (crosshair cursor) at a given coordinate and reframes
+     * the drawing if the requested point is out of view or if center on location is requested.
      * @param aPos is the point to go to.
      * @param aWarpMouseCursor is true if the pointer should be warped to the new position.
      * @param aCenterView is true if the new cursor position should be centered on canvas.
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 1552a46c8e..00bbb0f45a 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -351,7 +351,7 @@ void PCB_BASE_FRAME::FocusOnLocation( const wxPoint& aPos,
         if( aWarpMouseCursor )
             GetGalCanvas()->GetViewControls()->SetCursorPosition( aPos );
         else
-            GetGalCanvas()->GetViewControls()->SetCrossAirCursorPosition( aPos );
+            GetGalCanvas()->GetViewControls()->SetCrossHairCursorPosition( aPos );
     }
     else
     {