diff --git a/kscreen6/kscreen6.spec b/kscreen6/kscreen6.spec
index 4fa5a52..4aef417 100644
--- a/kscreen6/kscreen6.spec
+++ b/kscreen6/kscreen6.spec
@@ -5,9 +5,7 @@
 %define kf6_version 6.18.0
 %define qt6_version 6.9.0
 
-%define rname kscreen
-
-Name:           kscreen6
+Name:           kscreen
 Version:        6.5.5
 Release:        0
 # Full Plasma 6 version (e.g. 6.0.0)
@@ -17,7 +15,7 @@ Release:        0
 Summary:        Screen management software by KDE
 License:        GPL-2.0-or-later
 URL:            https://www.kde.org
-Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires:  fdupes
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
@@ -45,22 +43,22 @@ BuildRequires:  pkgconfig(wayland-client) >= 1.9
 BuildRequires:  pkgconfig(xcb-atom)
 BuildRequires:  pkgconfig(xi)
 Requires:       kf6-kded
-Requires:       libkscreen6-plugin >= %{_plasma6_bugfix}
+Requires:       libkscreen-plugin >= %{_plasma6_bugfix}
 # For graz.avif
 Requires:       kf6-kimageformats
 Requires:       xrdb
-Supplements:    (libkscreen6-plugin and plasma-workspace)
+Supplements:    (libkscreen-plugin and plasma-workspace)
 Obsoletes:      kscreen5 < %{version}
 Obsoletes:      kscreen5-lang < %{version}
 Obsoletes:      kscreen5-plasmoid < %{version}
-Provides:       kscreen6-plasmoid < %{version}
-Obsoletes:      kscreen6-plasmoid < %{version}
+Provides:       kscreen-plasmoid < %{version}
+Obsoletes:      kscreen-plasmoid < %{version}
 
 %description
 KScreen handles screen management for both X11 and Wayland sessions, including rotation, size, refresh rate, and scaling.
 
 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %cmake_kf6
diff --git a/libkscreen6/libkscreen6.spec b/libkscreen6/libkscreen6.spec
index 94d6e24..2d632dd 100644
--- a/libkscreen6/libkscreen6.spec
+++ b/libkscreen6/libkscreen6.spec
@@ -3,20 +3,20 @@
 %define kf6_version 6.18.0
 %define qt6_version 6.9.0
 
-
-%define rname libkscreen
 %define sover   8
-Name:           libkscreen6
-Version:        6.5.5
-Release:        0
+
 # Full Plasma 6 version (e.g. 6.0.0)
 %{!?_plasma6_bugfix: %define _plasma6_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 6.0 in KF6, but 6.0.80 in KUF)
 %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}
+
+Name:           libkscreen
+Version:        6.5.5
+Release:        0
 Summary:        Plasma screen management library
 License:        GPL-2.0-or-later
 URL:            https://www.kde.org
-Source:         https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -62,7 +62,7 @@ Requires:       cmake(Qt6Core) >= %{qt6_version}
 Development files belonging to libkscreen, dynamic display management in Plasma
 
 %prep
-%autosetup -p1 -n %{rname}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %cmake_kf6 -DBUILD_QCH:BOOL=TRUE
diff --git a/plasma6-workspace/plasma6-workspace.spec b/plasma6-workspace/plasma6-workspace.spec
index 0dd8865..34164f1 100644
--- a/plasma6-workspace/plasma6-workspace.spec
+++ b/plasma6-workspace/plasma6-workspace.spec
@@ -168,10 +168,10 @@ Requires:       kf6-kded
 Requires:       kf6-kquickcharts
 Requires:       kglobalacceld6 >= %{_plasma6_bugfix}
 Requires:       kirigami-addons >= 0.10.0
-Requires:       kscreen6 >= %{_plasma6_bugfix}
+Requires:       kscreen >= %{_plasma6_bugfix}
 Requires:       kscreenlocker >= %{_plasma6_bugfix}
 Requires:       kwin >= %{_plasma6_bugfix}
-Requires:       libkscreen6-plugin >= %{_plasma6_bugfix}
+Requires:       libkscreen-plugin >= %{_plasma6_bugfix}
 Requires:       qt6-qtpositioning >= %{qt6_version}
 Requires:       qt6-qttools
 # heavily used by plasma