diff --git a/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java
index 3815f7b253..ce9de40285 100644
--- a/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java
+++ b/src/com/sun/ts/tests/saaj/api/jakarta_xml_soap/SOAPEnvelope/SOAPEnvelopeTestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -113,6 +113,9 @@ private void dispatch(HttpServletRequest req, HttpServletResponse res)
     } else if (testname.equals("createNameTest2")) {
       TestUtil.logMsg("Starting createNameTest2");
       createNameTest2(req, res);
+    } else if (testname.equals("createNameTest3")) {
+      TestUtil.logMsg("Starting createNameTest3");
+      createNameTest3(req, res);
     } else {
       throw new ServletException(
           "The testname '" + testname + "' was not found in the test servlet");
@@ -446,7 +449,7 @@ private void createNameTest2(HttpServletRequest req, HttpServletResponse res)
     resultProps.list(out);
   }
 
-    private void createNameTest3(HttpServletRequest req, HttpServletResponse res)
+  private void createNameTest3(HttpServletRequest req, HttpServletResponse res)
       throws ServletException, IOException {
     TestUtil.logTrace("createNameTest3");
     Properties resultProps = new Properties();
@@ -465,10 +468,8 @@ private void createNameTest3(HttpServletRequest req, HttpServletResponse res)
         pass = false;
       } else {
         String localName = name.getLocalName();
-        String prefix = name.getPrefix();
         String uri = name.getURI();
         TestUtil.logMsg("localName=" + localName);
-        TestUtil.logMsg("prefix=" + prefix);
         TestUtil.logMsg("uri=" + uri);
         if (localName == null) {
           TestUtil.logErr("localName is null (expected MyName1)");
diff --git a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.xml.soap.sig b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.xml.soap.sig
index 78b7b58bd2..c1ed09177b 100644
--- a/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.xml.soap.sig
+++ b/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.xml.soap.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.0
+#Version 3.0
 
 CLSS public abstract jakarta.xml.soap.AttachmentPart
 cons public init()