diff --git a/.classpath b/.classpath
index 9b9b7d5afb2..2f7ba3026f5 100644
--- a/.classpath
+++ b/.classpath
@@ -48,7 +48,7 @@
 	<classpathentry kind="lib" path="/usr/share/java/tomcat/catalina.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-util.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/commons-io.jar"/>
-	<classpathentry kind="lib" path="/usr/lib/java/jss4.jar"/>
+	<classpathentry kind="lib" path="/usr/lib/java/jss.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/tomcatjss.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-api.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-util-scan.jar"/>
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 0058f879c74..0f987bb9891 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -191,7 +191,7 @@ find_file(JAKARTA_ACTIVATION_JAR
 
 find_file(JSS_JAR
     NAMES
-        jss4.jar
+        jss.jar
     PATHS
         ${JAVA_LIB_INSTALL_DIR}
         /usr/share/java
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index 563bce0d457..74d8468a472 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -67,7 +67,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_BASE_JAR} lib/jackson-jaxrs-base.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_JSON_PROVIDER_JAR} lib/jackson-jaxrs-json-provider.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} lib/jackson-module-jaxb-annotations.jar
-    COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} lib/jss4.jar
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} lib/jss.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} lib/ldapjdk.jar
     COMMAND ln -sf /usr/share/java/pki/pki-certsrv.jar ${CMAKE_CURRENT_BINARY_DIR}/lib/pki-certsrv.jar
     COMMAND ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/lib/pki-cmsutil.jar
diff --git a/base/common/examples/java/CAClientExample.java b/base/common/examples/java/CAClientExample.java
index ad77aca07c6..c3db7d8907a 100644
--- a/base/common/examples/java/CAClientExample.java
+++ b/base/common/examples/java/CAClientExample.java
@@ -36,7 +36,7 @@
  * $ pki -c Secret.123 pkcs12-import --pkcs12 &lt;file&gt; --password &lt;password&gt;
  *
  * To compile the program:
- * $ javac -cp "/usr/lib/java/jss4.jar:../../lib/*" CAClientExample.java
+ * $ javac -cp "/usr/lib/java/jss.jar:../../lib/*" CAClientExample.java
  *
  * To run the program:
  * $ java -cp "../../lib/*:." CAClientExample
diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt
index b3d5e5c0573..5e89d7eff27 100644
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
@@ -128,7 +128,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_BASE_JAR} common/lib/jackson-jaxrs-base.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXRS_JSON_PROVIDER_JAR} common/lib/jackson-jaxrs-json-provider.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${JACKSON2_JAXB_ANNOTATIONS_JAR} common/lib/jackson-module-jaxb-annotations.jar
-    COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} common/lib/jss4.jar
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${JSS_JAR} common/lib/jss.jar
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${LDAPJDK_JAR} common/lib/ldapjdk.jar
     COMMAND ln -sf /usr/share/java/pki/pki-cmsutil.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/pki-cmsutil.jar
     COMMAND ln -sf /usr/share/java/pki/pki-tomcat.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/pki-tomcat.jar
diff --git a/base/server/python/pki/server/instance.py b/base/server/python/pki/server/instance.py
index b8f67007573..ad938b841df 100644
--- a/base/server/python/pki/server/instance.py
+++ b/base/server/python/pki/server/instance.py
@@ -328,7 +328,7 @@ def create_libs(self, force=False):
 
         # install PKI libraries in common/lib
         for filename in [
-                'jss4.jar',
+                'jss.jar',
                 'ldapjdk.jar',
                 'pki-cmsutil.jar',
                 'pki-tomcat.jar',
diff --git a/base/symkey/CMakeLists.txt b/base/symkey/CMakeLists.txt
index f7270187212..4dac377f2bc 100644
--- a/base/symkey/CMakeLists.txt
+++ b/base/symkey/CMakeLists.txt
@@ -66,7 +66,7 @@ add_custom_command(
         ${symkey_library_HDRS}
     COMMAND
         ${Java_JAVAC_EXECUTABLE}
-            -classpath ${CMAKE_CURRENT_BINARY_DIR}/classes:${JAVA_LIB_INSTALL_DIR}/jss4.jar
+            -classpath ${CMAKE_CURRENT_BINARY_DIR}/classes:${JAVA_LIB_INSTALL_DIR}/jss.jar
             -h ${CMAKE_CURRENT_BINARY_DIR}
             ${CMAKE_CURRENT_SOURCE_DIR}/src/main/java/com/netscape/symkey/SessionKey.java
 )
diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package
index abc3296413f..25b6a54778a 100755
--- a/scripts/compose_pki_test_package
+++ b/scripts/compose_pki_test_package
@@ -92,7 +92,7 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tks/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps/src
 CLASSPATH=$CLASSPATH:/usr/share/java/junit.jar
 CLASSPATH=$CLASSPATH:`pwd`/src
-CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss4.jar
+CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpcore.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/jackson/jackson-core-asl.jar
diff --git a/scripts/dev_setup b/scripts/dev_setup
index fa4536d42a7..f10894505d6 100755
--- a/scripts/dev_setup
+++ b/scripts/dev_setup
@@ -34,20 +34,20 @@ if [ "${MY_UID}"  != "${ROOTUID}" ] &&
 fi
 
 
-if [ -f "/usr/lib64/java/jss4.jar" ] ; then
-	JSS_TARGET=/usr/lib64/java/jss4.jar
+if [ -f "/usr/lib64/java/jss.jar" ] ; then
+	JSS_TARGET=/usr/lib64/java/jss.jar
 	ARCH=64
 
-elif [ -f "/usr/lib/java/jss4.jar" ] ; then
-	JSS_TARGET=/usr/lib/java/jss4.jar
+elif [ -f "/usr/lib/java/jss.jar" ] ; then
+	JSS_TARGET=/usr/lib/java/jss.jar
 	ARCH=32
 
 else
-	printf "ERROR: jss4.jar not found\n"
+	printf "ERROR: jss.jar not found\n"
 	exit 255
 fi
 
-JSS_LINK=/usr/share/java/jss/jss4.jar
+JSS_LINK=/usr/share/java/jss/jss.jar
 
 mkdir -p `dirname $JSS_LINK`
 ln -sf $JSS_TARGET $JSS_LINK
diff --git a/tools/jar/README.jar-tools b/tools/jar/README.jar-tools
index c823000cb8b..9fcba071209 100644
--- a/tools/jar/README.jar-tools
+++ b/tools/jar/README.jar-tools
@@ -221,7 +221,7 @@ The summary is listed below:
 
 Summary:
 21 Unique Jar's
-     /usr/lib/jss/jss4-4.2.6.jar
+     /usr/lib/jss/jss.jar
      /usr/share/java/commons-codec.jar
      /usr/lib/symkey/symkey-9.0.0.jar
      /usr/share/java/jakarta-taglibs-core-1.1.1.jar