diff --git a/python-psutil.spec b/python-psutil.spec
index 008746b..0a4c4a9 100644
--- a/python-psutil.spec
+++ b/python-psutil.spec
@@ -1,14 +1,11 @@
-%global srcname psutil
-%global sum A process and system utilities module for Python
-
-Name:           python-%{srcname}
+Name:           python-psutil
 Version:        5.9.5
 Release:        2%{?dist}
-Summary:        %{sum}
+Summary:        A process and system utilities module for Python
 
 License:        BSD-3-Clause
 URL:            https://github.com/giampaolo/psutil
-Source0:        %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz
+Source0:        %{url}/archive/release-%{version}/psutil-%{version}.tar.gz
 #
 # skip 2 tests that fail in mock chroots
 #
@@ -42,7 +39,7 @@ ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
 
 
 %package -n python%{python3_pkgversion}-psutil
-Summary:        %{sum}
+Summary:        %{summary}
 
 
 %description -n python%{python3_pkgversion}-psutil
@@ -53,14 +50,14 @@ command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
 ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
 
 %package -n python%{python3_pkgversion}-psutil-tests
-Summary:        %{sum}, test suite
+Summary:        %{summary}, test suite
 Requires:       python%{python3_pkgversion}-psutil%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python%{python3_pkgversion}-psutil-tests
 The test suite for psutil.
 
 %prep
-%autosetup -p1 -n %{srcname}-release-%{version}
+%autosetup -p1 -n psutil-release-%{version}
 
 # Remove shebangs
 find psutil -name \*.py | while read file; do
@@ -90,15 +87,15 @@ done
 make test APPVEYOR=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitearch}
 %endif
 
-%files -n python%{python3_pkgversion}-%{srcname}
+%files -n python%{python3_pkgversion}-psutil
 %license LICENSE
 %doc CREDITS HISTORY.rst README.rst
-%{python3_sitearch}/%{srcname}/
-%{python3_sitearch}/%{srcname}-%{version}-py%{python3_version}.egg-info/
-%exclude %{python3_sitearch}/%{srcname}/tests
+%{python3_sitearch}/psutil/
+%{python3_sitearch}/psutil-%{version}-py%{python3_version}.egg-info/
+%exclude %{python3_sitearch}/psutil/tests
 
-%files -n python%{python3_pkgversion}-%{srcname}-tests
-%{python3_sitearch}/%{srcname}/tests/
+%files -n python%{python3_pkgversion}-psutil-tests
+%{python3_sitearch}/psutil/tests/
 
 
 %changelog