diff --git a/.gitignore b/.gitignore
index 270c892..aec403c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-8.0.0-alpha1.tar.gz
 /tomcatjss-8.0.0.tar.gz
 /tomcatjss-8.2.0-beta1.tar.gz
+/tomcatjss-8.2.0-beta2.tar.gz
diff --git a/sources b/sources
index 068c527..e34ac22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-8.2.0-beta1.tar.gz) = 1dd8b48dce35d9f37f8ef10b65d815ae894dc225edbab9d2a4bc229c0ceee6768bbb081ed59fbb50632ed3844e5565329ccf62cc66201bfa1f0149b12fb25372
+SHA512 (tomcatjss-8.2.0-beta2.tar.gz) = 15a9a74045b73275a4aa8f3abb32919e77e296bbeae4e7be88250d09f8a0eea499062997afe59945c7f2e51bf6b84d108b0b5ef26c691f03d1e2d6253381f9d2
diff --git a/tomcatjss.spec b/tomcatjss.spec
index d4c2e5c..162f760 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -2,16 +2,33 @@
 Name:             tomcatjss
 ################################################################################
 
+%global           product_id idm-tomcatjss
+
+# Upstream version number:
+%global           major_version 8
+%global           minor_version 2
+%global           update_version 0
+
+# Downstream release number:
+# - development/stabilization (unsupported): 0.<n> where n >= 1
+# - GA/update (supported): <n> where n >= 1
+%global           release_number 0.3
+
+# Development phase:
+# - development (unsupported): alpha<n> where n >= 1
+# - stabilization (unsupported): beta<n> where n >= 1
+# - GA/update (supported): <none>
+%global           phase beta2
+
+%undefine         timestamp
+%undefine         commit_id
+
 Summary:          JSS Connector for Apache Tomcat
 URL:              https://www.dogtagpki.org/wiki/Tomcat_JSS
 License:          LGPLv2+
 BuildArch:        noarch
-
-# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
-# For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          8.2.0
-Release:          0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
-%global           _phase -beta1
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -21,7 +38,7 @@ Release:          0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
 #     --prefix tomcatjss-VERSION/ \
 #     -o tomcatjss-VERSION.tar.gz \
 #     <version tag>
-Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
+Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?phase:-}%{?phase}/tomcatjss-%{version}%{?phase:-}%{?phase}.tar.gz
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -66,10 +83,18 @@ BuildRequires:    pki-servlet-engine >= 1:9.0.7
 BuildRequires:    tomcat >= 1:9.0.7
 %endif
 
+%description
+JSS Connector for Apache Tomcat, installed via the tomcatjss package,
+is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+uses Java Security Services (JSS), a Java interface to Network Security
+Services (NSS).
+
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          JSS Connector for Apache Tomcat
+
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -89,9 +114,8 @@ Requires:         pki-servlet-engine >= 1:9.0.7
 Requires:         tomcat >= 1:9.0.7
 %endif
 
-%if "%{name}" != "tomcatjss"
+Obsoletes:        tomcatjss < %{version}-%{release}
 Provides:         tomcatjss = %{version}-%{release}
-%endif
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -102,7 +126,7 @@ Conflicts:        pki-base < 10.10.0
 %define           _sharedstatedir    /var/lib
 %endif
 
-%description
+%description -n %{product_id}
 JSS Connector for Apache Tomcat, installed via the tomcatjss package,
 is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
 uses Java Security Services (JSS), a Java interface to Network Security
@@ -112,7 +136,7 @@ Services (NSS).
 %prep
 ################################################################################
 
-%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
+%autosetup -n tomcatjss-%{version}%{?phase:-}%{?phase} -p 1
 
 ################################################################################
 %build
@@ -120,7 +144,7 @@ Services (NSS).
 
 ./build.sh \
     %{?_verbose:-v} \
-    --name=%{name} \
+    --name=%{product_id} \
     --work-dir=%{_vpath_builddir} \
     --version=%{version} \
     --jni-dir=%{_jnidir} \
@@ -132,7 +156,7 @@ Services (NSS).
 
 ./build.sh \
     %{?_verbose:-v} \
-    --name=%{name} \
+    --name=%{product_id} \
     --work-dir=%{_vpath_builddir} \
     --version=%{version} \
     --java-dir=%{_javadir} \
@@ -141,7 +165,7 @@ Services (NSS).
     install
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
 %license LICENSE
@@ -153,6 +177,10 @@ Services (NSS).
 
 ################################################################################
 %changelog
+* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.3.beta2
+- Rebase to Tomcat JSS 8.2.0-beta2
+- Rename packages to idm-tomcatjss
+
 * Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.2.beta1
 - Rebase to Tomcat JSS 8.2.0-beta1