diff --git a/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java b/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java
index 51d4faa832b..6cedb08de11 100644
--- a/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java
+++ b/base/ca/src/main/java/org/dogtagpki/server/ca/CAWebListener.java
@@ -7,10 +7,10 @@
 
 import javax.servlet.annotation.WebListener;
 
-import com.netscape.cmscore.apps.PKIWebListener;
+import com.netscape.cmscore.apps.CMSWebListener;
 
 @WebListener
-public class CAWebListener extends PKIWebListener {
+public class CAWebListener extends CMSWebListener {
 
     public CAEngine createEngine() {
         return new CAEngine();
diff --git a/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java b/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java
index 2b1d0361d7c..49d566f4630 100644
--- a/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java
+++ b/base/kra/src/main/java/org/dogtagpki/server/kra/KRAWebListener.java
@@ -7,10 +7,10 @@
 
 import javax.servlet.annotation.WebListener;
 
-import com.netscape.cmscore.apps.PKIWebListener;
+import com.netscape.cmscore.apps.CMSWebListener;
 
 @WebListener
-public class KRAWebListener extends PKIWebListener {
+public class KRAWebListener extends CMSWebListener {
 
     public KRAEngine createEngine() {
         return new KRAEngine();
diff --git a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java
index d971d9e0ef6..2ff33ce1b9a 100644
--- a/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java
+++ b/base/ocsp/src/main/java/org/dogtagpki/server/ocsp/OCSPWebListener.java
@@ -7,10 +7,10 @@
 
 import javax.servlet.annotation.WebListener;
 
-import com.netscape.cmscore.apps.PKIWebListener;
+import com.netscape.cmscore.apps.CMSWebListener;
 
 @WebListener
-public class OCSPWebListener extends PKIWebListener {
+public class OCSPWebListener extends CMSWebListener {
 
     public OCSPEngine createEngine() {
         return new OCSPEngine();
diff --git a/base/server/src/main/java/com/netscape/cmscore/apps/PKIWebListener.java b/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java
similarity index 94%
rename from base/server/src/main/java/com/netscape/cmscore/apps/PKIWebListener.java
rename to base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java
index 16bde90ddec..f36417417a2 100644
--- a/base/server/src/main/java/com/netscape/cmscore/apps/PKIWebListener.java
+++ b/base/server/src/main/java/com/netscape/cmscore/apps/CMSWebListener.java
@@ -13,9 +13,9 @@
 import com.netscape.cms.realm.PKIRealm;
 import com.netscape.cms.tomcat.ProxyRealm;
 
-public abstract class PKIWebListener implements ServletContextListener {
+public abstract class CMSWebListener implements ServletContextListener {
 
-    public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(PKIWebListener.class);
+    public static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CMSWebListener.class);
 
     public abstract CMSEngine createEngine();
 
diff --git a/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java b/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java
index 2f12bff4a73..283586c4222 100644
--- a/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java
+++ b/base/tks/src/main/java/org/dogtagpki/server/tks/TKSWebListener.java
@@ -7,10 +7,10 @@
 
 import javax.servlet.annotation.WebListener;
 
-import com.netscape.cmscore.apps.PKIWebListener;
+import com.netscape.cmscore.apps.CMSWebListener;
 
 @WebListener
-public class TKSWebListener extends PKIWebListener {
+public class TKSWebListener extends CMSWebListener {
 
     public TKSEngine createEngine() {
         return new TKSEngine();
diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java
index ce69fdcffe6..7b1640b4eab 100644
--- a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java
+++ b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSWebListener.java
@@ -7,10 +7,10 @@
 
 import javax.servlet.annotation.WebListener;
 
-import com.netscape.cmscore.apps.PKIWebListener;
+import com.netscape.cmscore.apps.CMSWebListener;
 
 @WebListener
-public class TPSWebListener extends PKIWebListener {
+public class TPSWebListener extends CMSWebListener {
 
     public TPSEngine createEngine() {
         return new TPSEngine();