diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index 96c8b15..05a1c01 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -42,14 +42,14 @@
 %global tcuid 91
 
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
-%global basedir %{_var}/lib/%{name}
+%global basedir %{_var}/lib/tomcat
 %global appdir %{basedir}/webapps
-%global homedir %{_datadir}/%{name}
+%global homedir %{_datadir}/tomcat
 %global bindir %{homedir}/bin
-%global confdir %{_sysconfdir}/%{name}
-%global libdir %{_javadir}/%{name}
-%global logdir %{_var}/log/%{name}
-%global cachedir %{_var}/cache/%{name}
+%global confdir %{_sysconfdir}/tomcat
+%global libdir %{_javadir}/tomcat
+%global logdir %{_var}/log/tomcat
+%global cachedir %{_var}/cache/tomcat
 %global tempdir %{cachedir}/temp
 %global workdir %{cachedir}/work
 %global _initrddir %{_sysconfdir}/init.d
@@ -66,12 +66,12 @@ URL:           http://tomcat.apache.org/
 
 #Source0:       http://www.apache.org/dist/tomcat/tomcat-%%{major_version}/v%%{version}/src/%%{packdname}.tar.gz
 Source0:       tomcat-9.0.7.redhat-10-src.zip
-Source1:       %{name}-%{major_version}.%{minor_version}.conf
-Source3:       %{name}-%{major_version}.%{minor_version}.sysconfig
-Source4:       %{name}-%{major_version}.%{minor_version}.wrapper
-Source6:       %{name}-%{major_version}.%{minor_version}-digest.script
-Source7:       %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
-Source8:       %{name}-%{major_version}.%{minor_version}.service
+Source1:       tomcat-%{major_version}.%{minor_version}.conf
+Source3:       tomcat-%{major_version}.%{minor_version}.sysconfig
+Source4:       tomcat-%{major_version}.%{minor_version}.wrapper
+Source6:       tomcat-%{major_version}.%{minor_version}-digest.script
+Source7:       tomcat-%{major_version}.%{minor_version}-tool-wrapper.script
+Source8:       tomcat-%{major_version}.%{minor_version}.service
 Source9:       servlet-api-OSGi-MANIFEST.MF
 Source11:      jsp-api-OSGi-MANIFEST.MF
 Source12:      el-api-OSGi-MANIFEST.MF
@@ -84,9 +84,9 @@ Source30:      tomcat-preamble
 Source31:      tomcat-server
 Source32:      tomcat-named.service
 
-Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
-Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-Patch2:        %{name}-8.0.36-CompilerOptionsV9.patch
+Patch0:        tomcat-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
+Patch1:        tomcat-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
+Patch2:        tomcat-8.0.36-CompilerOptionsV9.patch
 Patch3:        disableJavadocFailOnWarning.patch
 
 BuildArch:     noarch
@@ -126,14 +126,14 @@ Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
 # added after log4j sub-package was removed
-Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
+Provides:         tomcat-log4j = %{epoch}:%{version}-%{release}
 
 # Leftover requires/provides from removing the subpackages
 # they still apply in instances where the old version is installed.
 
 #%%package jsp-%%{jspspec}-api
 Provides: jsp = %{jspspec}
-Obsoletes: %{name}-jsp-2.2-api
+Obsoletes: tomcat-jsp-2.2-api
 
 #%%package lib
 Requires: ecj >= 1:4.6.3
@@ -141,7 +141,7 @@ Requires(preun): coreutils
 
 #%%package el-%%{elspec}-api
 Provides: el_api = %{elspec}
-Obsoletes: %{name}-el-2.2-api
+Obsoletes: tomcat-el-2.2-api
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -159,7 +159,7 @@ Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
 Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
-Obsoletes: %{name}-servlet-3.1-api
+Obsoletes: tomcat-servlet-3.1-api
 Requires(post): chkconfig
 Requires(postun): chkconfig
 
@@ -252,7 +252,7 @@ zip output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
 %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}/tomcat
 
 # move things into place
 # First copy supporting libs to tomcat lib
