diff --git a/src/client/plasmashell.h b/src/client/plasmashell.h
--- a/src/client/plasmashell.h
+++ b/src/client/plasmashell.h
@@ -324,14 +324,15 @@
     void requestShowAutoHidingPanel();
 
     /**
-     * Set whether a PlasmaShellSurface with Role Panel should get focus or not.
+     * Set whether a PlasmaShellSurface should get focus or not.
      *
-     * By default a Panel does not take focus. With this request the compositor
-     * can be instructed to also pass focus to a panel
+     * By default some roles do not take focus. With this request the compositor
+     * can be instructed to also pass focus.
      *
-     * @param takesFocus Set to @c true if the Panel should gain focus.
+     * @param takesFocus Set to @c true if the surface should gain focus.
      * @since 5.28
      **/
+    //KF6 TODO rename to make it generic
     void setPanelTakesFocus(bool takesFocus);
 
 Q_SIGNALS:
diff --git a/src/client/protocols/plasma-shell.xml b/src/client/protocols/plasma-shell.xml
--- a/src/client/protocols/plasma-shell.xml
+++ b/src/client/protocols/plasma-shell.xml
@@ -365,11 +365,9 @@
 
     <request name="set_panel_takes_focus" since="4">
       <description summary="Whether a panel takes focus">
-          By default a org_kde_plasma_surface with role panel does not take focus and cannot be
+          By default various org_kde_plasma_surface roles do not take focus and cannot be
           activated. With this request the compositor can be instructed to pass focus also to this
           org_kde_plasma_surface.
-
-          For org_kde_plasma_surface with another role than panel the request does not have any effect.
       </description>
       <arg name="takes_focus" type="uint" summary="Boolean value that sets whether the panel takes focus"/>
     </request>
diff --git a/src/server/plasmashell_interface.h b/src/server/plasmashell_interface.h
--- a/src/server/plasmashell_interface.h
+++ b/src/server/plasmashell_interface.h
@@ -168,13 +168,14 @@
     void showAutoHidingPanel();
 
     /**
-     * Whether a PlasmaShellSurfaceInterface with Role Panel wants to have focus.
+     * Whether a PlasmaShellSurfaceInterface wants to have focus.
      *
-     * By default a Panel does not get focus, but the PlasmaShellSurfaceInterface can
+     * By default some PlasmaShell roles do not get focus, but the PlasmaShellSurfaceInterface can
      * request that it wants to have focus. The compositor can use this information to
-     * pass focus to the panel.
+     * pass focus to the surface.
      * @since 5.28
      **/
+    //TODO KF6 rename to something generic
     bool panelTakesFocus() const;
 
     /**