diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
--- a/src/view/kateview.cpp
+++ b/src/view/kateview.cpp
@@ -1969,7 +1969,7 @@
 
 void KTextEditor::ViewPrivate::ensureCursorColumnValid()
 {
-    KTextEditor::Cursor c = m_viewInternal->getCursor();
+    KTextEditor::Cursor c = m_viewInternal->cursorPosition();
 
     // make sure the cursor is valid:
     // - in block selection mode or if wrap cursor is off, the column is arbitrary
@@ -2071,7 +2071,7 @@
 
 int KTextEditor::ViewPrivate::virtualCursorColumn() const
 {
-    return doc()->toVirtualColumn(m_viewInternal->getCursor());
+    return doc()->toVirtualColumn(m_viewInternal->cursorPosition());
 }
 
 void KTextEditor::ViewPrivate::notifyMousePositionChanged(const KTextEditor::Cursor &newPosition)
@@ -2536,12 +2536,12 @@
 
 KTextEditor::Cursor KTextEditor::ViewPrivate::cursorPosition() const
 {
-    return m_viewInternal->getCursor();
+    return m_viewInternal->cursorPosition();
 }
 
 KTextEditor::Cursor KTextEditor::ViewPrivate::cursorPositionVirtual() const
 {
-    return KTextEditor::Cursor(m_viewInternal->getCursor().line(), virtualCursorColumn());
+    return KTextEditor::Cursor(m_viewInternal->cursorPosition().line(), virtualCursorColumn());
 }
 
 QPoint KTextEditor::ViewPrivate::cursorToCoordinate(const KTextEditor::Cursor &cursor) const
@@ -3460,7 +3460,7 @@
     QSet<Kate::TextRange *> &oldSet = (activationType == KTextEditor::Attribute::ActivateMouseIn) ? m_rangesMouseIn : m_rangesCaretIn;
 
     // which cursor position to honor?
-    KTextEditor::Cursor currentCursor = (activationType == KTextEditor::Attribute::ActivateMouseIn) ? m_viewInternal->getMouse() : m_viewInternal->getCursor();
+    KTextEditor::Cursor currentCursor = (activationType == KTextEditor::Attribute::ActivateMouseIn) ? m_viewInternal->mousePosition() : m_viewInternal->cursorPosition();
 
     // first: validate the remembered ranges
     QSet<Kate::TextRange *> validRanges;
diff --git a/src/view/kateviewaccessible.h b/src/view/kateviewaccessible.h
--- a/src/view/kateviewaccessible.h
+++ b/src/view/kateviewaccessible.h
@@ -133,7 +133,7 @@
     }
     int cursorPosition() const override
     {
-        KTextEditor::Cursor c = view()->getCursor();
+        KTextEditor::Cursor c = view()->cursorPosition();
         return positionFromCursor(view(), c);
     }
     int offsetAtPoint(const QPoint & /*point*/) const override
diff --git a/src/view/kateviewinternal.h b/src/view/kateviewinternal.h
--- a/src/view/kateviewinternal.h
+++ b/src/view/kateviewinternal.h
@@ -190,11 +190,22 @@
     void top_home(bool sel = false);
     void bottom_end(bool sel = false);
 
-    KTextEditor::Cursor getCursor() const
+    /**
+     * Accessor to the current caret position
+     * @return position of the caret as @c KTextEditor::Cursor
+     * @see KTextEditor::Cursor
+     */
+    KTextEditor::Cursor cursorPosition() const
     {
         return m_cursor;
     }
-    KTextEditor::Cursor getMouse() const
+
+    /**
+     * Accessor to the current mouse position
+     * @return position of the mouse as @c KTextEditor::Cursor
+     * @see KTextEditor::Cursor
+     */
+    KTextEditor::Cursor mousePosition() const
     {
         return m_mouse;
     }
diff --git a/src/vimode/inputmodemanager.cpp b/src/vimode/inputmodemanager.cpp
--- a/src/vimode/inputmodemanager.cpp
+++ b/src/vimode/inputmodemanager.cpp
@@ -329,7 +329,7 @@
 void InputModeManager::viEnterNormalMode()
 {
     bool moveCursorLeft = (m_currentViMode == ViMode::InsertMode || m_currentViMode == ViMode::ReplaceMode)
-                          && m_viewInternal->getCursor().column() > 0;
+                          && m_viewInternal->cursorPosition().column() > 0;
 
     if (!m_lastChangeRecorder->isReplaying() &&
             (m_currentViMode == ViMode::InsertMode ||