diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index 05a1c01..e70f0e9 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -55,7 +55,7 @@
 %global _initrddir %{_sysconfdir}/init.d
 %global _systemddir /lib/systemd/system
 
-Name:          tomcat
+Name:          pki-servlet-container
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
 Release:       1%{?dist}
@@ -153,7 +153,7 @@ Tomcat is developed in an open and participatory environment and
 released under the Apache Software License version 2.0. Tomcat is intended
 to be a collaboration of the best-of-breed developers from around the world.
 
-%package servlet-%{servletspec}-api
+%package -n pki-servlet-%{servletspec}-api
 Group: Development/Libraries
 Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
 Provides: servlet = %{servletspec}
@@ -163,7 +163,7 @@ Obsoletes: tomcat-servlet-3.1-api
 Requires(post): chkconfig
 Requires(postun): chkconfig
 
-%description servlet-%{servletspec}-api
+%description -n pki-servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
 
 %prep
@@ -407,6 +407,9 @@ done
 %{__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
 
+# Manually change the metadata filenames
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/%{name}.xml ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/tomcat.xml
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/tomcat-servlet-api.xml
 
 %pre
 # add the tomcat user and group
@@ -519,11 +522,14 @@ fi
 %{_mavenpomdir}/JPP-tomcat-jsp-api.pom
 %{_mavenpomdir}/JPP-tomcat-el-api.pom
 %{_datadir}/maven-metadata/tomcat.xml
+%exclude %{_javadir}/tomcat-servlet-%{servletspec}*.jar
 
-%files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api
+%files -n pki-servlet-%{servletspec}-api
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/tomcat-servlet-%{servletspec}*.jar
+%{_datadir}/maven-metadata/tomcat-servlet-api.xml
+%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
 
 %changelog
 * Fri Jun 08 2018 Coty Sutherland <csutherl@redhat.com> 9.0.7-1