diff --git a/resteasy.spec b/resteasy.spec
index 13c6bed..90c5731 100644
--- a/resteasy.spec
+++ b/resteasy.spec
@@ -3,9 +3,9 @@
 
 Name:           resteasy
 Version:        3.0.26
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Framework for RESTful Web services and Java applications
-License:        ASL 2.0 and CDDL
+License:        ASL 2.0
 URL:            http://resteasy.jboss.org/
 Source0:        https://github.com/resteasy/Resteasy/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
 Patch1:         0001-RESTEASY-2559-Improper-validation-of-response-header.patch
@@ -35,11 +35,27 @@ 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:       resteasy-atom-provider     = %{version}-%{release}
-Requires:       resteasy-client            = %{version}-%{release}
-Requires:       resteasy-core              = %{version}-%{release}
-Requires:       resteasy-jackson2-provider = %{version}-%{release}
-Requires:       resteasy-jaxb-provider     = %{version}-%{release}
+%description
+%global desc \
+RESTEasy contains a JBoss project that provides frameworks to help\
+build RESTful Web Services and RESTful Java applications. It is a fully\
+certified and portable implementation of the JAX-RS specification.
+%{desc}
+%global extdesc %{desc}\
+\
+This package contains
+
+%package -n     pki-%{name}
+Summary:        Framework for RESTful Web services and Java applications
+Obsoletes:      %{name} < %{version}-%{release}
+Conflicts:      %{name} < %{version}-%{release}
+Provides:       %{name} = %{version}-%{release}
+
+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
@@ -53,51 +69,62 @@ 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
-%global desc \
-RESTEasy contains a JBoss project that provides frameworks to help\
-build RESTful Web Services and RESTful Java applications. It is a fully\
-certified and portable implementation of the JAX-RS specification.
+%description -n pki-%{name}
 %{desc}
-%global extdesc %{desc}\
-\
-This package contains
 
-%package        javadoc
+%package -n     pki-%{name}-javadoc
 Summary:        Javadoc for %{name}
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
+Conflicts:      %{name}-javadoc < %{version}-%{release}
+Provides:       %{name}-javadoc = %{version}-%{release}
 
-%description    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
+Obsoletes:      %{name}-core < %{version}-%{release}
+Conflicts:      %{name}-core < %{version}-%{release}
+Provides:       %{name}-core = %{version}-%{release}
 
-%description    core
+%description -n pki-%{name}-core
 %{extdesc} %{summary}.
 
-%package        atom-provider
+%package -n     pki-%{name}-atom-provider
 Summary:        Module atom-provider for %{name}
+Obsoletes:      %{name}-atom-provider < %{version}-%{release}
+Conflicts:      %{name}-atom-provider < %{version}-%{release}
+Provides:       %{name}-atom-provider = %{version}-%{release}
 
-%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}
+Obsoletes:      %{name}-jackson2-provider < %{version}-%{release}
+Conflicts:      %{name}-jackson2-provider < %{version}-%{release}
+Provides:       %{name}-jackson2-provider = %{version}-%{release}
 
-%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}
+Obsoletes:      %{name}-jaxb-provider < %{version}-%{release}
+Conflicts:      %{name}-jaxb-provider < %{version}-%{release}
+Provides:       %{name}-jaxb-provider = %{version}-%{release}
 
-%description    jaxb-provider
+%description -n pki-%{name}-jaxb-provider
 %{extdesc} %{summary}.
 
-%package        client
+%package -n     pki-%{name}-client
 Summary:        Client for %{name}
+Obsoletes:      %{name}-client < %{version}-%{release}
+Conflicts:      %{name}-client < %{version}-%{release}
+Provides:       %{name}-client = %{version}-%{release}
 
-%description    client
+%description -n pki-%{name}-client
 %{extdesc} %{summary}.
 
 %prep
@@ -188,29 +215,32 @@ 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
+* Mon May 10 2021 Dogtag PKI Team <pki-devel@redhat.com> - 3.0.26-8
+- Rename subpackages to pki-resteasy
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.26-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild