diff --git a/python-ruamel-yaml-clib.spec b/python-ruamel-yaml-clib.spec
index 8e88ae4..8844299 100644
--- a/python-ruamel-yaml-clib.spec
+++ b/python-ruamel-yaml-clib.spec
@@ -1,8 +1,6 @@
-%global pypi_name ruamel.yaml.clib
-%global pname ruamel-yaml-clib
-%global hash 85e484db2b7c37107e4edd2ae6fc380877bbc08e
+%global commit 85e484db2b7c37107e4edd2ae6fc380877bbc08e
 
-Name:           python-%{pname}
+Name:           python-ruamel-yaml-clib
 Version:        0.2.6
 Release:        5%{?dist}
 Summary:        C version of reader, parser and emitter for ruamel.yaml derived from libyaml
@@ -10,7 +8,7 @@ Summary:        C version of reader, parser and emitter for ruamel.yaml derived 
 # SPDX
 License:        MIT
 URL:            https://bitbucket.org/ruamel/yaml.clib
-Source0:        https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml-clib/code/ruamel-yaml-clib-code-%{hash}.zip
+Source0:        https://sourceforge.net/code-snapshots/hg/r/ru/ruamel-yaml-clib/code/ruamel-yaml-clib-code-%{commit}.zip
 Patch0:         fix-typecasts-s390x.patch
 
 BuildRequires:  gcc
@@ -19,7 +17,7 @@ BuildRequires:  libyaml-devel
 %description
 It is the C based reader/scanner and emitter for ruamel.yaml.
 
-%package -n     python3-%{pname}
+%package -n     python3-ruamel-yaml-clib
 Summary:        %{summary}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -28,11 +26,11 @@ BuildRequires:  python3-Cython
 Requires:       python3-setuptools
 Requires:       python3-ruamel-yaml
 
-%description -n python3-%{pname}
+%description -n python3-ruamel-yaml-clib
 It is the C based reader/scanner and emitter for ruamel.yaml.
 
 %prep
-%autosetup -n %{pname}-code-%{hash}
+%autosetup -n ruamel-yaml-clib-code-%{commit}
 # Force regenerating C files from Cython sources
 rm -v $(grep -rl '/\* Generated by Cython')
 
@@ -47,17 +45,18 @@ rmdir ruamel.yaml.clib
 %py3_build
 
 %install
-%{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT
+%{python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT
 
-%files -n python3-%{pname}
+%files -n python3-ruamel-yaml-clib
 %license LICENSE
 %doc README.rst
 %{python3_sitearch}/_ruamel_yaml.cpython-*
-%{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+%{python3_sitearch}/ruamel.yaml.clib-%{version}-py%{python3_version}.egg-info
 
 %changelog
 * Wed May 03 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 0.2.6-5
 - Confirm License is SPDX MIT
+- Reduce macro indirection, etc.
 
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild