diff --git a/resteasy.spec b/resteasy.spec
index b74dbb1..6081b1e 100644
--- a/resteasy.spec
+++ b/resteasy.spec
@@ -1,13 +1,13 @@
 %global namedreltag .Final
 %global namedversion %{version}%{namedreltag}
 
-Name:           pki-resteasy
+Name:           resteasy
 Version:        3.0.26
 Release:        9%{?dist}
 Summary:        Framework for RESTful Web services and Java applications
 License:        ASL 2.0 and CDDL
 URL:            http://resteasy.jboss.org/
-Source0:        https://github.com/resteasy/Resteasy/archive/%{namedversion}/resteasy-%{namedversion}.tar.gz
+Source0:        https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
 Patch1:         0001-RESTEASY-2559-Improper-validation-of-response-header.patch
 
 BuildArch:      noarch
@@ -35,24 +35,6 @@ BuildRequires:  mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_sp
 BuildRequires:  mvn(org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 
-Requires:       %{name}-atom-provider     = %{version}-%{release}
-Requires:       %{name}-client            = %{version}-%{release}
-Requires:       %{name}-core              = %{version}-%{release}
-Requires:       %{name}-jackson2-provider = %{version}-%{release}
-Requires:       %{name}-jaxb-provider     = %{version}-%{release}
-
-# subpackages removed in fedora 32
-Obsoletes:      resteasy-fastinfoset-provider < 3.0.26-1
-Obsoletes:      resteasy-jackson-provider < 3.0.26-1
-Obsoletes:      resteasy-jettison-provider < 3.0.26-1
-Obsoletes:      resteasy-json-p-provider < 3.0.26-1
-Obsoletes:      resteasy-multipart-provider < 3.0.26-1
-Obsoletes:      resteasy-netty3 < 3.0.26-1
-Obsoletes:      resteasy-optional < 3.0.26-1
-Obsoletes:      resteasy-test < 3.0.26-1
-Obsoletes:      resteasy-validator-provider-11 < 3.0.26-1
-Obsoletes:      resteasy-yaml-provider < 3.0.26-1
-
 %description
 %global desc \
 RESTEasy contains a JBoss project that provides frameworks to help\
@@ -63,47 +45,72 @@ certified and portable implementation of the JAX-RS specification.
 \
 This package contains
 
-%package        javadoc
-Summary:        Javadoc for %{name}
-Provides:       resteasy-javadoc
+%package -n     pki-%{name}
+Summary:        Framework for RESTful Web services and Java applications
+Provides:       %{name}
 
-%description    javadoc
+Requires:       pki-%{name}-atom-provider     = %{version}-%{release}
+Requires:       pki-%{name}-client            = %{version}-%{release}
+Requires:       pki-%{name}-core              = %{version}-%{release}
+Requires:       pki-%{name}-jackson2-provider = %{version}-%{release}
+Requires:       pki-%{name}-jaxb-provider     = %{version}-%{release}
+
+# subpackages removed in fedora 32
+Obsoletes:      %{name}-fastinfoset-provider < 3.0.26-1
+Obsoletes:      %{name}-jackson-provider < 3.0.26-1
+Obsoletes:      %{name}-jettison-provider < 3.0.26-1
+Obsoletes:      %{name}-json-p-provider < 3.0.26-1
+Obsoletes:      %{name}-multipart-provider < 3.0.26-1
+Obsoletes:      %{name}-netty3 < 3.0.26-1
+Obsoletes:      %{name}-optional < 3.0.26-1
+Obsoletes:      %{name}-test < 3.0.26-1
+Obsoletes:      %{name}-validator-provider-11 < 3.0.26-1
+Obsoletes:      %{name}-yaml-provider < 3.0.26-1
+
+%description -n pki-%{name}
+%{desc}
+
+%package -n     pki-%{name}-javadoc
+Summary:        Javadoc for %{name}
+Provides:       %{name}-javadoc
+
+%description -n pki-%{name}-javadoc
 This package contains the API documentation for %{name}.
 
-%package        core
+%package -n     pki-%{name}-core
 Summary:        Core modules for %{name}
 Obsoletes:      resteasy-jaxrs-api < 3.0.7
-Provides:       resteasy-core
+Provides:       %{name}-core
 
-%description    core
+%description -n pki-%{name}-core
 %{extdesc} %{summary}.
 
-%package        atom-provider
+%package -n     pki-%{name}-atom-provider
 Summary:        Module atom-provider for %{name}
-Provides:       resteasy-atom-provider
+Provides:       %{name}-atom-provider
 
-%description    atom-provider
+%description -n pki-%{name}-atom-provider
 %{extdesc} %{summary}.
 
-%package        jackson2-provider
+%package -n     pki-%{name}-jackson2-provider
 Summary:        Module jackson2-provider for %{name}
-Provides:       resteasy-jackson2-provider
+Provides:       %{name}-jackson2-provider
 
-%description    jackson2-provider
+%description -n pki-%{name}-jackson2-provider
 %{extdesc} %{summary}.
 
-%package        jaxb-provider
+%package -n     pki-%{name}-jaxb-provider
 Summary:        Module jaxb-provider for %{name}
-Provides:       resteasy-jaxb-provider
+Provides:       %{name}-jaxb-provider
 
-%description    jaxb-provider
+%description -n pki-%{name}-jaxb-provider
 %{extdesc} %{summary}.
 
-%package        client
+%package -n     pki-%{name}-client
 Summary:        Client for %{name}
-Provides:       resteasy-client
+Provides:       %{name}-client
 
-%description    client
+%description -n pki-%{name}-client
 %{extdesc} %{summary}.
 
 %prep
@@ -194,31 +201,31 @@ find -name '*.jar' -print -delete
 %install
 %mvn_install
 
-%files
+%files -n pki-%{name}
 %doc README.md
 %license License.html
 
-%files core -f .mfiles-core
+%files -n pki-%{name}-core -f .mfiles-core
 %license License.html
 
-%files atom-provider -f .mfiles-atom-provider
+%files -n pki-%{name}-atom-provider -f .mfiles-atom-provider
 %license License.html
 
-%files jackson2-provider -f .mfiles-jackson2-provider
+%files -n pki-%{name}-jackson2-provider -f .mfiles-jackson2-provider
 %license License.html
 
-%files jaxb-provider -f .mfiles-jaxb-provider
+%files -n pki-%{name}-jaxb-provider -f .mfiles-jaxb-provider
 %license License.html
 
-%files client -f .mfiles-client
+%files -n pki-%{name}-client -f .mfiles-client
 %license License.html
 
-%files javadoc -f .mfiles-javadoc
+%files -n pki-%{name}-javadoc -f .mfiles-javadoc
 %license License.html
 
 %changelog
 * Thu Apr 22 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 3.0.26-9
-- Rename package to pki-resteasy
+- Rename subpackages to pki-resteasy
 
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.26-8
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937