@@ -265,48 +265,48 @@ popd
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
-    > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
+    > ${RPM_BUILD_ROOT}%{confdir}/tomcat.conf
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
-    > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
+    > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/tomcat
 %{__install} -m 0644 %{SOURCE4} \
-    ${RPM_BUILD_ROOT}%{_sbindir}/%{name}
+    ${RPM_BUILD_ROOT}%{_sbindir}/tomcat
 %{__install} -m 0644 %{SOURCE8} \
-    ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
+    ${RPM_BUILD_ROOT}%{_unitdir}/tomcat.service
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
-    > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
+    > ${RPM_BUILD_ROOT}%{_bindir}/tomcat-digest
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
    -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
    -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
-    > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
+    > ${RPM_BUILD_ROOT}%{_bindir}/tomcat-tool-wrapper
 
 %{__install} -m 0644 %{SOURCE21} \
-    ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/functions
+    ${RPM_BUILD_ROOT}%{_libexecdir}/tomcat/functions
 %{__install} -m 0755 %{SOURCE30} \
-    ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/preamble
+    ${RPM_BUILD_ROOT}%{_libexecdir}/tomcat/preamble
 %{__install} -m 0755 %{SOURCE31} \
-    ${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/server
+    ${RPM_BUILD_ROOT}%{_libexecdir}/tomcat/server
 %{__install} -m 0644 %{SOURCE32} \
-    ${RPM_BUILD_ROOT}%{_unitdir}/%{name}@.service
+    ${RPM_BUILD_ROOT}%{_unitdir}/tomcat@.service
 
 # Substitute libnames in catalina-tasks.xml
 sed -i \
-   "s,el-api.jar,%{name}-el-%{elspec}-api.jar,;
-    s,servlet-api.jar,%{name}-servlet-%{servletspec}-api.jar,;
-    s,jsp-api.jar,%{name}-jsp-%{jspspec}-api.jar,;" \
+   "s,el-api.jar,tomcat-el-%{elspec}-api.jar,;
+    s,servlet-api.jar,tomcat-servlet-%{servletspec}-api.jar,;
+    s,jsp-api.jar,tomcat-jsp-%{jspspec}-api.jar,;" \
     ${RPM_BUILD_ROOT}%{bindir}/catalina-tasks.xml
 
 # create jsp and servlet API symlinks
 pushd ${RPM_BUILD_ROOT}%{_javadir}
-   %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api.jar
-   %{__ln_s} %{name}-jsp-%{jspspec}-api.jar %{name}-jsp-api.jar
-   %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api.jar
-   %{__ln_s} %{name}-servlet-%{servletspec}-api.jar %{name}-servlet-api.jar
-   %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api.jar
-   %{__ln_s} %{name}-el-%{elspec}-api.jar %{name}-el-api.jar
+   %{__mv} tomcat/jsp-api.jar tomcat-jsp-%{jspspec}-api.jar
+   %{__ln_s} tomcat-jsp-%{jspspec}-api.jar tomcat-jsp-api.jar
+   %{__mv} tomcat/servlet-api.jar tomcat-servlet-%{servletspec}-api.jar
+   %{__ln_s} tomcat-servlet-%{servletspec}-api.jar tomcat-servlet-api.jar
+   %{__mv} tomcat/el-api.jar tomcat-el-%{elspec}-api.jar
+   %{__ln_s} tomcat-el-%{elspec}-api.jar tomcat-el-api.jar
 popd
 
 pushd output/build
@@ -316,9 +316,9 @@ popd
 
 pushd ${RPM_BUILD_ROOT}%{libdir}
     # symlink JSP and servlet API jars
-    %{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar .
-    %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
-    %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
+    %{__ln_s} ../../java/tomcat-jsp-%{jspspec}-api.jar .
+    %{__ln_s} ../../java/tomcat-servlet-%{servletspec}-api.jar .
+    %{__ln_s} ../../java/tomcat-el-%{elspec}-api.jar .
     %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
     %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
     %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar
@@ -348,17 +348,17 @@ done
 
 # we won't install dbcp, juli-adapters and juli-extras pom files
 for libname in annotations-api catalina jasper-el jasper catalina-ha; do
-    %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom
-    %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar
+    %{__cp} -a tomcat-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-$libname.pom
+    %add_maven_depmap JPP.tomcat-$libname.pom tomcat/$libname.jar
 done
 
 # tomcat-util-scan
-%{__cp} -a %{name}-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-util-scan.pom
-%add_maven_depmap JPP.%{name}-util-scan.pom %{name}/%{name}-util-scan.jar
+%{__cp} -a tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-util-scan.pom
+%add_maven_depmap JPP.tomcat-util-scan.pom tomcat/tomcat-util-scan.jar
 
 # tomcat-jni
-%{__cp} -a %{name}-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jni.pom
-%add_maven_depmap JPP.%{name}-jni.pom %{name}/%{name}-jni.jar
+%{__cp} -a tomcat-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-jni.pom
+%add_maven_depmap JPP.tomcat-jni.pom tomcat/tomcat-jni.jar
 
 # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
 %{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
@@ -377,35 +377,35 @@ done
 %{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
 
 # two special pom where jar files have different names
-%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
-%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
+%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-catalina-tribes.pom
+%add_maven_depmap JPP.tomcat-catalina-tribes.pom tomcat/catalina-tribes.jar
 
-%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
-%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar
+%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-coyote.pom
+%add_maven_depmap JPP.tomcat-tomcat-coyote.pom tomcat/tomcat-coyote.jar
 
-%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
-%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
+%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-juli.pom
+%add_maven_depmap JPP.tomcat-tomcat-juli.pom tomcat/tomcat-juli.jar
 
-%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
-%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar
+%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-api.pom
+%add_maven_depmap JPP.tomcat-tomcat-api.pom tomcat/tomcat-api.jar
 
-%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
-%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
+%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-util.pom
+%add_maven_depmap JPP.tomcat-tomcat-util.pom tomcat/tomcat-util.jar
 
-%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
+%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-jdbc.pom
+%add_maven_depmap JPP.tomcat-tomcat-jdbc.pom tomcat/tomcat-jdbc.jar
 
 # tomcat-websocket-api
-%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
-%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
+%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-websocket-api.pom
+%add_maven_depmap JPP.tomcat-websocket-api.pom tomcat/websocket-api.jar
 
 # tomcat-tomcat-websocket
-%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
-%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar
+%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-websocket.pom
+%add_maven_depmap JPP.tomcat-tomcat-websocket.pom tomcat/tomcat-websocket.jar
 
 # tomcat-jaspic-api
-%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom
-%add_maven_depmap JPP.%{name}-jaspic-api.pom %{name}/jaspic-api.jar
+%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-jaspic-api.pom
+%add_maven_depmap JPP.tomcat-jaspic-api.pom tomcat/jaspic-api.jar
 
 
 %pre
@@ -416,48 +416,48 @@ done
 
 %post
 # install but don't activate
-%systemd_post %{name}.service
+%systemd_post tomcat.service
 
 # Collapse all of the alternatives installations into one
 %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
-    %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
+    %{_javadir}/tomcat-jsp-%{jspspec}-api.jar 20200
 %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
-    %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
+    %{_javadir}/tomcat-servlet-%{servletspec}-api.jar 30000
 %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
-   %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
+   %{_javadir}/tomcat-el-%{elspec}-api.jar 20300
 
 %preun
 # clean tempdir and workdir on removal or upgrade
 %{__rm} -rf %{workdir}/* %{tempdir}/*
-%systemd_preun %{name}.service
+%systemd_preun tomcat.service
 
 %postun
-%systemd_postun_with_restart %{name}.service 
+%systemd_postun_with_restart tomcat.service
 
 # Collapse all of the alternatives removals into one
 if [ "$1" = "0" ]; then
     %{_sbindir}/update-alternatives --remove jsp \
-        %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+        %{_javadir}/tomcat-jsp-%{jspspec}-api.jar
     %{_sbindir}/update-alternatives --remove servlet \
-        %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+        %{_javadir}/tomcat-servlet-%{servletspec}-api.jar
     %{_sbindir}/update-alternatives --remove elspec \
-        %{_javadir}/%{name}-el-%{elspec}-api.jar
+        %{_javadir}/tomcat-el-%{elspec}-api.jar
 fi
 
 %files 
 %defattr(0664,root,tomcat,0755)
 %doc {LICENSE,NOTICE,RELEASE*}
-%attr(0755,root,root) %{_bindir}/%{name}-digest
-%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
-%attr(0755,root,root) %{_sbindir}/%{name}
-%attr(0644,root,root) %{_unitdir}/%{name}.service
-%attr(0644,root,root) %{_unitdir}/%{name}@.service
-%attr(0755,root,root) %dir %{_libexecdir}/%{name}
+%attr(0755,root,root) %{_bindir}/tomcat-digest
+%attr(0755,root,root) %{_bindir}/tomcat-tool-wrapper
+%attr(0755,root,root) %{_sbindir}/tomcat
+%attr(0644,root,root) %{_unitdir}/tomcat.service
+%attr(0644,root,root) %{_unitdir}/tomcat@.service
+%attr(0755,root,root) %dir %{_libexecdir}/tomcat
 %attr(0755,root,root) %dir %{_localstatedir}/lib/tomcats
-%attr(0644,root,root) %{_libexecdir}/%{name}/functions
-%attr(0755,root,root) %{_libexecdir}/%{name}/preamble
-%attr(0755,root,root) %{_libexecdir}/%{name}/server
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%attr(0644,root,root) %{_libexecdir}/tomcat/functions
+%attr(0755,root,root) %{_libexecdir}/tomcat/preamble
+%attr(0755,root,root) %{_libexecdir}/tomcat/server
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/tomcat
 %attr(0755,root,tomcat) %dir %{basedir}
 %attr(0755,root,tomcat) %dir %{confdir}
 
@@ -475,7 +475,7 @@ fi
 %attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
 %attr(0755,root,tomcat) %dir %{confdir}/conf.d
 %{confdir}/conf.d/README
-%config(noreplace) %{confdir}/%{name}.conf
+%config(noreplace) %{confdir}/tomcat.conf
 %config(noreplace) %{confdir}/*.policy
 %config(noreplace) %{confdir}/*.properties
 %config(noreplace) %{confdir}/context.xml
@@ -500,30 +500,30 @@ fi
 %{libdir}/*.jar
 %{_javadir}/*.jar
 %{bindir}/tomcat-juli.jar
-%{_mavenpomdir}/JPP.%{name}-annotations-api.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
-%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
-%{_mavenpomdir}/JPP.%{name}-catalina.pom
-%{_mavenpomdir}/JPP.%{name}-jasper-el.pom
-%{_mavenpomdir}/JPP.%{name}-jasper.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
-%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
-%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom
-%{_mavenpomdir}/JPP.%{name}-jni.pom
-%{_mavenpomdir}/JPP.%{name}-util-scan.pom
-%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
-%{_mavenpomdir}/JPP-%{name}-el-api.pom
+%{_mavenpomdir}/JPP.tomcat-annotations-api.pom
+%{_mavenpomdir}/JPP.tomcat-catalina-ha.pom
+%{_mavenpomdir}/JPP.tomcat-catalina-tribes.pom
+%{_mavenpomdir}/JPP.tomcat-catalina.pom
+%{_mavenpomdir}/JPP.tomcat-jasper-el.pom
+%{_mavenpomdir}/JPP.tomcat-jasper.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-api.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-juli.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-coyote.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-util.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-jdbc.pom
+%{_mavenpomdir}/JPP.tomcat-websocket-api.pom
+%{_mavenpomdir}/JPP.tomcat-tomcat-websocket.pom
+%{_mavenpomdir}/JPP.tomcat-jaspic-api.pom
+%{_mavenpomdir}/JPP.tomcat-jni.pom
+%{_mavenpomdir}/JPP.tomcat-util-scan.pom
+%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
+%{_mavenpomdir}/JPP-tomcat-el-api.pom
 %{_datadir}/maven-metadata/tomcat.xml
 
 %files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/%{name}-servlet-%{servletspec}*.jar
+%{_javadir}/tomcat-servlet-%{servletspec}*.jar
 
 %changelog
 * Fri Jun 08 2018 Coty Sutherland <csutherl@redhat.com> 9.0.7-1